Merge branch 'dev'

 {
   "TITLE": "不动产登记系统",
-  "SERVERAPI": "/bdcdj",
+  "SERVERAPI": "/bdcdj-th",
   "ip": "http://192.168.2.38",
   "IDCARDURL": "http://127.0.0.1:33088/function=get_idcard&readnew=0"
 }
\ No newline at end of file

+import Vue from 'vue'
+import axios from 'axios'
 import { Message } from "element-ui";
 export function removeTreeListItem (treeList, dictId, idName = 'bsmDict') {
   if (!treeList || !treeList.length) {
@@ -111,7 +113,6 @@ export function down (index, data) {
   }
 }
 
-
 export function getUrlParam (paraName) {
   let url = document.location.toString();
   let arrObj = url.split('?');
@@ -133,3 +134,25 @@ export function getUrlParam (paraName) {
     return '';
   }
 }
+/**
+ * @description: 身份证读卡器组件
+ * @author: renchao
+ */
+export function getIdCardInfo () {
+  return axios.post(Vue.prototype.BASE_API.IDCARDURL)
+}
+/**
+ * @description: 高拍仪组件
+ * @author: renchao
+ */
+export function getAltimeterInfo () {
+  let data = {
+    "filepath": "base64",
+    "rotate": "0",
+    "cutpage": "0",
+    "camidx": "0",
+    "ColorMode": "0",
+    "quality": "3"
+  }
+  return axios.post("http://127.0.0.1:38088/video=grabimage", JSON.stringify(data))
+}
\ No newline at end of file

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-06-14 11:10:26
+ * @LastEditTime: 2023-06-16 11:12:13
 -->
 <template>
   <div class="rlPopup">
@@ -46,7 +46,7 @@
   </div>
 </template>
 <script>
-  import axios from 'axios'
+  import { getAltimeterInfo } from '@/utils/operation.js'
   import PhotoZoom from '@/components/PhotoZoom'
   import { uploadSjClmx, deleteClmx } from "@/api/clxx.js";
   import publicPicture from '@/components/publicPicture/index.vue'
@@ -149,20 +149,11 @@
           const file = new File([blob], options);
           return file;
         }
-
-        let data = {
-          "filepath": "base64",
-          "rotate": "0",
-          "cutpage": "0",
-          "camidx": "0",
-          "ColorMode": "0",
-          "quality": "3"
-        }
-        axios.post("http://127.0.0.1:38088/video=grabimage", JSON.stringify(data)).then((res) => {
+        getAltimeterInfo().then(res => {
           let blob = dataURLtoBlob('data:image/png;base64,' + res.data.photoBase64);
           let file = blobToFile(blob);
           var formData = new FormData();
-          formData.append('file', file.raw)
+          formData.append('file', file)
           formData.append("bsmSj", this.previewImg.bsmSj);
           formData.append("bsmSlsq", this.previewImg.bsmSlsq);
           uploadSjClmx(formData).then((res) => {

@@ -24,7 +24,7 @@
           </div>
           <el-button type="primary" native-type="submit" style="width:100%" @click="handleAdd()" v-if="!this.$route.query.viewtype">新增</el-button>
         </div>
-        <image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
+        <image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
           @prevPriview="prevPriview" />
       </div>
     </div>
@@ -39,7 +39,7 @@
   import { InitClml, saveClml, deleteSjClml, moveClml } from "@/api/clxx.js";
   import { popupDialog } from "@/utils/popup.js";
   export default {
-    components: { clxxAddDialog, imagePreview},
+    components: { clxxAddDialog, imagePreview },
     data () {
       return {
         isDialog: false,

@@ -66,9 +66,9 @@
             <el-select v-model="scope.row.sqrzjlxbm" class="width100">
               <el-option
                 v-for="item in zjzlData"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
+                :key="item.dcode"
+                :label="item.dname"
+                :value="item.dcode">
               </el-option>
             </el-select>
           </template>
@@ -113,10 +113,10 @@
   </div>
 </template>
 <script>
-  import axios from 'axios'
   import store from '@/store/index.js'
-  import { getLodop } from "@/utils/LodopFuncs"
   import { datas } from "./addjtfcdata";
+  import { getLodop } from "@/utils/LodopFuncs"
+  import { getIdCardInfo } from '@/utils/operation.js'
   import { getPrintTemplateByCode } from "@/api/system";
   import { addJtfcCxjgXx, getJtfcInfo, printJtcfInfo } from "@/api/sqcx";
   export default {
@@ -359,7 +359,7 @@
         this.isSearch = false;
       },
       handleRead (row, type) {
-        axios.post(this.BASE_API.IDCARDURL).then(res => {
+        getIdCardInfo().then(res => {
           if (res.data.code == 0) {
             let data = res.data.IDCardInfo
             row.sqrxm = data.name
@@ -372,7 +372,6 @@
             if (type == 'sqr') {
               this.form.qlrList = _.cloneDeep(this.form.sqrList)
             }
-            console.log(this.form.sqrList);
           } else {
             this.$message({
               message: res.data.message,

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-05-17 10:40:46
+ * @LastEditTime: 2023-06-16 11:12:40
 -->
 <template>
   <div class="clxx">
@@ -33,7 +33,7 @@
             </div>
           </div>
         </div>
-        <image-preview ref='imageRef' :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
+        <image-preview ref='imageRef' v-if="tableData.length>0" :previewImg="previewImg" @updateList="updateList" @nextPriview="nextPriview"
           @prevPriview="prevPriview" />
       </div>
     </div>

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-06-14 13:14:26
+ * @LastEditTime: 2023-06-16 10:38:23
 -->
 <template>
   <div>
@@ -12,8 +12,8 @@
   </div>
 </template>
 <script>
-  import axios from 'axios'
   import { mapGetters } from 'vuex'
+  import { getIdCardInfo } from '@/utils/operation.js'
   import addQlr from './dialog/addQlr.vue'
   export default {
     components: {
@@ -195,7 +195,7 @@
 
       // 身份证读取
       readClick (row) {
-        axios.post(this.BASE_API.IDCARDURL).then(res => {
+        getIdCardInfo().then(res => {
           if (res.data.code == 0) {
             let data = res.data.IDCardInfo
             row.sqrmc = data.name

+/*
+ * @Description:
+ * @Autor: renchao
+ * @LastEditTime: 2023-05-05 09:45:31
+ */
+import Router from '@/router'
+export default {
+  methods: {
+    //点击行选中或取消复选框
+    handleRowClick (row, column, event) {
+      this.$refs.table.toggleRowSelection(row)
+    },
+    jump (data, type) {
+      const { href } = Router.resolve(
+        "/djbworkFrame?bsmSlsq=" +
+        data.bsmSlsq +
+        "&bestepid=" +
+        data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type
+      );
+      window.open(href, "_blank");
+      this.$popupCacel()
+    },
+    queryClick () {
+      this.pageData.currentPage = 1
+      // this.fetchData();
+    }
+  }
+}