admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev

Browse Source
This commit is contained in:
Rain 2024-10-17 17:54:09 +08:00
commit 390385f1cb
8 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/js/http.js
View File

@ -180,12 +180,12 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地
// axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
// axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地 // axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地
axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程 // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
// axios.defaults.baseURL = 'http://101.43.164.214:11111/' // 百色三标段项目 axios.defaults.baseURL = 'http://101.43.164.214:11111/' // 百色三标段项目
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址

4
src/store/index.js
View File

@ -58,13 +58,13 @@ export default new Vuex.Store({
// FILEURL: 'http://8.136.222.164:8808/image/', // 中科安信 // FILEURL: 'http://8.136.222.164:8808/image/', // 中科安信
UPLOADURL: 'http://101.43.164.214:11111/upload/image/', // 百色 UPLOADURL: 'http://101.43.164.214:11111/upload/image/', // 百色
FILEURL: 'http://101.43.164.214:11111/image/', // 百色 FILEURL: 'http://101.43.164.214:11111/image/', // 百色
WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", // 百色
// UPLOADURL:'http://182.90.224.237:51234/upload/image/', // UPLOADURL:'http://182.90.224.237:51234/upload/image/',
// FILEURL:'http://182.90.224.237:51234/image/', // FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
// FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
// UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
// FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", //jiayu工作流地址(本地)
// WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地) // WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地)
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
// WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地) // WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地)
@ -81,7 +81,7 @@ export default new Vuex.Store({
// // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址 // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址
WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
// WORKFLOWURL: "http://jxj.zhgdyun.com:33982/#/workspace/forms", //演示平台工作流 // WORKFLOWURL: "http://jxj.zhgdyun.com:33982/#/workspace/forms", //演示平台工作流
// UPLOADURL: 'http://jxj.zhgdyun.com:18000' + "/upload/image", //包头化工 // UPLOADURL: 'http://jxj.zhgdyun.com:18000' + "/upload/image", //包头化工

4
src/views/home/login_v2.vue
View File

@ -1233,7 +1233,7 @@ export default {
if (!this.$store.state.userInfo.personMail && this.company == 'agjt' && isHaveUserCenterMenu) { if (!this.$store.state.userInfo.personMail && this.company == 'agjt' && isHaveUserCenterMenu) {
this.checkInfoComplete(); this.checkInfoComplete();
} }
this.$router.push("/workSpace"); this.$router.push("/projectIndex");
} else { } else {
this.$router.push("/supplierIndex"); this.$router.push("/supplierIndex");
} }
@ -1274,7 +1274,7 @@ export default {
this.$router.push("projectIndex"); this.$router.push("projectIndex");
}else{ }else{
this.$router.push("/workSpace"); this.$router.push("/projectIndex");
} }
// this.$router.push("/workSpace"); // this.$router.push("/workSpace");
} else { } else {

2
src/views/infoCenter/allInfo/componentsModule/dataListData.vue
View File

@ -85,7 +85,7 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="内容" align="center" prop="msg"> <el-table-column label="内容" align="center" prop="msg" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
:style="{ :style="{

4
src/views/infoCenter/hadRead/componentsModule/dataListData.vue
View File

@ -82,11 +82,13 @@
:style="{ :style="{
color: scope.row.isRead == 1 ? '#BFBFBF' : '#5181F7', color: scope.row.isRead == 1 ? '#BFBFBF' : '#5181F7',
}" }"
style="cursor: pointer"
@click.stop="infoDetailOpen(scope.row)"
>{{ scope.row.title }}</span >{{ scope.row.title }}</span
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="内容" align="center" prop="msg"> <el-table-column label="内容" align="center" prop="msg" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
:style="{ :style="{

3
src/views/infoCenter/layout.vue
View File

@ -144,7 +144,8 @@ export default {
}); });
}, },
backTo(){ backTo(){
this.$router.back(); this.$router.push("/workSpace");
// this.$router.back();
}, },
hasSubMenu(list) { hasSubMenu(list) {
//用于判断有没有下级菜单 //用于判断有没有下级菜单

2
src/views/infoCenter/notRead/componentsModule/dataListData.vue
View File

@ -89,7 +89,7 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="内容" align="center" prop="msg"> <el-table-column label="内容" align="center" prop="msg" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
:style="{ :style="{

3
src/views/userCenter/layout.vue
View File

@ -141,7 +141,8 @@ export default {
}); });
}, },
backTo(){ backTo(){
this.$router.back(); this.$router.push("/workSpace");
// this.$router.back();
}, },
hasSubMenu(list) { hasSubMenu(list) {
//用于判断有没有下级菜单 //用于判断有没有下级菜单