Merge remote-tracking branch 'origin/pet' into pet

package.json

@@ -5,7 +5,7 @@
   "author": "",
   "private": true,
   "scripts": {
-    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js  --host 192.168.0.90",
+    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js  --host 192.168.151.75",
     "start": "npm run dev",
     "unit": "jest --config test/unit/jest.conf.js --coverage",
     "e2e": "node test/e2e/runner.js",

src/views/corpInfo/user/components/edit.vue

@@ -139,11 +139,11 @@
                     <i class="el-icon-plus"/>
                   </el-upload>
                   <div style="margin-left:20px;line-height:1.6">
-                    <!-- <div style="color: red;font-size: 12px">（若新上传人脸图片将覆盖旧人脸信息，不上传则不做修改）</div>
+                    <div style="color: red;font-size: 12px">（若新上传人脸图片将覆盖旧人脸信息，不上传则不做修改）</div>
                     <div style="color: red;font-size: 12px">* 图像格式：JPEG、JPG、PNG、BMP</div>
                     <div style="color: red;font-size: 12px">* 图像大小：不超过1M。</div>
-                    <div style="color: red;font-size: 12px">* 图像分辨率：大于32×32像素，小于4096×4096像素，<br>人脸占比不低于64×64像素。</div> -->
+                    <div style="color: red;font-size: 12px">* 图像分辨率：大于32×32像素，小于4096×4096像素，<br>人脸占比不低于64×64像素。</div>
-                    <!-- <div style="color: red;font-size: 12px">（如无合适照片请该人员登陆曹港APP中进行人脸照片采集）</div> -->
+                    <div style="color: red;font-size: 12px">（如无合适照片请该人员登陆曹港APP中进行人脸照片采集）</div>
                   </div>
                 </div>
               </el-form-item>
@@ -812,7 +812,7 @@ export default {
         DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }],
         SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }],
         NATION: [{ required: false, trigger: 'blur' }],
-        SEX: [{ required: false, trigger: 'blur' }],
+        SEX: [{ required: false, trigger: 'blur' }], // / dsfsdfsd
         POLITICAL_OUTLOOK: [{ required: true, message: '政治面貌不能为空', trigger: 'blur' }],
         DATE_OF_BIRTH: [{ required: true, message: '请选择出生年月', trigger: 'blur' }],
         DEGREE_OF_EDUCATION: [{ required: true, message: '文化程度不能为空', trigger: 'blur' }],

src/views/firefighting/points/components/list.vue

@@ -186,11 +186,11 @@
             <div class="row">
               <div class="title">检查码</div>
               <div class="qr">
-                <vue-qr :text="qrcodeStr" :margin="0" :size="280" color-dark="#000" color-light="#fff"/>
+                <vue-qr :text="qrcodeStr_jianchama" :margin="0" :size="280" color-dark="#000" color-light="#fff"/>
               </div>
               <div class="title">查询码</div>
               <div class="qr">
-                <vue-qr :text="qrcodeStr1" :margin="0" :size="280" color-dark="#000" color-light="#fff"/>
+                <vue-qr :text="qrcodeStr_chaxunma" :margin="0" :size="280" color-dark="#000" color-light="#fff"/>
               </div>
             </div>
           </div>
@@ -210,13 +210,13 @@
             <div class="row">
               <div class="title">检查码</div>
               <div class="qr">
-                <vue-qr :text="qrcodeStr" :margin="0" :size="280" color-dark="#000" color-light="#fff"/>
+                <vue-qr :text="qrcodeStr_jianchama" :margin="0" :size="280" color-dark="#000" color-light="#fff"/>
               </div>
             </div>
             <div class="row">
               <div class="title">查询码</div>
               <div class="qr">
-                <vue-qr :text="qrcodeStr1" :margin="0" :size="280" color-dark="#000" color-light="#fff"/>
+                <vue-qr :text="qrcodeStr_chaxunma" :margin="0" :size="280" color-dark="#000" color-light="#fff"/>
               </div>
             </div>
           </div>
@@ -287,8 +287,8 @@ export default {
       listLoading: true,
       dialogFormShow: false,
       dialogRecordFormShow: false,
-      qrcodeStr: '',
+      qrcodeStr_jianchama: '',
-      qrcodeStr1: '',
+      qrcodeStr_chaxunma: '',
       tabsActive: 'horizontal',
       recordQrcodeStr: '',
       qrInfo: {},
@@ -352,34 +352,6 @@ export default {
     this.getTreeData()
   },
   methods: {
-    handleShowQr(ROW) {
-      this.dialogFormShow = true
-      this.qrInfo = ROW
-      this.qrcodeStr = JSON.stringify({
-        MANAGER_TYPE: 'fireListManager',
-        FIRE_POINT_ID: ROW.FIRE_POINT_ID
-      })
-    },
-    handleShowRecordQr(ROW) {
-      console.log(ROW)
-      this.dialogFormShow = true
-      // 确保qrInfo绑定了需要显示的数据字段
-      this.qrInfo = {
-        FIRE_REGION_NAME: ROW.FIRE_REGION_NAME, // 消防区域
-        FIRE_POINT_NAME: ROW.FIRE_POINT_NAME, // 消防点位
-        DEPARTMENT_NAME: ROW.DEPARTMENT_NAME, // 负责部门
-        USERNAME: ROW.USERNAME // 负责人
-      }
-      const json = {
-        MANAGER_TYPE: 'checkRecordManager',
-        USER_ID: ROW.USER_ID,
-        DEPARTMENT_ID: ROW.DEPARTMENT_ID,
-        FIRE_POINT_ID: ROW.FIRE_POINT_ID
-      }
-      const jsonStr = JSON.stringify(json)
-      this.qrcodeStr = jsonStr
-      console.info(this.qrcodeStr)
-    },
     handleShowNotificationCard(ROW) {
       this.dialogFormShow = true
       this.qrInfo = ROW
@@ -391,7 +363,7 @@ export default {
         FIRE_POINT_ID: ROW.FIRE_POINT_ID
       })
       // 查询码
-      this.qrcodeStr1 = JSON.stringify({
+      this.qrcodeStr_jianchama = JSON.stringify({
         MANAGER_TYPE: 'fireListManager',
         FIRE_POINT_ID: ROW.FIRE_POINT_ID
       })