From dddf5d9c9a3ec69bc36c802ba967347a06ac65c3 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Fri, 28 Jun 2024 18:44:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=96=B0=E7=8E=AF=E5=A2=83=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BB=A5=E5=8F=8A=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8A=A5=E5=91=8A=E5=88=97=E8=A1=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9B=B4=E6=96=B0BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/config.js | 3 ++ src/assets/js/http.js | 4 +- src/store/index.js | 14 +++--- .../laborManage/dataValidation.vue | 46 +++++++++---------- 4 files changed, 35 insertions(+), 32 deletions(-) diff --git a/public/js/config.js b/public/js/config.js index eb27157a..3f9b1735 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -20,6 +20,7 @@ var COMPANY = ""; //通用 // COMPANY = 'shjg'//上海优益（上海建工） COMPANY = "agjt"; //鞍钢集团 // COMPANY = 'zkax' //中科安信 +// COMPANY = 'hfqc' //乌丹站舍(合肥启程) var PROJECT = { local_test: "common", // 普通版 @@ -53,6 +54,8 @@ if (COMPANY == "longguang") { mqttUrl = "ws://zhgdmqtt.loganwy.com:80/mqtt"; } else if (COMPANY == "henan") { mqttUrl = "ws://182.90.224.147:8083/mqtt"; +} else if (COMPANY == "hfqc") { + mqttUrl = "ws://192.168.100.4:8083/mqtt"; } var enabledProjectV2 = 2; //是否用精益建造版 1：精益建造版(黑色) 2： 最初版（白色） 3：数据看板UI蓝色版（白色） 4:湛蓝色 var CONSTRUCTIONSTAGE = [{ diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 489e5ef7..4e0f1e5e 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -172,8 +172,8 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // 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:9111/"; //郭圣雄本地 - axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 + 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/' //彭洁远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 diff --git a/src/store/index.js b/src/store/index.js index a01d3cb2..f91ec1cd 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -52,18 +52,18 @@ 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", //罗峰工作流地址(本地) + // WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试 // FILEURL: 'http://42.180.188.17:11211/image/', //测试 - // BASEURL: baseUrl ? - // baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境 - // UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + BASEURL: baseUrl ? + baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境 + UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 + FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址 diff --git a/src/views/projectFront/laborManage/dataValidation.vue b/src/views/projectFront/laborManage/dataValidation.vue index 70f60881..4722c4a7 100644 --- a/src/views/projectFront/laborManage/dataValidation.vue +++ b/src/views/projectFront/laborManage/dataValidation.vue @@ -77,11 +77,7 @@ @selection-change="handleSelectionChange" > - + { - if (res.code == 200) { - this.tableList = res.result.records; - this.pagInfo.total = res.result.total; - if ( - +res.result.total > this.pageSizeList[this.pageSizeList.length - 1] && this.pageSizeList.length == 4 - ) { - this.pageSizeList.push(+res.result.total); - } else { - this.pageSizeList.splice(4,1,+res.result.total); - if(this.pagInfo.pageSize> +res.result.total){ - this.pagInfo.pageSize = +res.result.total; + }) + .then((res) => { + if (res.code == 200) { + this.tableList = res.result.records; + this.pagInfo.total = res.result.total; + if ( + +res.result.total > + this.pageSizeList[this.pageSizeList.length - 1] && + this.pageSizeList.length == 4 + ) { + this.pageSizeList.push(+res.result.total); + } else { + this.pageSizeList.splice(4, 1, +res.result.total); + if (this.pagInfo.pageSize > +res.result.total) { + this.pagInfo.pageSize = +res.result.total; + } } + this.$forceUpdate(); } - } - }).finally(() => { - this.loading = false; - }); + }) + .finally(() => { + this.loading = false; + }); }, //切换Tab记录类型 From 67e6a0a01b332b54e225256e142e5f00b8efbe98 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Sat, 29 Jun 2024 16:23:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E8=B5=84=E6=96=99?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E8=80=83=E8=AF=95=E7=B3=BB=E7=BB=9FBUG=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BB=A5=E5=8F=8A=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0BUG?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A5=E5=8F=8A=E8=B4=A8=E9=87=8F=E5=92=8C?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=A8=A1=E5=9D=97=E8=A1=A8=E5=8D=95BUG?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A5=E5=8F=8A=E9=9B=A8=E9=87=8F=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E9=A1=B5=E9=9D=A2BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/account.vue | 14 +------ src/store/index.js | 12 +++--- .../systemSetup/enterpriseInfo.vue | 16 ++++++++ src/views/jxjadmin/systemSettings.vue | 17 ++++++++ .../transportationManage/index.vue | 5 ++- .../pointManagement/pointManagement.vue | 10 ++++- .../laborManage/dataValidation.vue | 41 +++++++++++++++++-- .../divisionSubManage.vue | 16 ++++++-- .../quality/businessModule/checkPoint.vue | 6 +++ .../projectFront/quality/inspectionLedger.vue | 5 ++- .../rainfallMonitor/alarmWarning.vue | 6 +-- .../rainfallMonitor/relaTimeData.vue | 3 +- .../safeSame/inspectionLedger.vue | 5 ++- 13 files changed, 119 insertions(+), 37 deletions(-) diff --git a/src/components/account.vue b/src/components/account.vue index 9e3d5efc..ef3934cb 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -148,7 +148,7 @@
@@ -210,7 +210,6 @@ export default { COMPANY: COMPANY, projectType: "", loginData: "", - dataCenter1: 0, seeEquipment: "", projectBackground: "项目后台", enterpriseBackground: "企业后台", @@ -236,7 +235,6 @@ export default { this.projectType = PROJECT_TYPE; this.loginData = JSON.parse(localStorage.getItem("systemInfo")); this.seeEquipment = this.$store.state.userInfo.seeEquipment; - // this.getModuleList(); console.log("seeEquipment------", this.seeEquipment); console.log(" this.loginData===================", this.loginData); if (this.loginData.headerConfiguration != "") { @@ -267,16 +265,6 @@ export default { // console.log('企业后台',this.enterpriseBackground) }, methods: { - // 获取全部模块 - getModuleList() { - let allModuleList = this.$store.state.userInfo.menuAuthority.moduleList; - for(let i = 0;i + + + + + + {{ form.showFileCenter == 1 ? '是' : '否' }} + + + @@ -299,6 +314,7 @@ export default { projectBackground: '', //项目后台 equipmentChina: '', //设备中台 dataCenter: '', //资料中心 + showFileCenter: 0, // 是否显示资料中心 projectFront: '', // 项目前台 isShowProjectFront: 0, // 是否显示项目前台 isOpenCertificateExpireWarn: 0, // 是否开启施工人员资质证书到期预警 diff --git a/src/views/jxjadmin/systemSettings.vue b/src/views/jxjadmin/systemSettings.vue index d254bfe1..4757f676 100644 --- a/src/views/jxjadmin/systemSettings.vue +++ b/src/views/jxjadmin/systemSettings.vue @@ -147,6 +147,22 @@ + + + + + + {{ form.showFileCenter == 1 ? '是' : '否' }} + + + @@ -339,6 +355,7 @@ export default { certificateExpireWarnAheadDay: 0, // 提前多少天 defaultApprovalCompanySn: "", // 默认审批用户注册企业 dataCenter: '', //资料中心 + showFileCenter: 0, // 是否显示资料中心 loginTimeOut:1, zoomType:0, diff --git a/src/views/projectFront/earthworkTransportation/transportationManage/index.vue b/src/views/projectFront/earthworkTransportation/transportationManage/index.vue index f16c0605..662fceb7 100644 --- a/src/views/projectFront/earthworkTransportation/transportationManage/index.vue +++ b/src/views/projectFront/earthworkTransportation/transportationManage/index.vue @@ -283,9 +283,10 @@ export default { phoneNumber: [ { required: true, - message: "请输入", + message: "请输入正确的手机号格式", trigger: "blur", - }, + pattern: /^1(3|4|5|6|7|8|9)\d{9}$/, + } ], remark: [ { diff --git a/src/views/projectFront/examSystem2/pointManagement/pointManagement.vue b/src/views/projectFront/examSystem2/pointManagement/pointManagement.vue index 2894fce6..47e37b72 100644 --- a/src/views/projectFront/examSystem2/pointManagement/pointManagement.vue +++ b/src/views/projectFront/examSystem2/pointManagement/pointManagement.vue @@ -68,7 +68,7 @@ 保存 - + 取消 @@ -217,6 +217,14 @@ export default { }) }) }, + // 取消按钮 + cancelData(index,row){ + if(row.id){ + this.ruleList[index].isEdit = false; + } else { + this.ruleList.splice(index,1) + } + }, //获取列表数据 getProgressListData() { getExamPointListApi({ diff --git a/src/views/projectFront/laborManage/dataValidation.vue b/src/views/projectFront/laborManage/dataValidation.vue index 4722c4a7..749b8b35 100644 --- a/src/views/projectFront/laborManage/dataValidation.vue +++ b/src/views/projectFront/laborManage/dataValidation.vue @@ -70,7 +70,8 @@ { // console.log('连接成功:', this.topicName + this.userId) @@ -335,6 +348,9 @@ export default { .then((res) => { if (res.code == 200) { this.tableList = res.result.records; + // this.$set(this, 'tableList', res.result.records); + // this.tableList.length = 0; + // this.tableList.push(...res.result.records); this.pagInfo.total = res.result.total; if ( +res.result.total > @@ -348,7 +364,6 @@ export default { this.pagInfo.pageSize = +res.result.total; } } - this.$forceUpdate(); } }) .finally(() => { @@ -360,7 +375,7 @@ export default { handleClick(val) { // console.log(val.name); this.activeName = val.name; - this.$refs.multipleTable.clearSelection(); + this.$refs.multipleTableValidate.clearSelection(); this.pageSizeList = JSON.parse( JSON.stringify(this.$store.state.PAGESIZRS) ); @@ -392,6 +407,26 @@ export default { this.getHikvisionPage(); }, }, + computed: { + msgObj() { // 为了同时监听两个值 + const { tableList, activeName } = this; + return { + tableList, + activeName, + }; + }, + }, + // watch: { + // msgObj: { + // handler(newVal, oldVal) { + // //接下来在这里写将要进行的操作 + // if (newVal.activeName == oldVal.activeName && JSON.stringify(newVal.tableList) != JSON.stringify(oldVal.tableList)) { + // this.getHikvisionPage(); + // } + // }, + // deep: true, + // }, + // }, }; diff --git a/src/views/projectFront/examinationOrigin/dialog.vue b/src/views/projectFront/examinationOrigin/dialog.vue new file mode 100644 index 00000000..d46a7058 --- /dev/null +++ b/src/views/projectFront/examinationOrigin/dialog.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/src/views/projectFront/examinationOrigin/test.vue b/src/views/projectFront/examinationOrigin/test.vue new file mode 100644 index 00000000..fed6105f --- /dev/null +++ b/src/views/projectFront/examinationOrigin/test.vue @@ -0,0 +1,369 @@ + + + + + diff --git a/src/views/projectFront/examinationOrigin/videoLearning.vue b/src/views/projectFront/examinationOrigin/videoLearning.vue new file mode 100644 index 00000000..b6e9b743 --- /dev/null +++ b/src/views/projectFront/examinationOrigin/videoLearning.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue index 1b399baf..8469ee1e 100644 --- a/src/views/projectFront/laborManage/personDetails.vue +++ b/src/views/projectFront/laborManage/personDetails.vue @@ -1920,16 +1920,31 @@
- + + + +