Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-09-11 10:01:32
+ * @LastEditTime: 2023-09-14 16:21:51
 -->
 <template>
-  <el-image-viewer :on-close="closeViewer" :url-list="urlList">
+  <el-image-viewer :on-close="closeViewer" :url-list="urlList" :initial-index="initialIndex">
   </el-image-viewer>
 </template>
 <script>
@@ -19,6 +19,10 @@
         default: function () {
           return []
         }
+      },
+      initialIndex: {
+        type: Number,
+        default: 0
       }
     },
     data () {

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-09-11 10:18:11
+ * @LastEditTime: 2023-09-14 17:11:15
 -->
 <template>
   <transition name="msgbox-fade">
@@ -160,7 +160,7 @@
   .mask-content {
     padding: 5px 20px 30px 20px;
     width: 100%;
-    min-height: 20%;
+    min-height: 253px;
     max-height: 90vh;
     overflow-y: scroll;
   }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 15:36:42
+ * @LastEditTime: 2023-09-14 16:16:57
 -->
 <template>
   <div class="rlPopup">
@@ -148,6 +148,7 @@
             } else {
               this.previewImg.index = this.previewImg.index + 1
             }
+            this.initialIndex = this.previewImg.index
             this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
             this.$message({
               message: '移动成功!',
@@ -234,6 +235,7 @@
        */
       showCurrent (index) {
         this.previewImg.index = index
+        this.initialIndex = index
       },
       /**
        * @description: closeViewer

           <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 17:08:19
+ * @LastEditTime: 2023-09-14 16:37:15
 -->
 <template>
   <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
@@ -28,25 +28,30 @@
       :calcHeight="300">
     </lb-table>
     <el-row>
-      <el-col :span="6">
-        <el-form-item label="领证人" prop="lzrxm">
+      <el-col :span="3">
+        <el-form-item label="身份证读卡器">
+          <el-button type="text" icon="el-icon-tickets" @click="readClick">读取</el-button>
+        </el-form-item>
+      </el-col>
+      <el-col :span="5">
+        <el-form-item label="领证人" prop="lzrxm" label-width="70px">
           <el-input v-model="ruleForm.lzrxm"></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="6">
-        <el-form-item label="证件类型" prop="lzrzjlb">
+      <el-col :span="5">
+        <el-form-item label="证件类型" prop="lzrzjlb" label-width="80px">
           <el-select v-model="ruleForm.lzrzjlb" filterable clearable placeholder="请选择">
             <el-option v-for="item in lzrzjlbData" :key="item.dcode" :label="item.dname" :value="item.dcode">
             </el-option>
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="6">
-        <el-form-item label="证件号" prop="lzrzjh">
+      <el-col :span="5">
+        <el-form-item label="证件号" prop="lzrzjh" label-width="70px">
           <el-input v-model="ruleForm.lzrzjh"></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="6">
+      <el-col :span="5">
         <el-form-item label="领证人电话" prop="lzrdh">
           <el-input v-model="ruleForm.lzrdh"></el-input>
         </el-form-item>
@@ -62,7 +67,8 @@
   import Vue from 'vue'
   import store from '@/store/index.js'
   import table from "@/utils/mixin/table";
-  import { getUnclaimedBdcqz, issueCertificate,getBdcqzQlr } from "@/api/bdcqz.js";
+  import { getIdCardInfo } from '@/utils/operation.js'
+  import { getUnclaimedBdcqz, issueCertificate, getBdcqzQlr } from "@/api/bdcqz.js";
   import { datas } from "../../javascript/fzxxdata";
   export default {
     props: {
@@ -115,6 +121,29 @@
     },
     methods: {
       /**
+       * @description: 身份证打卡器
+       * @author: renchao
+       */
+      readClick () {
+        getIdCardInfo().then(res => {
+          if (res.data.code == 0) {
+            let data = res.data.IDCardInfo
+            this.ruleForm.lzrxm = data.name
+            this.ruleForm.lzrzjlb = '1'
+            this.ruleForm.lzrzjh = data.cardID
+            this.$message({
+              message: '读取成功！',
+              type: 'success'
+            })
+          } else {
+            this.$message({
+              message: res.data.message,
+              type: 'warning'
+            })
+          }
+        })
+      },
+      /**
        * @description: 列表初始化
        * @author: renchao
        */

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-09-06 15:20:16
+ * @LastEditTime: 2023-09-14 17:19:26
 -->
 <template>
   <div class="slxx sdqxx">
@@ -119,10 +119,6 @@
       formdata.append("bsmSldy", this.propsParam.bsmSldy);
       formdata.append("djlx", this.propsParam.djlx);
       formdata.append("isEdit", this.viewEdit);
-      // Init(formdata).then((res) => {
-      //   if (res.code === 200 && res.result) {
-      //   }
-      // });
     },
     data () {
       return {

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 16:16:08
+ * @LastEditTime: 2023-09-14 16:06:51
 -->
 <template>
-  <div>
-    <canvas id="mxcad" style="width:100%;height:100%">
+  <div style="width:90%;height:100%;">
+    <canvas id="mxcad" style="width:90%;height:80%; position: relative;top:0">
     </canvas>
   </div>
 </template>
@@ -20,20 +20,17 @@
         Mx.MxFun.createMxObject({
           canvasId: "mxcad", // canvas元素的id
           cadFile: "buf/hhhh.dwg", // http方式(预览): 加载public/demo文件夹下转换后的图纸
-          // cadFile: "test2.dwg", //  socket通信方式请直接提供图纸名称 如：text.dwg
           callback: (mxDraw, {
             canvas,
             canvasParent
           }) => {
             // 可以拿到canvas元素和它的父级元素
-            console.log(canvas, canvasParent)
-            console.log(mxDraw)
             // 拿到图层数据
             mxDraw.addEvent('uiSetLayerData', (listLayer) => {
               console.log(listLayer)
             })
           },
-          isNewFile: false // 是否新建文件
+          isNewFile: true // 是否新建文件
         })
       })
     }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 13:57:48
+ * @LastEditTime: 2023-09-14 17:19:13
 -->
 <template>
   <div class="container">
@@ -194,7 +194,8 @@
             setTimeout(() => {
               this.prinsss()
             }, 100)
-
+          } else {
+            this.$message.error(res.message);
           }
         })
       },

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-12 13:46:29
+ * @LastEditTime: 2023-09-14 16:24:07
 -->
 <template>
   <div class="rlPopup">
@@ -86,7 +86,7 @@
         // 缩略图
         thumbnailImages: [],
         showViewer: false,
-        initialIndex: undefined,
+        initialIndex: 0,
         allLi: [],
       }
     },
@@ -152,6 +152,7 @@
             } else {
               this.previewImg.index = this.previewImg.index + 1
             }
+            this.initialIndex = this.previewImg.index
             this.$emit('updateList', { children: res.result, bsmMaterial: this.previewImg.bsmMaterial })
             this.$message({
               message: '移动成功!',
@@ -238,6 +239,7 @@
        */
       showCurrent (index) {
         this.previewImg.index = index
+        this.initialIndex = index
       },
       /**
        * @description: closeViewer

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 09:50:02
+ * @LastEditTime: 2023-09-14 17:19:40
 -->
 <template>
   <div class="slxx">
@@ -310,6 +310,8 @@
       Init(formdata).then((res) => {
         if (res.code === 200 && res.result) {
           this.ruleForm = res.result;
+        } else {
+          this.$message.error(res.message);
         }
       });
     },

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-12 09:59:18
+ * @LastEditTime: 2023-09-14 17:19:58
 -->
 <template>
   <!-- 受理信息 -->
@@ -365,6 +365,7 @@
   import { mapGetters } from "vuex";
   export default {
     mounted () {
+      let that = this
       this.loading = true
       this.viewEdit = this.$parent.currentSelectTab.ableOperation;
       this.propsParam = this.$attrs;
@@ -381,14 +382,16 @@
           this.loading = false
         }, 200)
         if (res.code === 200 && res.result) {
-          this.ruleForm = res.result;
-          this.czrOptions = this.ruleForm.qlrList;
+          that.ruleForm = res.result;
+          that.czrOptions = this.ruleForm.qlrList;
+          that.ruleForm.qlrList.forEach((item) => {
+            if (item.sfczr == 1) {
+              that.czr = item.zjh
+            }
+          })
+        } else {
+          that.$message.error(res.message);
         }
-        this.ruleForm.qlrList.forEach((item) => {
-          if (item.sfczr == 1) {
-            this.czr = item.zjh
-          }
-        });
       }).catch(() => {
         this.loading = false
       })

 <!--
  * @Description: 房屋多幢受理信息
  * @Autor: ssq
- * @LastEditTime: 2023-09-13 14:41:34
+ * @LastEditTime: 2023-09-14 17:20:40
 -->
 <template>
   <div class="slxx">
@@ -103,7 +103,7 @@
           </el-col>
         </el-row>
         <el-row :gutter="10" v-if="ruleForm.fdcq1">
-           <el-col :span="8">
+          <el-col :span="8">
             <el-form-item label="独用土地面积：">
               <div class="flex">
                 <el-input
@@ -313,6 +313,8 @@
             }
           });
           this.czrOptions = this.ruleForm.qlrList;
+        } else {
+          this.$message.error(res.message);
         }
       })
     },

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-09-12 10:04:14
+ * @LastEditTime: 2023-09-14 17:17:56
 -->
 <template>
   <div class="slxx">
@@ -440,6 +440,8 @@
             }
           });
           this.czrOptions = this.ruleForm.qlrList;
+        } else {
+          this.$message.error(res.message);
         }
       }).catch(() => {
         this.loading = false

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 14:16:46
+ * @LastEditTime: 2023-09-14 17:20:53
 -->
 <template>
   <div class="slxx">
@@ -299,6 +299,8 @@
             }
           });
           this.czrOptions = this.ruleForm.qlrList;
+        } else {
+          this.$message.error(res.message);
         }
       }).catch(() => {
         this.loading = false

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 14:17:15
+ * @LastEditTime: 2023-09-14 17:20:59
 -->
 <template>
   <div class="slxx">
@@ -296,6 +296,8 @@
           this.czrOptions = this.ruleForm.qlrList;
           this.gyfs = this.ruleForm.sldyList[0].gyfs;
           this.splicingFdcq2Info();
+        } else {
+          this.$message.error(res.message);
         }
         this.ruleForm.qlrList.forEach((item) => {
           if (item.sfczr == 1) {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 14:05:26
+ * @LastEditTime: 2023-09-14 17:21:04
 -->
 <template>
   <!-- 受理信息 -->
@@ -264,6 +264,8 @@
             }
           });
           this.czrOptions = this.ruleForm.qlrList;
+        } else {
+          this.$message.error(res.message);
         }
       }).catch(() => {
         this.loading = false
@@ -356,6 +358,8 @@
               ...res.result.qlxxdatas,
               ...res.result.jsydsyqdatas,
             };
+          } else {
+            this.$message.error(res.message);
           }
         });
       },

@@ -2,7 +2,7 @@
 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 14:17:49
+ * @LastEditTime: 2023-09-14 17:21:19
 -->
 <template>
   <!-- 受理信息 -->
@@ -239,6 +239,8 @@
         if (res.code === 200 && res.result) {
           this.ruleForm = res.result;
           this.czrOptions = this.ruleForm.qlrList;
+        } else {
+          this.$message.error(res.message);
         }
         this.ruleForm.qlrList.forEach((item) => {
           if (item.sfczr == 1) {

@@ -352,6 +352,8 @@
           setTimeout(() => {
             this.loading = false
           }, 200)
+        } else {
+          this.$message.error(res.message);
         }
       })
     },

@@ -345,6 +345,8 @@
             ? (this.ruleForm.slsq.fzfs = "1")
             : this.ruleForm.slsq.fzfs;
           this.czrOptions = this.ruleForm.qlrList;
+        } else {
+          this.$message.error(res.message);
         }
       });
     },

@@ -227,9 +227,11 @@
             if (item.sfczr == 1) {
               this.czr = item.zjh
             }
-          });
+          })
+        } else {
+          this.$message.error(res.message);
         }
-      });
+      })
     },
     components: { qlrCommonTable, ywrCommonTable },
     computed: {

@@ -327,6 +327,8 @@
           setTimeout(() => {
             that.loading = false
           }, 200)
+        } else {
+          this.$message.error(res.message);
         }
       })
     },

@@ -345,6 +345,8 @@
               this.czr = item.zjh
             }
           })
+        } else {
+          this.$message.error(res.message);
         }
       }).catch(() => {
         this.loading = false