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/api/laborPerson.js b/src/assets/js/api/laborPerson.js index bf9ad63c..23c489bf 100644 --- a/src/assets/js/api/laborPerson.js +++ b/src/assets/js/api/laborPerson.js @@ -29,6 +29,7 @@ export const xmglXzHikvisionSyncRetryAPI = data => post('xmgl/xzHikvisionSync/re //详情 +export const getTrainRecordsByWorkerIdApi = data => post('xmgl/workerInfo/getTrainRecordsByWorkerId', data); //获取 安全教育列表数据 export const getWorkerInfoData = data => post('xmgl/workerInfo/viewWorkerInfoDetail', data); //获取 人员 详细所有信息 export const getRegisterWorkerInfoData = data => post('xmgl/xzWorkerInfoAuditRecord/viewWorkerInfoDetail', data); //获取 人员登记培训 详细所有信息 export const addContractApi = data => post('xmgl/workerContract/add', data); //新增合同信息 diff --git a/src/assets/js/api/safeManage.js b/src/assets/js/api/safeManage.js index 35088a8b..d69a6b5a 100644 --- a/src/assets/js/api/safeManage.js +++ b/src/assets/js/api/safeManage.js @@ -73,7 +73,7 @@ export const getSelectEnterpriseScoreList = data => post('xmgl/hiddenDangerInspe //验证身份证 -// export const getAnswerWorkerInfoList = data => post('xmgl/safeEducationQuestionAnswer/getAnswerWorkerInfo', data); +export const getAnswerWorkerInfoOriginList = data => post('xmgl/safeEducationQuestionAnswer/getAnswerWorkerInfo', data); export const getAnswerWorkerInfoList = data => post('xmgl/xzWorkerInfoAuditRecord/queryByCard', data); @@ -82,7 +82,7 @@ export const getSelectSafeEducationQuestionInfoList = data => post('xmgl/safeEdu //考试成功 -// export const addSafeEducationQuestionAnswer = data => post('xmgl/safeEducationQuestionAnswer/add', data); +export const addSafeEducationQuestionAnswerOrigin = data => post('xmgl/safeEducationQuestionAnswer/add', data); export const addSafeEducationQuestionAnswer = data => post('xmgl/xzWorkerInfoAuditRecord/submit', data); // 责任区域 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 { '/entryCodeDetail', '/entryCode', '/authentication', + '/authenticationOrigin', '/test', + '/testOrigin', '/videoLearning', + '/videoLearningOrigin', '/pages/projectEnd/safetyEducation/authentication', '/companyAdmin/docManage', ] diff --git a/src/router/index.js b/src/router/index.js index 8c5972c4..a8e2311f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3414,6 +3414,25 @@ const routes2 = [{ component: () => import ("@/views/projectFront/examination/videoLearning.vue"), }, + //扫二维码路由(原始) + { + path: "/authenticationOrigin", + name: "安全教育_考试_原始", + component: () => + import ("@/views/projectFront/examinationOrigin/authentication.vue"), + }, + { + path: "/testOrigin", + name: "安全教育_考试提示_原始", + component: () => + import ("@/views/projectFront/examinationOrigin/test.vue"), + }, + { + path: "/videoLearningOrigin", + name: "安全教育_考试视频_原始", + component: () => + import ("@/views/projectFront/examinationOrigin/videoLearning.vue"), + }, //准入二维码-验证 { path: "/entryCode", diff --git a/src/store/index.js b/src/store/index.js index a01d3cb2..11812e3a 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -55,7 +55,7 @@ export default new Vuex.Store({ 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', //测试 diff --git a/src/views/companyAdmin/systemSetup/enterpriseInfo.vue b/src/views/companyAdmin/systemSetup/enterpriseInfo.vue index ab97a8ce..512c54f2 100644 --- a/src/views/companyAdmin/systemSetup/enterpriseInfo.vue +++ b/src/views/companyAdmin/systemSetup/enterpriseInfo.vue @@ -141,6 +141,21 @@ + + + + + + {{ 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/examinationOrigin/authentication.vue b/src/views/projectFront/examinationOrigin/authentication.vue new file mode 100644 index 00000000..db0eb41b --- /dev/null +++ b/src/views/projectFront/examinationOrigin/authentication.vue @@ -0,0 +1,182 @@ + + + + + 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/dataValidation.vue b/src/views/projectFront/laborManage/dataValidation.vue index 70f60881..749b8b35 100644 --- a/src/views/projectFront/laborManage/dataValidation.vue +++ b/src/views/projectFront/laborManage/dataValidation.vue @@ -70,18 +70,15 @@ - + { // console.log('连接成功:', this.topicName + this.userId) @@ -330,37 +339,43 @@ export default { //获取信息 getHikvisionPage() { this.loading = true; - console.log(1111111111, this.activeName) getHikvisionPageApi({ projectSn: this.projectSn, pageNo: this.pagInfo.pageNo, pageSize: this.pagInfo.pageSize, type: Number(this.activeName), - }).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; + }) + .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 > + 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; + } } } - } - }).finally(() => { - this.loading = false; - }); + }) + .finally(() => { + this.loading = false; + }); }, //切换Tab记录类型 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/progressManagementAg/progressApproval.vue b/src/views/projectFront/progressManagementAg/progressApproval.vue index cf823ad6..59b268da 100644 --- a/src/views/projectFront/progressManagementAg/progressApproval.vue +++ b/src/views/projectFront/progressManagementAg/progressApproval.vue @@ -145,7 +145,7 @@