From a0143dfed6fd0f25a3192b54259765cfe4eb6b1c Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Sat, 13 Jul 2024 17:46:37 +0800 Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/config.js | 4 +- src/assets/js/api/largeScreen.js | 21 +- src/assets/js/http.js | 6 +- src/components/header.vue | 4 +- src/router/equipmentCenter.js | 6 + src/store/index.js | 8 +- .../componentsModule/dataListData.vue | 736 ++++++++++++++++++ .../largeScreen/programConfig.vue | 81 ++ src/views/projectAdmin/projectIndex.vue | 9 +- .../projectFront/inspecPoint/inspection.vue | 8 +- .../laborManage/dataValidation.vue | 3 + .../projectSummary/cooperationUnit.vue | 4 +- .../projectSummary/extendInfo.vue | 12 +- 13 files changed, 865 insertions(+), 37 deletions(-) create mode 100644 src/views/equipmentCenter/largeScreen/componentsModule/dataListData.vue create mode 100644 src/views/equipmentCenter/largeScreen/programConfig.vue diff --git a/public/js/config.js b/public/js/config.js index ec532902..95b2d36b 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,5 +1,5 @@ //-------项目配置标识------- -var COMPANY = ""; //通用 +// var COMPANY = ""; //通用 // var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业 // var COMPANY='hezhan'; //合展-宿迁 // var COMPANY='nanchang'; //南昌地铁、衢州 @@ -18,7 +18,7 @@ var COMPANY = ""; //通用 // COMPANY = 'jlw'//金林湾 // COMPANY = 'shzj' //上海张江 // COMPANY = 'shjg'//上海优益（上海建工） -// COMPANY = "agjt"; //鞍钢集团 +COMPANY = "agjt"; //鞍钢集团 // COMPANY = 'zkax' //中科安信 // COMPANY = 'hfqc' //乌丹站舍(合肥启程) diff --git a/src/assets/js/api/largeScreen.js b/src/assets/js/api/largeScreen.js index bb536ed3..a2325ce5 100644 --- a/src/assets/js/api/largeScreen.js +++ b/src/assets/js/api/largeScreen.js @@ -1,14 +1,14 @@ /** * api接口统一管理 大屏显示器 */ -import {post,get} from '../http' +import { post, get } from '../http' -export const getLEDList = data => get('xmgl/led/ledBigScreen/queryDetail', data); -export const saveLEDList = data => post('xmgl/led/ledBigScreen/saveDetail', data); -export const getWorkList = data => post('xmgl/workerInfo/countWorkerNumGroupByWorkerType', data); -export const getClassGroupList = data => post('xmgl/workerInfo/selectWorkerTeamStatistics', data); -export const getChockingList = data => post('xmgl/workerInfo/selectPersonTypeAndEduStatistics', data); +export const getLEDList = data => get('xmgl/led/ledBigScreen/queryDetail', data); +export const saveLEDList = data => post('xmgl/led/ledBigScreen/saveDetail', data); +export const getWorkList = data => post('xmgl/workerInfo/countWorkerNumGroupByWorkerType', data); +export const getClassGroupList = data => post('xmgl/workerInfo/selectWorkerTeamStatistics', data); +export const getChockingList = data => post('xmgl/workerInfo/selectPersonTypeAndEduStatistics', data); @@ -16,4 +16,11 @@ export const getChockingList = data => post('xmgl/workerInfo/selectPersonTypeAn // 保存接口：xmgl/led/ledBigScreen/saveDetail post // 工种：xmgl/projectOperationsAnalysis/getAnalysisByTypeOfWork（参数：projectSn）post // 班组：xmgl/workerInfo/selectWorkerTeamStatistics（参数：projectSn） post -// 考勤：xmgl/workerInfo/selectPersonTypeAndEduStatistics（参数：projectSn）post \ No newline at end of file +// 考勤：xmgl/workerInfo/selectPersonTypeAndEduStatistics（参数：projectSn）post + +// 现场大屏 +// 节目单配置 +export const getLiveScreenProgramPage = data => get('xmgl/xzLiveScreenProgram/page', data); // 分页 +export const getLiveScreenProgramAdd = data => post('xmgl/xzLiveScreenProgram/add', data); // 添加 +export const getLiveScreenProgramEdit = data => post('xmgl/xzLiveScreenProgram/edit', data); // 编辑 +export const getLiveScreenProgramDelete = data => post('xmgl/xzLiveScreenProgram/delete', data); // 删除 \ No newline at end of file diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 6efc824a..11bebe0a 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -174,7 +174,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // 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.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 @@ -190,8 +190,8 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 - axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址 - // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 + // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址 + // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; } else if (process.env.NODE_ENV == "production") { diff --git a/src/components/header.vue b/src/components/header.vue index 1ee37f0a..09d973d4 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -509,6 +509,7 @@ export default { toOverview6() { this.$forceUpdate(); this.newBigScreen = this.getNewBigScreen; + console.log(this.newBigScreen) if (this.newBigScreen == null || this.newBigScreen == "") { //--------------------原版项目后台跳转数据看板 @@ -537,7 +538,8 @@ export default { // this.$store.state.userInfo.token this.jumpToken = localStorage.getItem("jumpToken"); // "http://192.168.34.175:8081/#/large" - window.open(this.newBigScreen + "?token=" + this.jumpToken, "_self"); + window.open("http://192.168.34.129:8081/#/large" + "?token=" + this.jumpToken, "_self"); + // window.open(this.newBigScreen + "?token=" + this.jumpToken, "_self"); // window.open('http://192.168.34.138:8081/#/large?token=' + this.jumpToken + '&sn=' + this.$store.state.projectSn, "_self")//这里是后台跳到大屏的操作，携带token过去 } // if (this.newBigScreen != null) { diff --git a/src/router/equipmentCenter.js b/src/router/equipmentCenter.js index 3df36cc7..d2510a18 100644 --- a/src/router/equipmentCenter.js +++ b/src/router/equipmentCenter.js @@ -191,6 +191,12 @@ const routes = [{ component: (resolve) => require(['@/views/equipmentCenter/carPosition/devConfig'], resolve), }, + { + path: 'programConfig', + name: '车辆定位_设备管理', + component: (resolve) => + require(['@/views/equipmentCenter/largeScreen/programConfig'], resolve), + }, ] }, { diff --git a/src/store/index.js b/src/store/index.js index d6440b1d..7daa647e 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -46,8 +46,8 @@ export default new Vuex.Store({ state: { PAGESIZRS: [10, 20, 30, 50], - UPLOADURL: 'http://192.168.110.220:9809/upload/image/', // 同济 - FILEURL: ' http://192.168.110.220:9809/image/', // 同济 + // UPLOADURL: 'http://192.168.110.220:9809/upload/image/', // 同济 + // FILEURL: ' http://192.168.110.220:9809/image/', // 同济 // UPLOADURL: 'http://1.13.185.209:9820/upload/image/', // 中科佳成 // FILEURL: 'http://1.13.185.209:9820/image/', // 中科佳成 // UPLOADURL: ' http://101.43.164.214:11111/upload/image/', // 百色 @@ -56,8 +56,8 @@ export default new Vuex.Store({ // FILEURL:'http://182.90.224.237:51234/image/', // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 - // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 - // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 + UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 + FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 diff --git a/src/views/equipmentCenter/largeScreen/componentsModule/dataListData.vue b/src/views/equipmentCenter/largeScreen/componentsModule/dataListData.vue new file mode 100644 index 00000000..80eea5e4 --- /dev/null +++ b/src/views/equipmentCenter/largeScreen/componentsModule/dataListData.vue @@ -0,0 +1,736 @@ + + + diff --git a/src/views/equipmentCenter/largeScreen/programConfig.vue b/src/views/equipmentCenter/largeScreen/programConfig.vue new file mode 100644 index 00000000..d69e38f5 --- /dev/null +++ b/src/views/equipmentCenter/largeScreen/programConfig.vue @@ -0,0 +1,81 @@ + + + diff --git a/src/views/projectAdmin/projectIndex.vue b/src/views/projectAdmin/projectIndex.vue index b3d35c23..14985861 100644 --- a/src/views/projectAdmin/projectIndex.vue +++ b/src/views/projectAdmin/projectIndex.vue @@ -330,7 +330,7 @@ export default { moduleType: 2, }).then((res) => { if (res.success) { - var all = res.result.moduleList; + let all = res.result.moduleList; console.log("all", all); all.forEach((element, index) => { all[index].operation = false; @@ -343,11 +343,9 @@ export default { }); console.log("all111", all); // this.list = all; - this.list = all.filter(item => item.plugin != 'contractors');//承包商模块不需要在后台显示，以此过滤掉该后台模块 - + this.list = all.filter(item => item.plugin != 'contractors' && item.plugin != "programConfig");//承包商模块不需要在后台显示，以此过滤掉该后台模块 let pathItem = localStorage.getItem('lageToBackend') - if(pathItem.length > 0){ localStorage.removeItem('lageToBackend') let path = pathItem @@ -360,6 +358,7 @@ export default { } }); }); + this.$router.push(path); } @@ -383,7 +382,7 @@ export default { }); }); // this.list = all; - this.list = all.filter(item => item.plugin != 'contractors');//承包商模块不需要在后台显示，以此过滤掉该后台模块 + this.list = all.filter(item => item.plugin != 'contractors' && item.plugin != "programConfig");//承包商模块不需要在后台显示，以此过滤掉该后台模块 } }); } diff --git a/src/views/projectFront/inspecPoint/inspection.vue b/src/views/projectFront/inspecPoint/inspection.vue index 5ed60385..5b3c6c4b 100644 --- a/src/views/projectFront/inspecPoint/inspection.vue +++ b/src/views/projectFront/inspecPoint/inspection.vue @@ -681,10 +681,10 @@ export default { }else{ // 定位出错 console.log("定位失败错误：", result); - that.$message({ - type: "warning", - message: result.message, - }); + // that.$message({ + // type: "warning", + // message: result.message, + // }); // 调用ip定位 // getLngLatLocation(); } diff --git a/src/views/projectFront/laborManage/dataValidation.vue b/src/views/projectFront/laborManage/dataValidation.vue index 749b8b35..91a8f21d 100644 --- a/src/views/projectFront/laborManage/dataValidation.vue +++ b/src/views/projectFront/laborManage/dataValidation.vue @@ -52,6 +52,9 @@

车辆手动校验:定时任务数据校验网络超时无法进行时，使用手动校验ISC与平台的车辆基本信息，返回所
有比对结果，手动批量同步，同步成功后删除记录。

+

+ 注:若人员信息的数据校验结果中同时出现同一个人“在ISC存在，在平台不存在”“在ISC不存在，在平台
存在”两种矛盾的情况时，其原因是因为人员在两个平台都存在，不过在两个平台上的组织不同，这时候，
直接点击同步即可，系统将会更新平台上的人员组织信息到ISC上。 +

diff --git a/src/views/projectFront/projectSummary/cooperationUnit.vue b/src/views/projectFront/projectSummary/cooperationUnit.vue index ef8f5062..d7a4c259 100644 --- a/src/views/projectFront/projectSummary/cooperationUnit.vue +++ b/src/views/projectFront/projectSummary/cooperationUnit.vue @@ -371,8 +371,8 @@ - - + + diff --git a/src/views/projectFront/projectSummary/extendInfo.vue b/src/views/projectFront/projectSummary/extendInfo.vue index 778587a9..c3b0b950 100644 --- a/src/views/projectFront/projectSummary/extendInfo.vue +++ b/src/views/projectFront/projectSummary/extendInfo.vue @@ -340,7 +340,7 @@ type="textarea" > -
@@ -357,15 +357,9 @@ {{item.title}}
- + - + -->