fix: BUG修改

equipmentCenter.js

@@ -34,6 +34,10 @@ const routes = [{
                 path: 'laborDevManage',
                 name: '劳务管理_设备管理',
                 component: () => import('../views/equipmentCenter/laborManage/devConfig.vue'),
+            }, {
+                path: 'accessGroup',
+                name: '劳务管理_门禁分组',
+                component: () => import('../views/equipmentCenter/laborManage/accessGroup.vue'),
             }, {
                 path: 'markingRoomDevManage',
                 name: '标养室_设备管理',

src/assets/js/http.js

@@ -84,7 +84,7 @@ 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.221:9111/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
   // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
@@ -93,7 +93,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
   // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
   // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
-  axios.defaults.baseURL = 'http://47.93.215.234:9809/'//测试地址
+  // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//测试地址
 
 
 } else if (process.env.NODE_ENV == 'debug') {

src/router/equipmentCenter.js

@@ -34,6 +34,10 @@ const routes = [{
                 path: 'laborDevManage',
                 name: '劳务管理_设备管理',
                 component: () => import('../views/equipmentCenter/laborManage/devConfig.vue'),
+            }, {
+                path: 'accessGroup',
+                name: '劳务管理_门禁分组',
+                component: () => import('../views/equipmentCenter/laborManage/accessGroup.vue'),
             }, {
                 path: 'markingRoomDevManage',
                 name: '标养室_设备管理',

src/router/index.js

@@ -3598,6 +3598,12 @@ const routes2 = [
         component: () =>
           import("../views/equipmentCenter/laborManage/devConfig.vue"),
       },
+      {
+        path: "accessGroup",
+        name: "劳务管理_门禁分组",
+        component: () =>
+          import("../views/equipmentCenter/laborManage/accessGroup.vue"),
+      },
       {
         path: "carCameraDev",
         name: "车辆管理_车辆相机管理",
@@ -4789,6 +4795,12 @@ var devRoutes = {
       component: () =>
         import("../views/equipmentCenter/laborManage/devConfig.vue"),
     },
+    {
+      path: "accessGroup",
+      name: "劳务管理_门禁分组",
+      component: () =>
+        import("../views/equipmentCenter/laborManage/accessGroup.vue"),
+    },
     {
       path: "markingRoomDevManage",
       name: "标养室_设备管理",

src/store/index.js

@@ -48,23 +48,23 @@ export default new Vuex.Store({
     PAGESIZRS: [10, 20, 30, 50],
     // UPLOADURL:' http://101.43.164.214:11111/upload/image/',//  百色
     // FILEURL:' http://101.43.164.214:11111/image/',// 百色
-    // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
+    UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
-    // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
+    FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
-    // WORKFLOWURL: 'http://192.168.181.67:88/#/workspace/forms',//测试工作流地址(本地)
+    WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
     // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
     // FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试
 
-    BASEURL: baseUrl
+    // BASEURL: baseUrl
-      ? baseUrl
+    //   ? baseUrl
-      : window.location.protocol + "//" + window.location.host + "/", //正式环境
+    //   : window.location.protocol + "//" + window.location.host + "/", //正式环境
-    UPLOADURL:
+    // UPLOADURL:
-      window.location.protocol +
+    //   window.location.protocol +
-      "//" +
+    //   "//" +
-      window.location.host +
+    //   window.location.host +
-      "/upload/image", //正式环境
+    //   "/upload/image", //正式环境
-    FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
-    // WORKFLOWURL: 'http://jxj.zhgdyun.com:9811/#/workspace/forms',//正式工作流地址
+    // WORKFLOWURL: 'http://182.90.224.237:9811/#/workspace/forms',//测试平台工作流地址
-    WORKFLOWURL: 'http://jxj.zhgdyun.com:9814/#/workspace/forms',//正式工作流地址
+    // WORKFLOWURL: 'http://182.90.224.237:9814/#/workspace/forms',//鞍钢平台工作流地址
     //---------------------------------------------------------------------------------------------
     // BASEURL: baseUrl
     //   ? baseUrl

src/views/equipmentCenter/equipmentCenterIndex.vue

@@ -112,6 +112,13 @@ export default {
               id: 21,
               path: "/equipmentCenter/laborDevManage",
             },
+            {
+              menuName: "门禁分组", // 门禁分组
+              subhead: "门禁分组", // 门禁分组
+              operation: true,
+              id: 21,
+              path: "/equipmentCenter/accessGroup",
+            },
           ],
         },
         {

src/views/projectFront/laborManage/personModule/administration.vue

@@ -229,7 +229,7 @@
             $t('message.laborMange.export') + $t('message.laborMange.template')
           }}</el-button>
           <el-upload
-            style="display: inline-block; margin-left: 15px"
+            style="display: inline-block; margin-left: 5px"
             class="upload-demo"
             name="excelFile"
             :action="
@@ -249,11 +249,18 @@
               $t('message.laborMange.bulkImport')
             }}</el-button>
           </el-upload>
+          <el-button
+            size="medium"
+            @click="importImgOpen()"
+            type="primary"
+            style="margin-left: 5px"
+            >导入照片</el-button
+          >
           <el-button
             size="medium"
             @click="passEquipment()"
             type="primary"
-            style="margin-left: 15px"
+            style="margin-left: 5px"
             >下发通行设备</el-button
           >
           <br />
@@ -557,7 +564,75 @@
         </div>
       </div>
     </div>
-
+    <!-- 照片导入弹框 -->
+    <el-dialog
+      class="importImgDialog"
+      :modal-append-to-body="false"
+      title="导入照片"
+      :close-on-click-modal="false"
+      :visible.sync="imgImportDialog"
+      width="668px"
+    >
+      <div class="import-content">
+        <div class="alarm-content">
+          <i class="el-icon-warning-outline"></i>
+          <div>
+            向目标组织下批量导入人员正面免冠照，导入前建议使用人脸照片预处理工具进行质量清洗，并确认照片对应的人员信息是否存在。
+          </div>
+        </div>
+        <div class="import-operation">
+          <span>导入文件：</span>
+          <div>
+            <!-- :action="
+                $http.defaults.baseURL + 'xmgl/workerInfo/uploadWorkerInfoImgs'
+              " -->
+            <el-upload
+              class="upload-demo"
+              drag
+              name="files"
+              :action="$store.state.UPLOADURL"
+              :multiple="false"
+              :on-exceed="handleExceed"
+              :on-success="handleImportSuccess"
+              :file-list="imgFileList"
+              accept=".zip"
+            >
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">
+                将文件拖到此处，或<em>点击上传</em>
+              </div>
+            </el-upload>
+          </div>
+        </div>
+        <div
+          class="upload-tip"
+          :style="{ 'margin-top': imgFileList.length > 0 ? '40px' : '5px' }"
+        >
+          支持导入200MB以内的ZIP文件，建议文件中包含照片的数量在1000张以内；
+          照片命名规则为姓名_证件号码jpg，需露出眉毛和眼睛；单张照片文件大小10
+          KB~200 KB。
+        </div>
+        <div class="upload-tip-sub">
+          选择文件后将自动上传并进行数据校验
+        </div>
+        <div class="dialog-footer">
+          <el-button
+            class="cancleBtn"
+            @click="addEnterpriseDialog = false"
+            icon="el-icon-circle-close"
+            size="medium"
+            >{{ $t("message.laborMange.cancel") }}</el-button
+          >
+          <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            @click="saveImportFn()"
+            size="medium"
+            >导入</el-button
+          >
+        </div>
+      </div>
+    </el-dialog>
     <!-- 新增 || 编辑 人员录入弹窗 -->
     <el-dialog
       :modal-append-to-body="false"
@@ -1432,7 +1507,13 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row :gutter="24">
+            <div class="type-change">
+                  <el-radio-group v-model="typeRadio">
+                    <el-radio :label="1">设备</el-radio>
+                    <el-radio :label="2">分组</el-radio>
+                  </el-radio-group>
+                </div>
+            <el-row :gutter="24" v-if="typeRadio == 1" style="padding: 0px 12px;">
               <el-form-item
                 :label="$t('message.laborMange.faceDevice')"
                 prop="ufaceDevList"
@@ -1444,6 +1525,33 @@
                   >{{ $t('message.laborMange.checkAll') }}</el-checkbox
                 >
 
+                <el-checkbox-group
+                  v-model="personForm.ufaceDevId"
+                  @change="handleUfaceDevChange"
+                >
+                  <el-checkbox
+                    v-for="(item, index) in ufaceDevAllList"
+                    :key="item.id"
+                    :label="item.id"
+                    :disabled="item.disabled"
+                  >
+                    {{ item.devName }}
+                  </el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </el-row>
+            <el-row :gutter="24" v-if="typeRadio == 2" style="padding: 0px 12px;">
+              <el-form-item
+                label="分组名称"
+                prop="ufaceDevList"
+              >
+                <el-checkbox
+                  :indeterminate="isIndeterminate2"
+                  v-model="checkAllFaceDev"
+                  @change="handleCheckAllChangeFace"
+                  >{{ $t('message.laborMange.checkAll') }}</el-checkbox
+                >
+
                 <el-checkbox-group
                   v-model="personForm.ufaceDevId"
                   @change="handleUfaceDevChange"
@@ -1769,7 +1877,8 @@ import {
   batchSendWorkerInfoApi,
   sendWorkerInfoByIdApi,
   updateByIdWorkerInfo,
-  sendBatchWokerApi
+  sendBatchWokerApi,
+  importImgDataApi
 } from '@/assets/js/api/laborPerson'
 import { selectUserDevAuthorityByUserIdApi } from '@/assets/js/api/configManage'
 import { getProjectConfigListApi } from '@/assets/js/api/project.js'
@@ -1788,6 +1897,7 @@ export default {
   },
   data() {
     return {
+      typeRadio: 1,
       refreshPage: true,
       key: false,
       isCheckeedData: true, //判断一键下发是否有数据选中
@@ -1840,6 +1950,7 @@ export default {
       tableListData: [], //表格数据
       personDialogTitle: this.$t('message.laborMange.managementEntry'),
       titleType: 'add',
+      imgImportDialog: false, //照片导入 弹窗
       addPersonDialog: false, //人员录入 弹窗
       //人员表单字段
       personForm: {
@@ -1921,7 +2032,8 @@ export default {
       imgRadiolist: [],
       isSzProject: '',
       radio: '',
-      showImgList: false
+      showImgList: false,
+      imgFileList: [], // 照片文件列表
     }
   },
   created() {
@@ -1966,6 +2078,42 @@ export default {
     }
   },
   methods: {
+    // 导入照片数据
+    saveImportFn() {
+      if (this.imgFileList.length == 0) {
+        this.$message.success("请先导入文件");
+        return;
+      }
+      let data = new FormData(); //new出来的对象
+      data.append("file", this.imgFileList[0].raw);
+      data.append("projectSn", this.$store.state.projectSn);
+      importImgDataApi(data).then((res) => {
+        if (res.success) {
+          this.$message.success("操作成功");
+          this.imgImportDialog = false;
+          this.getTableData();
+        }
+      });
+    },
+    handleImportSuccess(response, file, fileList) {
+      console.log(response, file, fileList);
+      this.imgFileList = fileList;
+      console.log(this.imgFileList);
+    },
+    handleImportExceed(files, fileList) {
+      /*this.$message.warning(
+                    `当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+                        files.length + fileList.length
+                    } 个文件`
+                );*/
+      this.$message.warning(
+        this.$t("message.docManage.dialog_upload_files.limitingChoice")
+      ); //当前限制选择 1 个文件
+    },
+    // 导入照片弹窗
+    importImgOpen() {
+      this.imgImportDialog = true;
+    },
     handleUpload(fileData, type) {
       const file = fileData.file
       // 压缩图片
@@ -3513,6 +3661,9 @@ export default {
 .addPerson_content {
   height: 617px;
   padding-top: 10px;
+  .type-change{
+    margin: 5px 0px;
+  }
 }
 .custom-tree-node {
   display: flex;
@@ -3556,4 +3707,91 @@ export default {
     justify-content: space-around;
   }
 }
+// 照片导入
+.importImgDialog {
+  /deep/.el-dialog__body {
+    padding: 15px 20px;
+  }
+}
+.import-content {
+  .alarm-content {
+    display: flex;
+    align-items: center;
+    margin-left: 104px;
+    .el-icon-warning-outline {
+      color: #ea3941;
+      font-size: 23px;
+    }
+    div {
+      width: 405px;
+      line-height: 18px;
+      font-family: Source Han Sans CN, Source Han Sans CN;
+      font-weight: 400;
+      font-size: 12px;
+      color: #ea3941;
+      margin: 5px;
+    }
+  }
+  .import-operation {
+    display: flex;
+    margin-top: 5px;
+    margin-left: 136px;
+    span {
+      font-family: Source Han Sans CN, Source Han Sans CN;
+      font-weight: 400;
+      font-size: 14px;
+      color: #272d45;
+      margin-right: 10px;
+    }
+    > div {
+      .upload-demo {
+        width: 321px;
+        height: 45px;
+        /deep/.el-upload {
+          width: 100%;
+          height: 100%;
+          .el-upload-dragger {
+            width: 100%;
+            height: 100%;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            .el-icon-upload {
+              color: #a2a4af;
+              font-size: 20px;
+              margin: 0px;
+              margin-right: 5px;
+            }
+            .el-upload__text {
+              font-family: Source Han Sans CN, Source Han Sans CN;
+              font-weight: 400;
+              font-size: 14px;
+              color: #a2a4af;
+            }
+          }
+        }
+      }
+    }
+  }
+  .upload-tip {
+    width: 321px;
+    margin-left: 215px;
+    margin-top: 5px;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 12px;
+    line-height: 18px;
+    color: #a2a4af;
+  }
+  .upload-tip-sub {
+    width: 321px;
+    margin-left: 215px;
+    margin-top: 5px;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 14px;
+    color: #5181f6;
+    line-height: 16px;
+  }
+}
 </style>

src/views/projectFront/laborManage/personModule/laborComponent.vue

@@ -542,7 +542,7 @@
               name="files"
               :action="$store.state.UPLOADURL"
               :multiple="false"
-              :on-exceed="handleExceed"
+              :on-exceed="handleImportExceed"
               :on-success="handleImportSuccess"
               :file-list="imgFileList"
               accept=".zip"
@@ -1515,7 +1515,13 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-                <el-row>
+                <div class="type-change">
+                  <el-radio-group v-model="typeRadio">
+                    <el-radio :label="1">设备</el-radio>
+                    <el-radio :label="2">分组</el-radio>
+                  </el-radio-group>
+                </div>
+                <el-row v-if="typeRadio == 1">
                   <el-form-item
                     :label="$t('message.laborMange.faceDevice')"
                     prop="ufaceDevList"
@@ -1541,6 +1547,32 @@
                     </el-checkbox-group>
                   </el-form-item>
                 </el-row>
+                <el-row v-if="typeRadio == 2">
+                  <el-form-item
+                    label="分组名称"
+                    prop="ufaceDevList"
+                  >
+                    <el-checkbox
+                      :indeterminate="isIndeterminate2"
+                      v-model="checkAllFaceDev"
+                      @change="handleCheckAllChangeFace"
+                      >{{ $t("message.laborMange.checkAll") }}</el-checkbox
+                    >
+                    <el-checkbox-group
+                      v-model="personForm.ufaceDevId"
+                      @change="handleUfaceDevChange"
+                    >
+                      <el-checkbox
+                        v-for="(item, index) in ufaceDevAllList"
+                        :key="index"
+                        :label="item.id"
+                        :disabled="item.disabled"
+                      >
+                        {{ item.devName }}
+                      </el-checkbox>
+                    </el-checkbox-group>
+                  </el-form-item>
+                </el-row>
               </el-col>
               <el-col :span="8">
                 <el-row :gutter="24">
@@ -2122,6 +2154,7 @@ export default {
   },
   data() {
     return {
+      typeRadio: 1,
       refreshPage: true, //静默刷新
       radio: "",
       key: false, //判断是否显示一件下发按钮
@@ -2349,7 +2382,7 @@ export default {
       this.imgFileList = fileList;
       console.log(this.imgFileList);
     },
-    handleExceed(files, fileList) {
+    handleImportExceed(files, fileList) {
       /*this.$message.warning(
                     `当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
                         files.length + fileList.length
@@ -4434,6 +4467,9 @@ export default {
   .el-form-item--small.el-form-item {
     margin-bottom: 10px;
   }
+  .type-change{
+    margin: 5px 0px;
+  }
 }
 
 .shut_icon {

src/views/projectFront/safeManage/v2/checkStandingBook.vue

@@ -1451,7 +1451,7 @@ export default {
         imageUrl: imgList.join(','),
         inspectTypeId: this.formData.inspectTypeId,
         projectSn: this.projectSn,
-        recordType: 1,
+        recordType: this.formData.status == 1?2:1,
         rectifyRequire: this.formData.rectifyRequire,
         reviewId: this.$store.state.userInfo.userId,
         status: this.formData.status,