From 2231d3565dca7728df4bf3ef31be73dc220ccb82 Mon Sep 17 00:00:00 2001 From: Rain_ <904416525@qq.com> Date: Sat, 8 Mar 2025 12:33:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?flx:=E6=8F=90=E4=BA=A4=E5=BC=B9=E5=BC=93?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 14 ++++++ src/assets/js/http.js | 4 +- src/store/index.js | 10 ++-- .../personModule/administration.vue | 49 +++++++++++++++++- .../personModule/laborComponent.vue | 49 ++++++++++++++++++ .../projectFront/laborManage/rosterNew.vue | 50 +++++++++++++++++++ 6 files changed, 170 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 66cf2816..4682402e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -63,6 +63,7 @@ "vue-seamless-scroll": "^1.1.23", "vue-simple-uploader": "^0.7.6", "vue2-scale-box": "^0.1.7", + "vuedraggable": "^2.24.3", "vuescroll": "^4.16.1", "vuex": "^3.4.0", "vuex-persistedstate": "^3.1.0", @@ -21908,6 +21909,11 @@ "node": ">=0.10.0" } }, + "node_modules/sortablejs": { + "version": "1.10.2", + "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.10.2.tgz", + "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A==" + }, "node_modules/source-list-map": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/source-list-map/-/source-list-map-2.0.1.tgz", @@ -26606,6 +26612,14 @@ "resolved": "https://registry.npmmirror.com/vue2-scale-box/-/vue2-scale-box-0.1.7.tgz", "integrity": "sha512-mI/eEaBg5+9Op8i7sHBPEWnxRC744xBZnl4lf6yF+2ShhURTunipWz7dMcJ0nhgZ1jK+I4rv2BF1oK+0K7CmlA==" }, + "node_modules/vuedraggable": { + "version": "2.24.3", + "resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-2.24.3.tgz", + "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==", + "dependencies": { + "sortablejs": "1.10.2" + } + }, "node_modules/vuescroll": { "version": "4.18.1", "resolved": "https://registry.npmmirror.com/vuescroll/-/vuescroll-4.18.1.tgz", diff --git a/src/assets/js/http.js b/src/assets/js/http.js index af77aebf..4fa3be97 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -179,8 +179,8 @@ if (process.env.NODE_ENV == "development") { // 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:19112/"; //郭圣雄本地 - axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 + axios.defaults.baseURL = "http://192.168.34.221:19112/"; //郭圣雄本地 + // 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 f712be0a..e6440592 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -70,15 +70,17 @@ export default new Vuex.Store({ // FILEURL: 'http://1.13.185.209:9820/image/', // 中科佳成 // UPLOADURL: 'http://8.136.222.164:8808/upload/image/', // 中科安信 // FILEURL: 'http://8.136.222.164:8808/image/', // 中科安信 - UPLOADURL: 'http://101.43.164.214:11111/upload/image/', // 百色 - FILEURL: 'http://101.43.164.214:11111/image/', // 百色 - WORKFLOWURL: "http://101.43.164.214:11129/#/workspace/forms", // 百色 + // UPLOADURL: 'http://101.43.164.214:11111/upload/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/', // FILEURL:'http://182.90.224.237:51234/image/', // UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地 // FILEURL: "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:19112/upload/image/', // 郭圣雄本地 + FILEURL: 'http://192.168.34.221:19112/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.138:88/#/workspace/forms", //坤工作流地址(本地) @@ -98,6 +100,8 @@ export default new Vuex.Store({ // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址 // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 + // UPLOADURL: 'http://jxj.zhgdyun.com:100/upload/image', //演示平台 + // FILEURL: 'http://jxj.zhgdyun.com:100/image/', //演示平台 // WORKFLOWURL: "http://jxj.zhgdyun.com:33982/#/workspace/forms", //演示平台工作流 // UPLOADURL: 'http://jxj.zhgdyun.com:18000' + "/upload/image", //包头化工 // FILEURL: 'http://jxj.zhgdyun.com:18000' + "/image/", //包头化工 diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index 61a544f6..0a6ee102 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -438,6 +438,19 @@ > + + + + + +
+ 下发状态： + {{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }} +
所属企业： {{ row.enterpriseName }} @@ -2303,6 +2322,7 @@ export default { sendSuccessStatus: null, enterDate: "", codeState: "", + dangongStatus:"", }, tableListData: [], //表格数据 personDialogTitle: this.$t("message.laborMange.managementEntry"), @@ -2380,6 +2400,29 @@ export default { base64Type: "data:image/jpeg;base64,", isUploadToHouse: false, //是否显示上传到住建局按钮 isIscDevice: false, //是否是海康门禁isc设备 + isDangong: false, // 是否是弹弓设备 + dangongStatusList: [{ + id: 1, + dangongStatusName: "成功" + },{ + id: 2, + dangongStatusName: "没有照片" + },{ + id: 3, + dangongStatusName: "入库失败" + },{ + id: 4, + dangongStatusName: "与 XXX 相似度高" + },{ + id: 5, + dangongStatusName: "下载失败" + },{ + id: 6, + dangongStatusName: "照片太大" + },{ + id: 7, + dangongStatusName: "其他" + }], //弹弓设备状态列表 attendRulesList: [], enterpriseTypeId: "", enterpriseTypeList: [], @@ -2893,8 +2936,10 @@ export default { this.tableParameter.enterDate + "&codeState=" + this.tableParameter.codeState + + "&dangongStatus=" + + this.tableParameter.dangongStatus + "&enterpriseId=" + - this.checkedId; + this.checkedId; }, getConfig() { getProjectUfaceConfigInfo({ @@ -2904,6 +2949,7 @@ export default { if (result.result) { this.isUploadToHouse = result.result.housing ? true : false; this.isIscDevice = result.result.supplierType == 9 ? true : false; + this.isDangong = result.result.supplierType == 8 ? true : false; } } }); @@ -3591,6 +3637,7 @@ export default { this.tableParameter.sendSuccessStatus = null; this.tableParameter.enterDate = ""; this.tableParameter.codeState = ""; + this.tableParameter.dangongStatus = ""; this.getTableData(); }, diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue index 828c7778..c7c59fce 100644 --- a/src/views/projectFront/laborManage/personModule/laborComponent.vue +++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue @@ -399,6 +399,19 @@ > + + + + +
+
+ 下发状态： + {{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }} +
所属企业： {{ row.enterpriseName }} @@ -2594,6 +2613,7 @@ export default { sendSuccessStatus: null, enterDate: "", codeState: "", + dangongStatus: "", }, tableListData: [], //表格数据 personDialogTitle: this.$t("message.laborMange.personnelEntry"), @@ -2672,6 +2692,29 @@ export default { base64Type: "data:image/jpeg;base64,", isUploadToHouse: false, //是否显示上传到住建局按钮 isIscDevice: false, //是否是海康门禁isc设备 + isDangong: false, // 是否是弹弓设备 + dangongStatusList: [{ + id: 1, + dangongStatusName: "成功" + },{ + id: 2, + dangongStatusName: "没有照片" + },{ + id: 3, + dangongStatusName: "入库失败" + },{ + id: 4, + dangongStatusName: "与 XXX 相似度高" + },{ + id: 5, + dangongStatusName: "下载失败" + },{ + id: 6, + dangongStatusName: "照片太大" + },{ + id: 7, + dangongStatusName: "其他" + }], //弹弓设备状态列表 attendRulesList: [], enterpriseTypeId: "", cropperOption: { @@ -3190,8 +3233,12 @@ export default { this.tableParameter.enterDate + "&codeState=" + this.tableParameter.codeState + + "&dangongStatus=" + + this.tableParameter.dangongStatus + "&enterpriseId=" + this.checkedId; + + }, getConfig() { getProjectUfaceConfigInfo({ @@ -3201,6 +3248,7 @@ export default { if (result.result) { this.isUploadToHouse = result.result.housing ? true : false; this.isIscDevice = result.result.supplierType == 9 ? true : false; + this.isDangong = result.result.supplierType == 8 ? true : false; } } }); @@ -4164,6 +4212,7 @@ export default { this.tableParameter.sendSuccessStatus = null; this.tableParameter.enterDate = ""; this.tableParameter.codeState = ""; + this.tableParameter.dangongStatus = ""; this.getTableData(); }, diff --git a/src/views/projectFront/laborManage/rosterNew.vue b/src/views/projectFront/laborManage/rosterNew.vue index 3ba84772..70cb8ff5 100644 --- a/src/views/projectFront/laborManage/rosterNew.vue +++ b/src/views/projectFront/laborManage/rosterNew.vue @@ -123,6 +123,18 @@ > + + + + +
+
+ 下发状态： + {{ row.dangongStatus || row.dangongStatus == 0 ? dangongStatusList[row.dangongStatus].dangongStatusName: "" }} +
{{ $t("message.laborMange.companies") }}：{{ @@ -1124,6 +1143,7 @@ export default { enterpriseId: "", inserviceType: "", codeState: "", + dangongStatus: "", }, editProjectSettingDialog: false, needAudit: 0, @@ -1142,6 +1162,29 @@ export default { }, whoId: "", isIscDevice: false, + isDangong: false, // 是否是弹弓设备 + dangongStatusList: [{ + id: 1, + dangongStatusName: "成功" + },{ + id: 2, + dangongStatusName: "没有照片" + },{ + id: 3, + dangongStatusName: "入库失败" + },{ + id: 4, + dangongStatusName: "与 XXX 相似度高" + },{ + id: 5, + dangongStatusName: "下载失败" + },{ + id: 6, + dangongStatusName: "照片太大" + },{ + id: 7, + dangongStatusName: "其他" + }], //弹弓设备状态列表 topicName: "topic", userId: "", }; @@ -1279,6 +1322,8 @@ export default { if (result.success) { if (result.result) { this.isIscDevice = result.result.supplierType == 9 ? true : false; + this.isDangong = result.result.supplierType == 8 ? true : false; + } } }); @@ -1309,6 +1354,8 @@ export default { this.tableParameter.personType + "&codeState=" + this.tableParameter.codeState + + "&dangongStatus=" + + this.tableParameter.dangongStatus + "&userEnterpriseId=" + this.$store.state.userInfo.userEnterpriseId; }, @@ -1330,6 +1377,8 @@ export default { this.tableParameter.personType + "&codeState=" + this.tableParameter.codeState + + "&dangongStatus=" + + this.tableParameter.dangongStatus + "&userEnterpriseId=" + this.$store.state.userInfo.userEnterpriseId + "&userId=" + @@ -1419,6 +1468,7 @@ export default { sendSuccessStatus: this.tableParameter.sendSuccessStatus, // 下发状态 workerName: this.tableParameter.workerName, //姓名 codeState: this.tableParameter.codeState, + dangongStatus: this.tableParameter.dangongStatus, // 弹弓状态 projectSn: this.projectSn, pageNo: this.page, pageSize: this.pageSize, From e7057217d3fb8744e4424bff61292e878181a7ad Mon Sep 17 00:00:00 2001 From: Rain_ <904416525@qq.com> Date: Thu, 13 Mar 2025 16:02:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?flx:=E6=8F=90=E4=BA=A4=E5=BC=B9=E5=BC=93?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E8=AF=A6=E6=83=85=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/api/laborPerson.js | 6 +- .../personModule/administration.vue | 102 ++++++++++------- .../personModule/laborComponent.vue | 103 +++++++++++------- 3 files changed, 134 insertions(+), 77 deletions(-) diff --git a/src/assets/js/api/laborPerson.js b/src/assets/js/api/laborPerson.js index 85ff1fe8..b842fc6d 100644 --- a/src/assets/js/api/laborPerson.js +++ b/src/assets/js/api/laborPerson.js @@ -26,6 +26,10 @@ export const pullMemberDataApi = data => post('xmgl/hikvision/getDoorEvents', da export const importImgDataApi = data => post('xmgl/workerInfo/uploadWorkerInfoImgs', data); // 导入照片数据 export const xmglXzHikvisionSyncGetNewestList = data => post('xmgl/xzHikvisionSync/getNewestList', data); // 导入照片数据 export const xmglXzHikvisionSyncRetryAPI = data => post('xmgl/xzHikvisionSync/retry', data); // 导入照片数据 +// 查找弹弓下发详情 +export const getDangongWorkerFaceStatusPageList = data => get('xmgl/dangongWorkerFaceStatus/page', data); + + //详情 @@ -275,4 +279,4 @@ export const getHikvisionManualCompareApi = data => post('xmgl/xzHikvisionCompar export const checkfaceHikvisionApi = data => post('xmgl/recognition/checkFace', data); //人员管理批量删除 -export const onBatchDeletionApi = data => post('xmgl/workerInfo/deleteBatch', data); +export const onBatchDeletionApi = data => post('xmgl/workerInfo/deleteBatch', data); \ No newline at end of file diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index 0a6ee102..953685fe 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -322,6 +322,7 @@ > +
-
+
所属企业： {{ row.enterpriseName }} @@ -2135,34 +2136,45 @@ align="center" :label="$t('message.personnelPosition.beaconManage.table.index')" > - - - - - - - - + + +
-
+
所属企业： {{ row.enterpriseName }} @@ -2384,34 +2385,46 @@ align="center" :label="$t('message.personnelPosition.beaconManage.table.index')" > - - - - - - - - + + + diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue index 465e5a0d..54f7bf4c 100644 --- a/src/views/projectFront/laborManage/personModule/laborComponent.vue +++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue @@ -2423,6 +2423,11 @@ {{row.msg}} + + +