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-26 17:09:40 +08:00
commit dd7be313d5
17 changed files with 83 additions and 58 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/'//测试地址

2
src/components/header.vue
View File

@ -154,7 +154,7 @@
</p> </p>
<p <p
v-show=" v-show="
$route.path.indexOf('projectIndex') != -1 && ($route.path.indexOf('projectIndex') != -1 || $route.path.indexOf('equipmentCenter') != -1) &&
$store.state.userInfo.projectKanban == 0 && $store.state.userInfo.projectKanban == 0 &&
company != 'agjt' company != 'agjt'
" "

17
src/components/layout.vue
View File

@ -91,15 +91,10 @@
<div class="wrapper" ref="wrapper"> <div class="wrapper" ref="wrapper">
<div class="cont" ref="cont"> <div class="cont" ref="cont">
<div <div
v-for="(item, index) in $store.state.menuList" v-for="(item, index) in filterMenuList"
:key="index" :key="index"
@click="clickItem(item)" @click="clickItem(item)"
class="menuInnerBox" class="menuInnerBox"
v-if="
company != 'xingxuan' &&
item.target != '_blank' &&
(item.menuName != 'LED大屏显示器' || company != 'nanchang')
"
> >
<el-menu-item <el-menu-item
class="firstLevelMenu" class="firstLevelMenu"
@ -199,6 +194,16 @@ export default {
console.log(this.$store.state.menuList,'7778888') console.log(this.$store.state.menuList,'7778888')
console.log(this.moduleData,'7778888') console.log(this.moduleData,'7778888')
}, },
computed: {
filterMenuList() {
return this.$store.state.menuList.filter(item => {
return this.company != 'xingxuan' &&
item.target != '_blank' &&
!item.menuEquipment &&
(item.menuName != 'LED大屏显示器' || this.company != 'nanchang');
});
}
},
mounted() { mounted() {
console.log("mounted", this.$route); console.log("mounted", this.$route);
this.$nextTick(() => { this.$nextTick(() => {

10
src/components/userChange.vue
View File

@ -360,14 +360,18 @@ export default {
// 收起popover // 收起popover
this.visible = false; this.visible = false;
} }
const isEquipmentCenter = this.$route.path.indexOf("equipmentCenter") == -1
if (this.workSpaceShow) { if (this.workSpaceShow) {
if (this.$route.path.indexOf("supplier") == -1) { if (this.$route.path.indexOf("supplier") == -1) {
this.$router.push("/workSpace"); isEquipmentCenter ? this.$router.push("/workSpace") : window.open("/#/workSpace", "_self");
// this.$router.push("/workSpace")
} else { } else {
this.$router.push("/supplierIndex"); isEquipmentCenter ? this.$router.push("/supplierIndex") : window.open("/#/supplierIndex", "_self");
// this.$router.push("/supplierIndex");
} }
} else { } else {
this.$router.push("/projectIndex"); isEquipmentCenter ? this.$router.push("/projectIndex") : window.open("/#/projectIndex", "_self");
// this.$router.push("/projectIndex");
} }
}, },
filterNode(value, data) { filterNode(value, data) {

8
src/store/index.js
View File

@ -56,13 +56,13 @@ export default new Vuex.Store({
// FILEURL: 'http://1.13.185.209:9820/image/', // 中科佳成 // FILEURL: 'http://1.13.185.209:9820/image/', // 中科佳成
// UPLOADURL: 'http://8.136.222.164:8808/upload/image/', // 中科安信 // UPLOADURL: 'http://8.136.222.164:8808/upload/image/', // 中科安信
// 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", // 百色 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://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地) // WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地)

2
src/views/companyAdmin/layout.vue
View File

@ -143,7 +143,7 @@ export default {
if (localStorage.getItem("systemInfo")) { if (localStorage.getItem("systemInfo")) {
this.systemInfo = JSON.parse(localStorage.getItem("systemInfo")); this.systemInfo = JSON.parse(localStorage.getItem("systemInfo"));
} }
document.title = "企业后台"; // document.title = "企业后台";
console.log("mounted", this.$route.path); console.log("mounted", this.$route.path);
this.$nextTick(() => { this.$nextTick(() => {
let timer = setTimeout(() => { let timer = setTimeout(() => {

74
src/views/equipmentCenter/equipmentCenterIndex.vue
View File

@ -6,33 +6,39 @@
<div class="pageDataContainer"> <div class="pageDataContainer">
<vue-scroll> <vue-scroll>
<div class="projectIndexBox"> <div class="projectIndexBox">
<div class="module_title">{{$t('message.homeLayout.existingProducts')}}</div> <!-- <div class="module_title">{{$t('message.homeLayout.existingProducts')}}</div> -->
<div class="projectIndex"> <div class="projectIndex">
<div <template v-for="(item, index) in filterList">
class="module canclick" <div style="width: 100%;height: 1px;" v-if="index == 0 || item.operationFlag || (index > 0 && filterList[index - 1].labelName != item.labelName)"></div>
:class="{hovers:item.operation}" <div class="moduleBox" v-if="item.operation">
v-for="(item,index) in list" <div class="module_title" v-if="index == 0 || item.operationFlag || (index > 0 && filterList[index - 1].labelName != item.labelName)">
:key="index" {{ item.labelName }}
@click="itemClick(item)" </div>
v-if="item.operation&&item.moduleType==2&&item.moduleEquipment==1" <div
> class="module canclick"
<img v-if="iconType == 1" :src="require('../../assets/images/menu/'+item.moduleIcon+'.png')" class="icon" /> :class="{hovers:item.operation}"
<img :key="index"
v-if="iconType == 2 && item.bigModuleIcon" @click="itemClick(item)"
:src=" >
require('../../assets/images/menu/' + <img v-if="iconType == 1" :src="require('../../assets/images/menu/'+item.moduleIcon+'.png')" class="icon" />
item.bigModuleIcon + <img
'.png') v-if="iconType == 2 && item.bigModuleIcon"
" :src="
style="margin-bottom: 10px" require('../../assets/images/menu/' +
class="icon" item.bigModuleIcon +
/> '.png')
<div class="title_wrap"> "
<div class="head1">{{item.moduleName}}</div> style="margin-bottom: 10px"
<div class="subhead">{{item.moduleDesc}}</div> class="icon"
<!-- {{$t('message.projectIndex.moudleName1')}} --> />
<div class="title_wrap">
<div class="head1">{{item.moduleName}}</div>
<div class="subhead">{{item.moduleDesc}}</div>
<!-- {{$t('message.projectIndex.moudleName1')}} -->
</div>
</div>
</div> </div>
</div> </template>
</div> </div>
<div class="module_title" v-if="showNotBuyMoudle">{{$t('message.homeLayout.ununlockedProducts')}}</div> <div class="module_title" v-if="showNotBuyMoudle">{{$t('message.homeLayout.ununlockedProducts')}}</div>
<div class="projectIndex"> <div class="projectIndex">
@ -314,6 +320,13 @@ export default {
iconType: '1' iconType: '1'
}; };
}, },
computed: {
filterList: function () {
return this.list.filter((item) => {
return item.operation && item.moduleType==2 && item.moduleEquipment==1
});
},
},
mounted(){ mounted(){
if(localStorage.getItem('systemInfo')){ if(localStorage.getItem('systemInfo')){
this.iconType = JSON.parse(localStorage.getItem('systemInfo')).iconType ? JSON.parse(localStorage.getItem('systemInfo')).iconType:'1' this.iconType = JSON.parse(localStorage.getItem('systemInfo')).iconType ? JSON.parse(localStorage.getItem('systemInfo')).iconType:'1'
@ -343,6 +356,7 @@ var arr = this.$store.state.userInfo.menuAuthority.moduleList
if (res.code == 200) { if (res.code == 200) {
this.projectName = res.result.projectName; this.projectName = res.result.projectName;
this.headerName += ' - ' + res.result.projectName this.headerName += ' - ' + res.result.projectName
document.title = this.projectName;
this.$store.commit('setProDetail',res.result) this.$store.commit('setProDetail',res.result)
} }
}); });
@ -459,10 +473,8 @@ var arr = this.$store.state.userInfo.menuAuthority.moduleList
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: flex-end;
// justify-content: space-around;
box-sizing: border-box; box-sizing: border-box;
// padding: 0 100px;
flex-wrap: wrap; flex-wrap: wrap;
margin-bottom: 8px; margin-bottom: 8px;
.module:nth-child(4n) { .module:nth-child(4n) {
@ -470,14 +482,16 @@ var arr = this.$store.state.userInfo.menuAuthority.moduleList
} }
} }
.module_title { .module_title {
margin-left: -10px; // margin-left: -10px;
margin-left: 0;
border-left: 2px solid #4a8bff; border-left: 2px solid #4a8bff;
padding-left: 8px; padding-left: 8px;
margin-bottom: 20px; margin-bottom: 20px;
font-size: 14px; font-size: 14px;
font-family: PingFang SC;
} }
.module { .module {
width: 320px; width: 310px;
// height: 124px; // height: 124px;
box-sizing: border-box; box-sizing: border-box;
// border-radius: 3px; // border-radius: 3px;

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

@ -218,7 +218,7 @@ export default {
if (row.type == 11) { if (row.type == 11) {
// 质量 // 质量
path = "/project/quality/inspectionLedger"; path = "/project/quality/inspectionLedger";
const res = await getQualityNoticeStatusApi({ id: payLoadParams.data.id }); const res = await getQualityNoticeStatusApi({ id: payLoadParams?.data?.id });
if (!res.result || res.result.status == 6) { if (!res.result || res.result.status == 6) {
this.$message({ this.$message({
type: "warning", type: "warning",
@ -229,7 +229,7 @@ export default {
} else if (row.type == 10) { } else if (row.type == 10) {
// 安全 // 安全
path = "/project/safeSame/inspectionLedger"; path = "/project/safeSame/inspectionLedger";
const res = await getNoticeStatusApi({ id: payLoadParams.data.id }); const res = await getNoticeStatusApi({ id: payLoadParams?.data?.id });
if (!res.result || res.result.status == 6) { if (!res.result || res.result.status == 6) {
this.$message({ this.$message({
type: "warning", type: "warning",

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

@ -122,7 +122,7 @@ export default {
if(localStorage.getItem('systemInfo')){ if(localStorage.getItem('systemInfo')){
this.systemInfo=JSON.parse(localStorage.getItem('systemInfo')) this.systemInfo=JSON.parse(localStorage.getItem('systemInfo'))
} }
document.title='企业后台' // document.title='企业后台'
console.log('mounted',this.$route.path) console.log('mounted',this.$route.path)
}, },

2
src/views/message.vue
View File

@ -191,7 +191,7 @@ export default {
} }
}, },
created() { created() {
document.title = '消息中心' // document.title = '消息中心'
this.selectNowDate() this.selectNowDate()
this.getListData() this.getListData()
}, },

2
src/views/messageV2.vue
View File

@ -177,7 +177,7 @@ export default {
}, },
created() { created() {
// '消息中心' // '消息中心'
document.title = this.$t('message.messageCenter.msgCenter') // document.title = this.$t('message.messageCenter.msgCenter')
this.selectNowDate() this.selectNowDate()
this.getListData() this.getListData()
}, },

2
src/views/projectAdmin/dataBoard/dataBoard.vue
View File

@ -147,7 +147,7 @@ export default {
this.loadWeather() this.loadWeather()
this.enabledProjectV2 = enabledProjectV2 this.enabledProjectV2 = enabledProjectV2
// document.title = this.$store.state.currentProDetail.projectName + this.$t('message.dataBoard.dataBoard') // document.title = this.$store.state.currentProDetail.projectName + this.$t('message.dataBoard.dataBoard')
document.title = this.currentProDetail.projectName + this.$t('message.dataBoard.dataBoard') // document.title = this.currentProDetail.projectName + this.$t('message.dataBoard.dataBoard')
this.getAllModule() this.getAllModule()
}, },
methods: { methods: {

2
src/views/projectAdmin/dataBoardTwo/dataBoard.vue
View File

@ -96,7 +96,7 @@ export default {
this.getTime() this.getTime()
this.loadWeather() this.loadWeather()
this.enabledProjectV2=enabledProjectV2 this.enabledProjectV2=enabledProjectV2
document.title=this.$store.state.currentProDetail.projectName+this.$t('message.dataBoard.dataBoard') // document.title=this.$store.state.currentProDetail.projectName+this.$t('message.dataBoard.dataBoard')
this.getAllModule() this.getAllModule()
}, },
methods:{ methods:{

4
src/views/projectAdmin/projectIndex.vue
View File

@ -465,11 +465,13 @@ export default {
} }
.module_title { .module_title {
margin-left: -10px; // margin-left: -10px;
margin-left: 0px;
border-left: 2px solid #4a8bff; border-left: 2px solid #4a8bff;
padding-left: 8px; padding-left: 8px;
margin-bottom: 20px; margin-bottom: 20px;
font-size: 14px; font-size: 14px;
font-family: PingFang SC;
// width: 1360px; // width: 1360px;
} }

2
src/views/projectAdmin/projectList.vue
View File

@ -188,7 +188,7 @@ export default {
}; };
}, },
created() { created() {
document.title='项目总览' // document.title='项目总览'
this.userInfo = this.$store.state.userInfo; this.userInfo = this.$store.state.userInfo;
this.getLayerCompany(); this.getLayerCompany();
}, },

2
src/views/supplierAdmin/layout.vue
View File

@ -152,7 +152,7 @@ export default {
if(localStorage.getItem('systemInfo')){ if(localStorage.getItem('systemInfo')){
this.systemInfo=JSON.parse(localStorage.getItem('systemInfo')) this.systemInfo=JSON.parse(localStorage.getItem('systemInfo'))
} }
document.title='企业后台' // document.title='企业后台'
console.log('mounted',this.$route.path) console.log('mounted',this.$route.path)
}, },

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

@ -120,7 +120,7 @@ export default {
if(localStorage.getItem('systemInfo')){ if(localStorage.getItem('systemInfo')){
this.systemInfo=JSON.parse(localStorage.getItem('systemInfo')) this.systemInfo=JSON.parse(localStorage.getItem('systemInfo'))
} }
document.title='企业后台' // document.title='企业后台'
console.log('mounted',this.$route.path) console.log('mounted',this.$route.path)
}, },
methods: { methods: {