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/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/store/index.js b/src/store/index.js index 071a7978..20b9ae24 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -81,6 +81,8 @@ export default new Vuex.Store({ // 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", //坤工作流地址(本地) @@ -100,6 +102,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..ab4d390a 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -322,6 +322,7 @@ > + + + + --> +
所属企业： {{ row.enterpriseName }} @@ -2116,34 +2136,50 @@ align="center" :label="$t('message.personnelPosition.beaconManage.table.index')" > - - - - - - - - + + + + + + -->
+
所属企业： {{ row.enterpriseName }} @@ -2365,34 +2385,51 @@ align="center" :label="$t('message.personnelPosition.beaconManage.table.index')" > - - - - - - - - + + +
{{ $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,