Merge branch 'dev'

@@ -40,5 +40,8 @@ import { popupDialog,popupCacel} from "@/utils/popup.js";
 popupDialog(title, "xxxx", data);
 popupDialog(title, "xxxx", data);
 popupCacel() 可以关闭弹框
 popupCacel() 可以关闭弹框
 
 
+<!-- 高拍仪类型 -->
+<!-- lt:良田 jy:捷宇 -->
+
 
 
 
 

@@ -17,6 +17,7 @@
     "bpmn-js-token-simulation": "^0.10.0",
     "bpmn-js-token-simulation": "^0.10.0",
     "core-js": "^3.6.5",
     "core-js": "^3.6.5",
     "diagram-js": "^6.8.2",
     "diagram-js": "^6.8.2",
+    "echarts": "^5.4.3",
     "js-cookie": "2.2.0",
     "js-cookie": "2.2.0",
     "lodash": "^4.17.21",
     "lodash": "^4.17.21",
     "mxdraw": "^0.1.157",
     "mxdraw": "^0.1.157",
@@ -26,6 +27,7 @@
     "print-js": "^1.6.0",
     "print-js": "^1.6.0",
     "qrcode": "^1.5.3",
     "qrcode": "^1.5.3",
     "sortablejs": "^1.15.0",
     "sortablejs": "^1.15.0",
+    "tiff.js": "^1.0.0",
     "vue": "2.6.10",
     "vue": "2.6.10",
     "vue-json-editor": "^1.4.3",
     "vue-json-editor": "^1.4.3",
     "vue-print-nb": "^1.7.5",
     "vue-print-nb": "^1.7.5",
@@ -33,7 +35,9 @@
     "vue-router": "3.0.2",
     "vue-router": "3.0.2",
     "vue-seamless-scroll": "^1.1.23",
     "vue-seamless-scroll": "^1.1.23",
     "vuex": "3.1.0",
     "vuex": "3.1.0",
-    "x2js": "^3.4.4"
+    "x2js": "^3.4.4",
+    "xlsx": "^0.17.5",
+    "xlsx-style": "^0.8.13"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.4",
     "@vue/cli-plugin-babel": "4.4.4",

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

 /*
 /*
  * @Description: 不动产权证
  * @Description: 不动产权证
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-09-13 16:06:55
+ * @LastEditTime: 2023-11-15 13:32:46
  */
  */
 import request from '@/utils/request';
 import request from '@/utils/request';
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
@@ -160,3 +160,16 @@ export function getBdcqzQlr (bsmBdcqz) {
         }
         }
     })
     })
 }
 }
+
+/**
+ * @description: 修改
+ * @param {*} data
+ * @author: renchao
+ */
+export function editBdcqz (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/rest/ywbl/bdcqz/editBdcqz',
+        method: 'post',
+        data
+    })
+}
\ No newline at end of file

 /*
 /*
  * @Description: 材料信息
  * @Description: 材料信息
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-09-18 16:03:16
+ * @LastEditTime: 2024-01-19 16:00:03
  */
  */
 import request from '@/utils/request'
 import request from '@/utils/request'
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))

@@ -23,7 +23,7 @@ export function getDjbfm (data) {
  * @param {*} params
  * @param {*} params
  * @author: renchao
  * @author: renchao
  */
  */
- export function getQllxByBdcdyid (params) {
+export function getQllxByBdcdyid (params) {
   return request({
   return request({
     url: SERVER.SERVERAPI + '/rest/djbDetail/getQllxByBdcdyid',
     url: SERVER.SERVERAPI + '/rest/djbDetail/getQllxByBdcdyid',
     method: 'get',
     method: 'get',
@@ -81,7 +81,18 @@ export function getBdcqljqtsx (data) {
     params: data
     params: data
   })
   })
 }
 }
-
+/**
+ * @description: 获取不动产权利及其他事项Bdcdyh
+ * @param {*} data
+ * @author: renchao
+ */
+export function getBdcqljqtsxBdcdyh (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/djbDetail/getBdcqljqtsxBdcdyh',
+    method: 'get',
+    params: data
+  })
+}
 /**
 /**
  * @description: 获取土地所有权
  * @description: 获取土地所有权
  * @param {*} data
  * @param {*} data
@@ -109,6 +120,19 @@ export function getJsydsyqList (data) {
 }
 }
 
 
 /**
 /**
+ * @description: 获取土地承包经营权
+ * @param {*} data
+ * @author: renchao
+ */
+export function getTdcbjyqList (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/djbDetail/getTdcbjyqList',
+    method: 'post',
+    data
+  })
+}
+
+/**
  * @description: 获取房屋独幢信息集合
  * @description: 获取房屋独幢信息集合
  * @param {*} data
  * @param {*} data
  * @author: renchao
  * @author: renchao
@@ -224,7 +248,7 @@ export function getNydsyqList (data) {
  * @author: renchao
  * @author: renchao
  */
  */
 
 
- export function getDjbQlxxDiff (data) {
+export function getDjbQlxxDiff (data) {
   return request({
   return request({
     url: SERVER.SERVERAPI + '/rest/djbDetail/getDjbQlxxDiff?bsmQlxx=' + data,
     url: SERVER.SERVERAPI + '/rest/djbDetail/getDjbQlxxDiff?bsmQlxx=' + data,
     method: 'post',
     method: 'post',
@@ -236,7 +260,7 @@ export function getNydsyqList (data) {
  * @param {*} data
  * @param {*} data
  * @author: renchao
  * @author: renchao
  */
  */
- export function getLqList (data) {
+export function getLqList (data) {
   return request({
   return request({
     url: SERVER.SERVERAPI + '/rest/djbDetail/getLqList',
     url: SERVER.SERVERAPI + '/rest/djbDetail/getLqList',
     method: 'post',
     method: 'post',

 /*
 /*
  * @Description: 模板管理
  * @Description: 模板管理
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-05-16 16:02:32
+ * @LastEditTime: 2024-02-23 10:45:18
  */
  */
 
 
+/*
+ * 不动产登记受理凭证（首环节）getPrintAcceptance
+ * 不动产登记补充材料通知书 getPrintSupplementalMaterials
+ * 不动产登记补充材料接收凭证 getPrintReceiveSupplementalMaterials
+ * 不予登记告知书 getPrintRejectForms
+ * 不动产登记申请材料退回通知书 getPrintSendBackMaterials
+ * 不动产更正登记通知书（依职权更正首环节）getPrintRiviseForms
+ */
 import request from '@/utils/request'
 import request from '@/utils/request'
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
 
 
@@ -71,3 +79,87 @@ export function getPrintTemplateByCode (params) {
     params: params
     params: params
   })
   })
 }
 }
+
+/**
+ * @description: 获取受理凭证
+ * @param {*} params
+ * @author: renchao
+ */
+export function getPrintAcceptance (bsmSldy) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/print/applicationForms/getPrintAcceptance',
+    method: 'get',
+    params: {
+      bsmSldy: bsmSldy
+    }
+  })
+}
+
+/**
+ * @description: 获取补充材料通知书
+ * @param {*} bsmSldy
+ * @author: renchao
+ */
+export function getPrintSupplementalMaterials (bsmSldy, data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/print/applicationForms/getPrintSupplementalMaterials/' + bsmSldy,
+    method: 'post',
+    data
+  })
+}
+/**
+ * @description: 获取不予登记告知书
+ * @param {*} bsmSldy
+ * @author: renchao
+ */
+export function getPrintRejectForms (bsmSldy) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/print/applicationForms/getPrintRejectForms',
+    method: 'get',
+    params: {
+      bsmSldy: bsmSldy
+    }
+  })
+}
+/**
+ * @description: 获取更正登记通知书
+ * @param {*} bsmSldy
+ * @author: renchao
+ */
+ export function getPrintRiviseForms (bsmSldy) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/print/applicationForms/getPrintRiviseForms',
+    method: 'get',
+    params: {
+      bsmSldy: bsmSldy
+    }
+  })
+}
+/**
+ * @description: 获取申请材料退回通知书
+ * @param {*} bsmSldy
+ * @author: renchao
+ */
+ export function getPrintSendBackMaterials (bsmSldy) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/print/applicationForms/getPrintSendBackMaterials',
+    method: 'get',
+    params: {
+      bsmSldy: bsmSldy
+    }
+  })
+}
+/**
+ * @description: 获取补充材料接收凭证
+ * @param {*} bsmSldy
+ * @author: renchao
+ */
+ export function getPrintReceiveSupplementalMaterials (bsmSldy) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/print/applicationForms/getPrintReceiveSupplementalMaterials',
+    method: 'get',
+    params: {
+      bsmSldy: bsmSldy
+    }
+  })
+}

+/*
+ * @Description: sfxx
+ * @Autor: renchao
+ * @LastEditTime: 2023-12-26 16:06:35
+ */
+import request from '@/utils/request';
+let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
+
+
+export function getSfmxList (businessBsm) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/sys/sf/getSfmxList',
+    method: 'get',
+    params: {
+      businessBsm: businessBsm
+    }
+  })
+}
+
+export function saveSfmx (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/sys/sf/saveSfmx',
+    method: 'post',
+    data
+  })
+}
+
+export function deleteSfmx (bsmSf) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/sys/sf/deleteSfmx',
+    method: 'get',
+    params: {
+      bsmSf: bsmSf
+    }
+  })
+}
+
+export function getDlxxByBsmSldy (bsmSldy) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/ywbl/dlxx/getDlxxByBsmSldy',
+    method: 'get',
+    params: {
+      bsmSldy: bsmSldy
+    }
+  })
+}
+
+export function saveOrUpdateDlxx (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/ywbl/dlxx/saveOrUpdateDlxx',
+    method: 'post',
+    data
+  })
+}

+/*
+ * @Description: 信息备案
+ * @Autor:
+ * @LastEditTime: 2023-09-11 11:25:22
+ */
+
+import request from '@/utils/request'
+let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
+
+/**
+ * @description: cstj
+ * @author:
+ * @param params
+ */
+export function cstj (params) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/tjfx/xn/cstj?startAt='+params.startAt + '&endAt=' + params.endAt,
+    method: 'post'
+  })
+}
+
+/**
+ * @description: exportCstj
+ * @author:
+ * @param params
+ */
+export function exportCstj (params) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/tjfx/xn/exportCstj?startAt='+params.startAt + '&endAt=' + params.endAt,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+
+/**
+ * @description: tjtj
+ * @author:
+ * @param data
+ */
+export function tjtj (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/tjfx/xn/tjtj',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * @description: exportTjtj
+ * @author:
+ * @param data
+ */
+export function exportTjtj (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/tjfx/xn/exportTjtj',
+    method: 'post',
+    data,
+    responseType: 'blob'
+  })
+}
+
+/**
+ * @description: getDjlxStatistic
+ * @author:
+ * @param data
+ */
+export function getDjlxStatistic (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/tjfx/djqkfx/getDjlxStatistic',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * @description: getPrintBdcqzStatistic
+ * @author:
+ * @param data
+ */
+export function getPrintBdcqzStatistic (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/tjfx/djqkfx/getPrintBdcqzStatistic',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * @description: getSlryStatistic
+ * @author:
+ * @param data
+ */
+export function getSlryStatistic (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/tjfx/djqkfx/getSlryStatistic',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * @description: getAcceptMonthStatistic
+ * @author:
+ * @param data
+ */
+export function getAcceptMonthStatistic (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/tjfx/djqkfx/getAcceptMonthStatistic',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * @description: getAcceptDayStatistic
+ * @author:
+ * @param data
+ */
+export function getAcceptDayStatistic (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/tjfx/djqkfx/getAcceptDayStatistic',
+    method: 'post',
+    data
+  })
+}
+
+/**
+ * @description: getAcceptAreaStatistic
+ * @author:
+ * @param data
+ */
+export function getAcceptAreaStatistic (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/tjfx/djqkfx/getAcceptAreaStatistic',
+    method: 'post',
+    data
+  })
+}

 /*
 /*
  * @Description: 互联共享数据
  * @Description: 互联共享数据
  * @Autor:
  * @Autor:
- * @LastEditTime: 2023-09-06 09:47:59
+ * @LastEditTime: 2024-01-23 15:37:47
  */
  */
 
 
 import request from "@/utils/request";
 import request from "@/utils/request";
@@ -16,7 +16,7 @@ let SERVER = window.config
  */
  */
 export function sfhc(data) {
 export function sfhc(data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/v1/gab/sfhc",
+    url: SERVER.SERVERAPI + "/rest/bj/sfhc",
     method: "post",
     method: "post",
     data,
     data,
   });
   });
@@ -28,7 +28,7 @@ export function sfhc(data) {
  */
  */
 export function hy(data) {
 export function hy(data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/v1/mzb/hy",
+    url: SERVER.SERVERAPI + "/rest/bj/hy",
     method: "post",
     method: "post",
     data,
     data,
   });
   });
@@ -40,7 +40,7 @@ export function hy(data) {
  */
  */
 export function jrxkz(data) {
 export function jrxkz(data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/v1/ybj/jrxkz",
+    url: SERVER.SERVERAPI + "/rest/bj/jrxkz",
     method: "post",
     method: "post",
     data,
     data,
   });
   });
@@ -52,7 +52,7 @@ export function jrxkz(data) {
  */
  */
 export function qyjbxx(data) {
 export function qyjbxx(data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/v1/scjg/qyjbxx",
+    url: SERVER.SERVERAPI + "/rest/scjg/qyjbxx",
     method: "post",
     method: "post",
     data,
     data,
   });
   });
@@ -64,7 +64,7 @@ export function qyjbxx(data) {
  */
  */
 export function qyjbxxyz(data) {
 export function qyjbxxyz(data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/v1/scjg/qyjbxxyz",
+    url: SERVER.SERVERAPI + "/rest/scjg/qyjbxxyz",
     method: "post",
     method: "post",
     data,
     data,
   });
   });
@@ -76,7 +76,7 @@ export function qyjbxxyz(data) {
  */
  */
 export function dm(data) {
 export function dm(data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/v1/mzb/dm",
+    url: SERVER.SERVERAPI + "/rest/bj/dm",
     method: "post",
     method: "post",
     data,
     data,
   });
   });
@@ -88,7 +88,7 @@ export function dm(data) {
  */
  */
 export function gtgshjbxx(data) {
 export function gtgshjbxx(data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/v1/sczj/gtgshjbxx",
+    url: SERVER.SERVERAPI + "/rest/scjg/gtgshjbxx",
     method: "post",
     method: "post",
     data,
     data,
   });
   });
@@ -100,7 +100,7 @@ export function gtgshjbxx(data) {
  */
  */
 export function gtgshjbxxyz(data) {
 export function gtgshjbxxyz(data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/v1/sczj/gtgshjbxxyz",
+    url: SERVER.SERVERAPI + "/rest/scjg/gtgshjbxxyz",
     method: "post",
     method: "post",
     data,
     data,
   });
   });
@@ -112,7 +112,7 @@ export function gtgshjbxxyz(data) {
  */
  */
 export function xydm(data) {
 export function xydm(data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/v1/zbb/xydm",
+    url: SERVER.SERVERAPI + "/rest/bj/xydm",
     method: "post",
     method: "post",
     data,
     data,
   });
   });
@@ -124,7 +124,7 @@ export function xydm(data) {
  */
  */
 export function jgxxcx(data) {
 export function jgxxcx(data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/v1/mzb/xydm",
+    url: SERVER.SERVERAPI + "/rest/bj/mzbxydm",
     method: "post",
     method: "post",
     data,
     data,
   });
   });
@@ -136,7 +136,7 @@ export function jgxxcx(data) {
  */
  */
 export function bdcdj(data) {
 export function bdcdj(data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/v1/mzt/bdcdj",
+    url: SERVER.SERVERAPI + "/rest/mzsf/mzt/bdcdj",
     method: "post",
     method: "post",
     data,
     data,
   });
   });
@@ -148,7 +148,7 @@ export function bdcdj(data) {
  */
  */
 export function dzyyzz(data) {
 export function dzyyzz(data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/v1/sczj/dzyyzz",
+    url: SERVER.SERVERAPI + "/rest/scjg/dzyyzz",
     method: "post",
     method: "post",
     data,
     data,
   });
   });
@@ -158,11 +158,11 @@ export function dzyyzz(data) {
  * @param {*} data
  * @param {*} data
  * @author:
  * @author:
  */
  */
-export function gzsxx(data) {
+export function gzsxx(params) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/v1/sft/gzsxx",
-    method: "post",
-    data,
+    url: SERVER.SERVERAPI + "/rest/mzsf/sft/gzsxx",
+    method: "get",
+    params,
   });
   });
 }
 }
 /**
 /**
@@ -172,7 +172,7 @@ export function gzsxx(data) {
  */
  */
 export function pjws(data) {
 export function pjws(data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/v1/zgf/pjws",
+    url: SERVER.SERVERAPI + "/rest/bj/pjws",
     method: "post",
     method: "post",
     data,
     data,
   });
   });
@@ -184,9 +184,8 @@ export function pjws(data) {
  */
  */
 export function pjwsDetail(data) {
 export function pjwsDetail(data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/v1/zgf/pjwsDetail",
+    url: SERVER.SERVERAPI + "/rest/bj/pjwsDetail",
     method: "post",
     method: "post",
     data,
     data,
   });
   });
 }
 }
-

 /*
 /*
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-09-01 15:10:55
+ * @LastEditTime: 2024-02-01 09:18:16
  */
  */
 import request from '@/utils/request'
 import request from '@/utils/request'
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
@@ -58,6 +58,18 @@ export function sendBackTask (data) {
   })
   })
 }
 }
 /**
 /**
+ * @description: 再次添加受理单元信息
+ * @param {*} data
+ * @author: renchao
+ */
+export function againAddSldy (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/business/workFlow/againAddSldy',
+    method: 'post',
+    data
+  })
+}
+/**
  * @description: 获取左侧列表
  * @description: 获取左侧列表
  * @param {*} data
  * @param {*} data
  * @author: renchao
  * @author: renchao

@@ -12,28 +12,37 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap
  * @author: renchao
  * @author: renchao
  */
  */
 export function Init (data) {
 export function Init (data) {
+    let apiUrl = "/rest/ywbl/dyaq/init";    
+    return request({
+        url: SERVER.SERVERAPI + apiUrl,
+        method: 'post',
+        data
+    })
+}
+
+export function batchInit (data) {
     let apiUrl = "";
     let apiUrl = "";
     switch (data.get("djlx")) {
     switch (data.get("djlx")) {
         case "100":
         case "100":
-            apiUrl = "/rest/ywbl/dyaq/fristInit";
+            apiUrl = "/rest/ywbl/dyaq/fristBatchInit";
             break;
             break;
         case "200":
         case "200":
-            apiUrl = "/rest/ywbl/dyaq/transferInit";
+            apiUrl = "/rest/ywbl/dyaq/transferBatchInit";
             break;
             break;
         case "300":
         case "300":
-            apiUrl = "/rest/ywbl/dyaq/changeInit";
+            apiUrl = "/rest/ywbl/dyaq/changeBatchInit";
             break;
             break;
         case "400":
         case "400":
-            apiUrl = "/rest/ywbl/dyaq/logoutInit";
+            apiUrl = "/rest/ywbl/dyaq/logoutBatchInit";
             break;
             break;
         case "500":
         case "500":
-            apiUrl = "/rest/ywbl/dyaq/riviseInit";
+            apiUrl = "/rest/ywbl/dyaq/riviseBatchInit";
             break;
             break;
         case "901":
         case "901":
-            apiUrl = "/rest/ywbl/dyaq/renewalInit";
+            apiUrl = "/rest/ywbl/dyaq/renewalBatchInit";
             break;
             break;
         case "902":
         case "902":
-            apiUrl = "/rest/ywbl/dyaq/replaceInit";
+            apiUrl = "/rest/ywbl/dyaq/replaceBatchInit";
             break;
             break;
     }
     }
     return request({
     return request({
@@ -56,3 +65,20 @@ export function saveData (data, djlx) {
         data
         data
     })
     })
 }
 }
+
+/**
+ * @description: 批量保存
+ * @param {*} data
+ * @author: renchao
+ */
+export function saveBatchData (data, djlx) {    
+    let apiUrl = "/rest/ywbl/dyaq/saveBatchData";
+    if (djlx == "400") {
+        apiUrl = "/rest/ywbl/dyaq/saveLogoutBatchData";
+    }
+    return request({
+        url: SERVER.SERVERAPI + apiUrl,
+        method: 'post',
+        data
+    })
+}

 /*
 /*
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-05-17 10:30:58
+ * @LastEditTime: 2024-01-23 10:59:37
  */
  */
 import request from '@/utils/request'
 import request from '@/utils/request'
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
@@ -11,29 +11,14 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap
  * @param data
  * @param data
  * @author ssq 2023年5月26日14点29分
  * @author ssq 2023年5月26日14点29分
  */
  */
-export function BatchInit(data){
+export function BatchInit (data) {
   let apiUrl = "";
   let apiUrl = "";
   switch (data.get("djlx")) {
   switch (data.get("djlx")) {
     case "100":
     case "100":
       apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/fristBatchInit";
       apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/fristBatchInit";
       break;
       break;
-    case "200":
-      apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/transferInit";
-      break;
-    case "300":
-      apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/changeInit";
-      break;
     case "400":
     case "400":
-      apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/logoutBatchSave";
-      break;
-    case "500":
-      apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/riviseInit";
-      break;
-    case "901":
-      apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/renewalInit";
-      break;
-    case "902":
-      apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/replaceInit";
+      apiUrl = SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/logoutBatchInit";
       break;
       break;
   }
   }
   return request({
   return request({
@@ -47,7 +32,7 @@ export function BatchInit(data){
  * @param {*} data
  * @param {*} data
  * @author: renchao
  * @author: renchao
  */
  */
-export function Init (data) {
+export function Init(data) {
   let apiUrl = "";
   let apiUrl = "";
   switch (data.get("djlx")) {
   switch (data.get("djlx")) {
     case "100":
     case "100":
@@ -83,9 +68,13 @@ export function Init (data) {
  * @param {*} data
  * @param {*} data
  * @author: renchao
  * @author: renchao
  */
  */
-export function saveBatchData (data) {
+export function saveBatchData(data) {
+  let path = "/rest/ywbl/fdcq2lr/fristBatchSave";
+  if (data.slsq.djywbm.includes("400")) {
+    path = "/rest/ywbl/fdcq2lr/logoutBatchSave";
+  }
   return request({
   return request({
-    url: SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/saveBatchData",
+    url: SERVER.SERVERAPI + path,
     method: 'post',
     method: 'post',
     data
     data
   })
   })
@@ -96,7 +85,7 @@ export function saveBatchData (data) {
  * @param {*} data
  * @param {*} data
  * @author: renchao
  * @author: renchao
  */
  */
-export function saveData (data) {
+export function saveData(data) {
   return request({
   return request({
     url: SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/saveData",
     url: SERVER.SERVERAPI + "/rest/ywbl/fdcq2lr/saveData",
     method: 'post',
     method: 'post',

+/*
+ * @Description:
+ * @Autor: renchao
+ * @LastEditTime: 2024-01-23 14:10:30
+ */
+import request from '@/utils/request'
+let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
+
+/**
+ * @description: 初始化
+ * @param {*} data
+ * @author: renchao
+ */
+export function Init (data) {
+    let apiUrl = "";
+    switch (data.get("djlx")) {
+        case "100":
+            apiUrl = "/system/tdcbjyq/fristInit";
+            break;
+        case "200":
+            apiUrl = "/system/tdcbjyq/transferInit";
+            break;
+        case "300":
+            apiUrl = "/system/tdcbjyq/changeInit";
+            break;
+        case "400":
+            apiUrl = "/system/tdcbjyq/logoutInit";
+            break;
+        case "500":
+            apiUrl = "/system/tdcbjyq/riviseInit";
+            break;
+        case "901":
+            apiUrl = "/system/tdcbjyq/renewalInit";
+            break;
+        case "902":
+            apiUrl = "/system/tdcbjyq/replaceInit";
+            break;
+    }
+    return request({
+        url: SERVER.SERVERAPI + apiUrl,
+        method: 'post',
+        data
+    })
+}
+/**
+ * @description: 受理信息保存
+ * @param {*} data
+ * @author: renchao
+ */
+export function saveData (data) {
+    return request({
+        url: SERVER.SERVERAPI + '/system/tdcbjyq/saveData',
+        method: 'post',
+        data
+    })
+}

@@ -12,8 +12,12 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap
  * @author: renchao
  * @author: renchao
  */
  */
 export function Init (data) {
 export function Init (data) {
+    let apiUrl = "/rest/ywbl/zjgcdy/init";
+    if (data.get("djlx") == "400") {
+        apiUrl = "/rest/ywbl/zjgcdy/logoutInit";
+    }
     return request({
     return request({
-        url: SERVER.SERVERAPI + "/rest/ywbl/zjgcdy/init",
+        url: SERVER.SERVERAPI + apiUrl,
         method: 'post',
         method: 'post',
         data
         data
     })
     })
@@ -76,9 +80,13 @@ export function saveData (data, djlx) {
  * @param {*} data
  * @param {*} data
  * @author: renchao
  * @author: renchao
  */
  */
-export function saveBatchData (data, djlx) {
+export function saveBatchData (data, djlx) {    
+    let apiUrl = "/rest/ywbl/zjgcdy/saveBatchData";
+    if (djlx == "400") {
+        apiUrl = "/rest/ywbl/zjgcdy/saveLogoutBatchData";
+    }
     return request({
     return request({
-        url: SERVER.SERVERAPI + "/rest/ywbl/zjgcdy/saveBatchData",
+        url: SERVER.SERVERAPI + apiUrl,
         method: 'post',
         method: 'post',
         data
         data
     })
     })

+/*
+ * @Description: 信息备案
+ * @Autor:
+ * @LastEditTime: 2023-09-11 11:25:22
+ */
+
+import request from '@/utils/request'
+let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
+
+/**
+ * @description: 添加银行
+ * @author:
+ * @param params
+ */
+export function queryBj (params) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/wwsq/queryBj',
+    method: 'get',
+    params
+  })
+}
+
+/**
+ * @description: getSqr
+ * @author:
+ * @param ywh
+ */
+export function getSqr (ywh) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/wwsq/getSqr',
+    method: 'get',
+    params: {
+      ywh: ywh
+    }
+  })
+}
+
+/**
+ * @description: getSqr
+ * @author:
+ * @param ywh
+ */
+export function getBdcqk (ywh) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/wwsq/getBdcqk',
+    method: 'get',
+    params: {
+      ywh: ywh
+    }
+  })
+}
+
+/**
+ * @description: getSqr
+ * @author:
+ * @param ywh
+ */
+export function getTreeNodeList (ywh) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/fjcl/getTreeNodeList',
+    method: 'get',
+    params: {
+      ywh: ywh
+    }
+  })
+}
+
+/**
+ * @description: getSqr
+ * @author:
+ * @param datumId
+ */
+export function getFjnrById (datumId) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/fjcl/getFjnrById',
+    method: 'get',
+    params: {
+      datumId: datumId
+    }
+  })
+}

 /*
 /*
  * @Description: 业务申请
  * @Description: 业务申请
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 14:52:03
+ * @LastEditTime: 2024-01-31 14:50:36
  */
  */
 
 
 import request from '@/utils/request'
 import request from '@/utils/request'
@@ -84,6 +84,19 @@ export function selectNydsyqQlxx (data) {
   })
   })
 }
 }
 
 
+/**
+ * @description: 业务办理-查询土地承包经营权-根据条件进行列表查询
+ * @param {*} data
+ * @author: renchao
+ */
+export function selectTdcbjyq (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectTdcbjyq',
+    method: 'post',
+    data
+  })
+}
+
 
 
 /**
 /**
  * @description: 业务办理-选择单元-查询宗地基本信息
  * @description: 业务办理-选择单元-查询宗地基本信息
@@ -109,6 +122,19 @@ export function selectZdjbxxSplitMergeLast (data) {
   })
   })
 }
 }
 
 
+/**
+ * @description: 土地变化情况
+ * @param {*} data
+ * @author: renchao
+ */
+export function selectZdjbxxSplitMerge (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZdjbxxSplitMerge',
+    method: 'post',
+    data
+  })
+}
+
 /*
 /*
 业务办理-选择单元-查询自然幢信息
 业务办理-选择单元-查询自然幢信息
 */
 */
@@ -194,6 +220,35 @@ export function selectFwsyq (data) {
     data
     data
   })
   })
 }
 }
+
+/**
+ * 业务办理-选择权利信息-根据条件进行列表查询
+ * @param data
+ * @returns {*}
+ */
+export function selectFwsyqQlxxSplitMergeBefore (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectFwsyqQlxxSplitMergeBefore',
+    method: 'post',
+    data
+  })
+}
+
+
+/**
+ * 业务办理-选择权利信息-根据条件进行列表查询
+ * @param data
+ * @returns {*}
+ */
+export function selectHSplitMerge (data) {
+  return request({
+    url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectHSplitMerge',
+    method: 'post',
+    data
+  })
+}
+
+
 /**
 /**
  * 业务办理-预告登记-选择权利信息-根据条件进行列表查询
  * 业务办理-预告登记-选择权利信息-根据条件进行列表查询
  * @param data
  * @param data
@@ -235,9 +290,9 @@ export function selectYgdy (data) {
  * @param data
  * @param data
  * @returns {*}
  * @returns {*}
  */
  */
-export function selectHQjdc (data) {
+export function selectHListQjdc (data) {
   return request({
   return request({
-    url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectHQjdc',
+    url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectHListQjdc',
     method: 'post',
     method: 'post',
     data
     data
   })
   })

@@ -10,7 +10,7 @@
 
 
 <template>
 <template>
   <div :class="['lb-table', customClass]">
   <div :class="['lb-table', customClass]">
-    <el-table v-if="!heightNumSetting" class="table-fixed" :row-style="{ height: '50px' }" ref="elTable" :border='border'
+    <el-table v-if="!heightNumSetting" class="table-fixed" :row-style="{ height: rowStyleHeight+'px' }" ref="elTable" :border='border'
       :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs"
       :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs"
       :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
       :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
       :span-method="this.merge ? this.mergeMethod : this.spanMethod">
       :span-method="this.merge ? this.mergeMethod : this.spanMethod">
@@ -24,7 +24,7 @@
       </lb-column>
       </lb-column>
     </el-table>
     </el-table>
 
 
-    <el-table v-else ref="elTable" class="table-fixed heightNumSetting" :row-style="{ height: '50px' }"
+    <el-table v-else ref="elTable" class="table-fixed heightNumSetting" :row-style="{ height: rowStyleHeight+'px'  }"
       :border='border' :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs"
       :border='border' :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs"
       :max-height="maxHeight" :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
       :max-height="maxHeight" :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
       :span-method="this.merge ? this.mergeMethod : this.spanMethod">
       :span-method="this.merge ? this.mergeMethod : this.spanMethod">
@@ -40,7 +40,7 @@
 
 
     <br>
     <br>
     <el-pagination class="lb-table-pagination" v-if="pagination" v-bind="$attrs" v-on="$listeners" background
     <el-pagination class="lb-table-pagination" v-if="pagination" v-bind="$attrs" v-on="$listeners" background
-      layout="total,  prev, pager, next" @current-change="paginationCurrentChange"
+      layout="total, sizes, prev, pager, next" @current-change="paginationCurrentChange" @size-change="handleSizeChange"
       :style="{ 'margin-top': paginationTop, 'text-align': paginationAlign }">
       :style="{ 'margin-top': paginationTop, 'text-align': paginationAlign }">
     </el-pagination>
     </el-pagination>
   </div>
   </div>
@@ -65,6 +65,10 @@
         type: Boolean,
         type: Boolean,
         default: true,
         default: true,
       },
       },
+      rowStyleHeight: {
+        type: Number,
+        default: 45,
+      },
       showHeader: {
       showHeader: {
         type: Boolean,
         type: Boolean,
         default: true,
         default: true,
@@ -302,6 +306,9 @@
       paginationCurrentChange (val) {
       paginationCurrentChange (val) {
         this.$emit('p-current-change', val)
         this.$emit('p-current-change', val)
       },
       },
+      handleSizeChange (val) {
+        this.$emit('size-change', val)
+      },
       /**
       /**
        * @description: getMergeArr
        * @description: getMergeArr
        * @param {*} tableData
        * @param {*} tableData

 <!--
 <!--
  * @Description: 
  * @Description: 
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-07-25 16:10:08
+ * @LastEditTime: 2023-11-09 16:47:44
 -->
 -->
 <template>
 <template>
   <transition name="fade">
   <transition name="fade">
@@ -41,6 +41,10 @@
         secondAnimationTime: '', // 状态二动画效果
         secondAnimationTime: '', // 状态二动画效果
       };
       };
     },
     },
+    mounted () {
+      this.Listener();
+      this.getData()
+    },
     watch: {
     watch: {
       noticeList: {
       noticeList: {
         handler (newName, oldName) {
         handler (newName, oldName) {
@@ -48,7 +52,7 @@
           this.Listener();
           this.Listener();
           setTimeout(res => {
           setTimeout(res => {
             that.getData();
             that.getData();
-          }, 100);
+          }, 300);
         },
         },
         deep: true
         deep: true
       }
       }

@@ -186,6 +186,7 @@
     },
     },
     mounted () {
     mounted () {
       this.$img = this.$refs["img"];
       this.$img = this.$refs["img"];
+      this.mouseLeave()
     },
     },
     methods: {
     methods: {
       /**
       /**

@@ -165,7 +165,7 @@
     padding: 20px;
     padding: 20px;
     width: 100%;
     width: 100%;
     min-height: 30%;
     min-height: 30%;
-    max-height: 90vh;
+    max-height: 92vh;
     // overflow-y: scroll;
     // overflow-y: scroll;
     box-sizing: border-box;
     box-sizing: border-box;
   }
   }

+import ElCollapse from './src/collapse';
+
+/* istanbul ignore next */
+ElCollapse.install = function(Vue) {
+  Vue.component(ElCollapse.name, ElCollapse);
+};
+
+export default ElCollapse;
+

+<template>
+  <div class="el-collapse-item"
+    :class="{'is-active': isActive, 'is-disabled': disabled }">
+    <div
+      role="tab"
+      :aria-expanded="isActive"
+      :aria-controls="`el-collapse-content-${id}`"
+      :aria-describedby="`el-collapse-content-${id}`">
+      <div
+        class="el-collapse-item__header"
+        @click="handleHeaderClick"
+        role="button"
+        :id="`el-collapse-head-${id}`"
+        :tabindex="disabled ? undefined : 0"
+        @keyup.space.enter.stop="handleEnterClick"
+        :class="{
+          'focusing': focusing,
+          'is-active': isActive
+        }"
+        @focus="handleFocus"
+        @blur="focusing = false">
+        <slot name="title">{{title}}</slot>
+        <i
+          class="el-collapse-item__arrow el-icon-arrow-right"
+          :class="{'is-active': isActive}">
+        </i>
+      </div>
+    </div>
+    <el-collapse-transition>
+      <div
+        class="el-collapse-item__wrap"
+        v-show="isActive"
+        role="tabpanel"
+        :aria-hidden="!isActive"
+        :aria-labelledby="`el-collapse-head-${id}`"
+        :id="`el-collapse-content-${id}`">
+        <div class="el-collapse-item__content">
+          <slot></slot>
+        </div>
+      </div>
+    </el-collapse-transition>
+  </div>
+</template>
+<script>
+  import ElCollapseTransition from 'element-ui/src/transitions/collapse-transition';
+  import Emitter from 'element-ui/src/mixins/emitter';
+  import { generateId } from 'element-ui/src/utils/util';
+
+  export default {
+    name: 'ElCollapseItem',
+
+    componentName: 'ElCollapseItem',
+
+    mixins: [Emitter],
+
+    components: { ElCollapseTransition },
+
+    data () {
+      return {
+        contentWrapStyle: {
+          height: 'auto',
+          display: 'block'
+        },
+        contentHeight: 0,
+        focusing: false,
+        isClick: false,
+        id: generateId()
+      };
+    },
+
+    inject: ['collapse'],
+
+    props: {
+      title: String,
+      name: {
+        type: [String, Number],
+        default () {
+          return this._uid;
+        }
+      },
+      disabled: Boolean
+    },
+
+    computed: {
+      isActive () {
+        return this.collapse.activeNames.indexOf(this.name) > -1;
+      }
+    },
+
+    methods: {
+      handleFocus () {
+        setTimeout(() => {
+          if (!this.isClick) {
+            this.focusing = true;
+          } else {
+            this.isClick = false;
+          }
+        }, 50);
+      },
+      handleHeaderClick () {
+        if (this.disabled) return;
+        this.dispatch('ElCollapse', 'item-click', this);
+        this.focusing = false;
+        this.isClick = true;
+      },
+      handleEnterClick () {
+        this.dispatch('ElCollapse', 'item-click', this);
+      }
+    }
+  };
+</script>

+<!--
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-11-08 14:36:44
+-->
+<template>
+  <div class="el-collapse" role="tablist" aria-multiselectable="true">
+    <slot></slot>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'ElCollapse',
+
+    componentName: 'ElCollapse',
+
+    props: {
+      accordion: Boolean,
+      value: {
+        type: [Array, String, Number],
+        default () {
+          return [];
+        }
+      }
+    },
+
+    data () {
+      return {
+        activeNames: [].concat(this.value)
+      };
+    },
+
+    provide () {
+      return {
+        collapse: this
+      };
+    },
+
+    watch: {
+      value (value) {
+        this.activeNames = [].concat(value);
+      }
+    },
+
+    methods: {
+      setActiveNames (activeNames) {
+        activeNames = [].concat(activeNames);
+        let value = this.accordion ? activeNames[0] : activeNames;
+        this.activeNames = activeNames;
+        this.$emit('input', value);
+        this.$emit('change', value);
+      },
+      handleItemClick (item) {
+        if (this.accordion) {
+          this.setActiveNames(
+            (this.activeNames[0] || this.activeNames[0] === 0) &&
+              this.activeNames[0] === item.name
+              ? '' : item.name
+          );
+        } else {
+          let activeNames = this.activeNames.slice(0);
+          let index = activeNames.indexOf(item.name);
+
+          if (index > -1) {
+            activeNames.splice(index, 1);
+          } else {
+            activeNames.push(item.name);
+          }
+          this.setActiveNames(activeNames);
+        }
+      }
+    },
+
+    created () {
+      this.$on('item-click', this.handleItemClick);
+    }
+  };
+</script>

@@ -4,7 +4,7 @@
  * @Author: sakuya
  * @Author: sakuya
  * @Date: 2021年6月10日10:04:07
  * @Date: 2021年6月10日10:04:07
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-07-28 09:49:26
+ * @LastEditTime: 2023-11-07 09:23:12
 -->
 -->
 
 
 <template>
 <template>
@@ -12,7 +12,7 @@
     :collapse-tags-tooltip="collapseTagsTooltip" :filterable="filterable" :placeholder="placeholder" :disabled="disabled"
     :collapse-tags-tooltip="collapseTagsTooltip" :filterable="filterable" :placeholder="placeholder" :disabled="disabled"
     @remove-tag="removeTag" @visible-change="visibleChange" @clear="clear">
     @remove-tag="removeTag" @visible-change="visibleChange" @clear="clear">
     <template #empty>
     <template #empty>
-      <div class="sc-table-select__table" :style="{width: tableWidth+'px'}" v-loading="loading">
+      <div class="sc-table-select__table" :style="{width: '100%'}" v-loading="loading">
         <div class="sc-table-select__header">
         <div class="sc-table-select__header">
           <slot name="header" :form="formData" :submit="formSubmit"></slot>
           <slot name="header" :form="formData" :submit="formSubmit"></slot>
         </div>
         </div>

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1706835381250" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4224" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M320 480m32 0l320 0q32 0 32 32l0 0q0 32-32 32l-320 0q-32 0-32-32l0 0q0-32 32-32Z" p-id="4225" fill="#ffffff"></path><path d="M768 320H576a32 32 0 0 0 0 64h192a128 128 0 0 1 0 256H576a32 32 0 1 0 0 64h192a192 192 0 0 0 0-384zM448 640H256a128 128 0 0 1 0-256h192a32 32 0 0 0 0-64H256a192 192 0 0 0 0 384h192a32 32 0 1 0 0-64z" p-id="4226" fill="#ffffff"></path></svg>
\ No newline at end of file

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1700016852243" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1613" id="mx_n_1700016852243" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M877.216 491.808M769.472 960 192.224 960C139.168 960 96 916.832 96 863.776L96 222.368c0-53.056 43.168-96.224 96.224-96.224l448.992 0c17.728 0 32.064 14.368 32.064 32.064 0 17.696-14.336 32.064-32.064 32.064L192.224 190.272c-17.664 0-32.064 14.4-32.064 32.064l0 641.408c0 17.696 14.4 32.064 32.064 32.064l577.28 0c17.696 0 32.064-14.368 32.064-32.064L801.568 350.656c0-17.696 14.336-32.064 32.064-32.064 17.728 0 32.064 14.368 32.064 32.064l0 513.12C865.696 916.832 822.528 960 769.472 960L769.472 960zM581.056 446.88c-8.224 0-16.416-3.136-22.656-9.408-12.544-12.544-12.544-32.8 0-45.344l318.72-318.72c12.544-12.544 32.8-12.544 45.344 0 12.544 12.544 12.544 32.8 0 45.344l-318.72 318.72C597.504 443.744 589.28 446.88 581.056 446.88L581.056 446.88zM448.768 446.88 256.352 446.88c-17.696 0-32.064-14.368-32.064-32.064 0-17.696 14.368-32.064 32.064-32.064l192.416 0c17.696 0 32.064 14.368 32.064 32.064C480.832 432.512 466.464 446.88 448.768 446.88L448.768 446.88zM641.216 639.296 256.352 639.296c-17.696 0-32.064-14.336-32.064-32.064 0-17.728 14.368-32.064 32.064-32.064l384.832 0c17.728 0 32.064 14.336 32.064 32.064C673.28 624.96 658.944 639.296 641.216 639.296L641.216 639.296zM641.216 639.296" fill="#ffffff" p-id="1614"></path></svg>
\ No newline at end of file

@@ -4,11 +4,11 @@
       <div class="logo">
       <div class="logo">
         <img v-if="logo" :src="logo" class="header-logo">
         <img v-if="logo" :src="logo" class="header-logo">
       </div>
       </div>
-      <div class="backdrop">
+      <!-- <div class="backdrop">
         <theme style="float: right;height: 26px;width: 26px;margin-top: 26px;" @change="themeChange" />
         <theme style="float: right;height: 26px;width: 26px;margin-top: 26px;" @change="themeChange" />
-      </div>
+      </div> -->
       <div class="right-menu">
       <div class="right-menu">
-        <svg-icon class="function" icon-class='function' />
+        <!-- <svg-icon class="function" icon-class='function' /> -->
         <div class="avatar-wrapper">
         <div class="avatar-wrapper">
           <span style="padding-right:10px">{{ name }}</span>
           <span style="padding-right:10px">{{ name }}</span>
           <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" />
           <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar" />
@@ -25,7 +25,7 @@
   import { mapGetters } from 'vuex'
   import { mapGetters } from 'vuex'
   import NoticeBar from '@/components/NoticeBar/index'
   import NoticeBar from '@/components/NoticeBar/index'
   import { getHomeNoticeList } from "@/api/home"
   import { getHomeNoticeList } from "@/api/home"
-  import {setToken} from "@/utils/util";
+  import { setToken } from "@/utils/util";
   export default {
   export default {
     components: {
     components: {
       NoticeBar
       NoticeBar
@@ -76,7 +76,7 @@
         axios.post(window._config.services.management + "/management/logout").then(() => {
         axios.post(window._config.services.management + "/management/logout").then(() => {
           setToken(undefined)
           setToken(undefined)
           sessionStorage.removeItem('token')
           sessionStorage.removeItem('token')
-          localStorage.setItem('dj-location',window.location.href)
+          localStorage.setItem('dj-location', window.location.href)
           window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(window.location.href);
           window.location.href = window._config.casBaseURL + '/logout?service=' + encodeURIComponent(window.location.href);
         })
         })
       },
       },

 /*
 /*
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-06-20 10:02:14
+ * @LastEditTime: 2023-11-15 16:18:58
  */
  */
 import Vue from 'vue'
 import Vue from 'vue'
 import App from './App'
 import App from './App'

@@ -126,6 +126,13 @@ export const asyncRoutes = [
         component: () => import('@/views/ywbl/ybx/ybx.vue'),
         component: () => import('@/views/ywbl/ybx/ybx.vue'),
         name: 'ybx',
         name: 'ybx',
         meta: { title: '已办箱' }
         meta: { title: '已办箱' }
+      }, {
+        path: 'ycsl',
+        id: '24',
+        parentId: '2',
+        component: () => import('@/views/ywbl/ycsl/ycsl.vue'),
+        name: 'ycsl',
+        meta: { title: '一窗受理' }
       },
       },
     ]
     ]
   },
   },
@@ -294,16 +301,22 @@ export const asyncRoutes = [
     name: 'tjfx',
     name: 'tjfx',
     children: [
     children: [
       {
       {
-        path: 'ywltj',
-        component: () => import('@/views/tjfx/ywltj/index.vue'),
-        name: 'qyxxba',
-        meta: { title: '业务量统计' }
+        path: 'bdcdjtjfx',
+        component: () => import('@/views/tjfx/bdcdjtjfx/index.vue'),
+        name: 'bdcdjtjfx',
+        meta: { title: '不动产登记统计分析' }
+      },
+      {
+        path: 'tjltj',
+        component: () => import('@/views/tjfx/tjltj/index.vue'),
+        name: 'tjltj',
+        meta: { title: '退件率统计' }
       },
       },
       {
       {
-        path: 'gzltj',
-        component: () => import('@/views/tjfx/gzltj/index.vue'),
-        name: 'gzltj',
-        meta: { title: '工作量统计' }
+        path: 'cstj',
+        component: () => import('@/views/tjfx/cstj/index.vue'),
+        name: 'cstj',
+        meta: { title: '超时统计' }
       }
       }
     ]
     ]
   },
   },

 /*
 /*
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-07-28 15:49:38
+ * @LastEditTime: 2024-02-01 08:53:08
  */
  */
 const getters = {
 const getters = {
   sidebar: state => state.app.sidebar,
   sidebar: state => state.app.sidebar,
@@ -22,6 +22,8 @@ const getters = {
   // workflow
   // workflow
   isRefresh: state => state.user.isRefresh,
   isRefresh: state => state.user.isRefresh,
   workFresh: state => state.user.workFresh,
   workFresh: state => state.user.workFresh,
+  // 左侧菜单刷新
+  menuRefresh: state => state.user.menuRefresh,
   yjsqOptions: state => state.workflow.yjsqOptions,
   yjsqOptions: state => state.workflow.yjsqOptions,
   dqhj: state => state.getdqhj.dqhj
   dqhj: state => state.getdqhj.dqhj
 }
 }

 /*
 /*
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-07-28 16:33:19
+ * @LastEditTime: 2024-02-01 08:52:00
  */
  */
 import { getUserInfo } from '@/api/user'
 import { getUserInfo } from '@/api/user'
 const state = {
 const state = {
     name: '',
     name: '',
-    userInfo:{},
+    userInfo: {},
     avatar: 'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
     avatar: 'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
     isRefresh: false,
     isRefresh: false,
     // 业务流程刷新
     // 业务流程刷新
-    workFresh: false
+    workFresh: false,
+    // 左侧菜单刷新
+    menuRefresh: false
 }
 }
 const mutations = {
 const mutations = {
     SET_NAME: (state, data) => {
     SET_NAME: (state, data) => {
@@ -23,7 +25,10 @@ const mutations = {
     },
     },
     SETWORKFRESH: (state, data) => {
     SETWORKFRESH: (state, data) => {
         state.workFresh = data
         state.workFresh = data
-    }
+    },
+    SETMENUREFRESH: (state, data) => {
+        state.menuRefresh = data
+    },
 }
 }
 
 
 const actions = {
 const actions = {
@@ -39,7 +44,10 @@ const actions = {
     },
     },
     reWorkFresh ({ commit }, data) {
     reWorkFresh ({ commit }, data) {
         commit('SETWORKFRESH', data)
         commit('SETWORKFRESH', data)
-    }
+    },
+    reMenuRefresh ({ commit }, data) {
+        commit('SETMENUREFRESH', data)
+    },
 }
 }
 export default {
 export default {
     namespaced: true,
     namespaced: true,

@@ -10,6 +10,9 @@
   line-height: 16px;
   line-height: 16px;
 }
 }
 
 
+
+
+
 .vue-treeselect--disabled .vue-treeselect__control {
 .vue-treeselect--disabled .vue-treeselect__control {
   background-color: #F5F7FA !important;
   background-color: #F5F7FA !important;
 }
 }
@@ -18,6 +21,12 @@
   color: #909399 !important;
   color: #909399 !important;
 }
 }
 
 
+.vue-treeselect__option {
+  /* 添加你的自定义样式 */
+  font-size: 14px;
+  color: #606266;
+}
+
 //input
 //input
 .el-input__inner {
 .el-input__inner {
   padding: 0 7px !important;
   padding: 0 7px !important;
@@ -192,7 +201,7 @@
 
 
 // 表格样式
 // 表格样式
 .el-table th {
 .el-table th {
-  height: 48px !important;
+  height: 45px;
   font-size: 14px;
   font-size: 14px;
   color: #4A4A4A;
   color: #4A4A4A;
 }
 }
@@ -264,4 +273,10 @@
   height: 0;
   height: 0;
   bottom: 0;
   bottom: 0;
   border-bottom: 1px solid #1890ff;
   border-bottom: 1px solid #1890ff;
+}
+
+
+// 整体配置
+.el-form-item--mini.el-form-item {
+  margin-bottom: 10px;
 }
 }
\ No newline at end of file

@@ -20,6 +20,7 @@
         flex-wrap: wrap;
         flex-wrap: wrap;
         justify-content: flex-start;
         justify-content: flex-start;
         min-height: 30px;
         min-height: 30px;
+        margin-bottom: 10px !important;
 
 
         span {
         span {
             display: flex;
             display: flex;
@@ -78,6 +79,10 @@
     }
     }
 }
 }
 
 
+.from-clues-header {
+    padding-bottom: 0 !important;
+}
+
 //*****end*通用表单查询条件，列表样式******//
 //*****end*通用表单查询条件，列表样式******//
 /deep/.el-range-separator {
 /deep/.el-range-separator {
     line-height: 28px !important;
     line-height: 28px !important;
@@ -96,7 +101,7 @@
     border-bottom: 1px solid $borderColor;
     border-bottom: 1px solid $borderColor;
     padding-left: 10px;
     padding-left: 10px;
     padding-bottom: 5px;
     padding-bottom: 5px;
-    margin-bottom: 10px;
+    margin-bottom: 5px;
     margin-top: 5px;
     margin-top: 5px;
     font-size: 16px;
     font-size: 16px;
     font-weight: 500;
     font-weight: 500;

@@ -18,7 +18,7 @@
 }
 }
 
 
 /deep/.el-form-item {
 /deep/.el-form-item {
-  margin-bottom: 8px;
+  margin-bottom: 3px;
 }
 }
 
 
 .marginBot0 {
 .marginBot0 {
@@ -47,7 +47,7 @@
   border-bottom: 1px solid $borderColor;
   border-bottom: 1px solid $borderColor;
   padding-left: 10px;
   padding-left: 10px;
   padding-bottom: 5px;
   padding-bottom: 5px;
-  margin-bottom: 10px;
+  margin-bottom: 5px;
   margin-top: 5px;
   margin-top: 5px;
   font-size: 16px;
   font-size: 16px;
   font-weight: 500;
   font-weight: 500;
@@ -74,7 +74,6 @@
   text-align: center;
   text-align: center;
   padding-top: 10px;
   padding-top: 10px;
   height: 36px;
   height: 36px;
-  background-color: #ffffff;
   padding: 5px 0;
   padding: 5px 0;
 }
 }
 
 
@@ -93,7 +92,9 @@
 /deep/.el-form-item__label {
 /deep/.el-form-item__label {
   padding-bottom: 0px;
   padding-bottom: 0px;
 }
 }
-
+/deep/.el-form-item__error {
+  display: none;
+}
 // 控制表单是否只读
 // 控制表单是否只读
 .readonly {
 .readonly {
   /deep/.el-form-item__content {
   /deep/.el-form-item__content {

 .tableDivCss {
 .tableDivCss {
   width: 100%;
   width: 100%;
-  height: 100%;
+  height: 95%;
   background-color: #f5f5f5;
   background-color: #f5f5f5;
   padding: 5px;
   padding: 5px;
   overflow-y: scroll;
   overflow-y: scroll;
+  box-sizing: border-box;
 }
 }
 
 
 .tableCss {
 .tableCss {

@@ -58,6 +58,65 @@ export default class filter {
       return name
       return name
     }
     }
   }
   }
+
+  /**
+   * @description: blzt
+   * @param {*} val
+   * @author:
+   */
+  blzt (val) {
+    if (val ===  0) {
+      return "未提交"
+    } else if (val === 1) {
+      return "已提交"
+    } else if (val === 2) {
+      return "办理中"
+    } else if (val === 3) {
+      return "已办结"
+    } else if (val === 4) {
+      return "已终止"
+    } else if (val === 5) {
+      return "已退回"
+    } else if (val === 8) {
+      return "已登簿"
+    }
+  }
+
+  /**
+   * @description: ywlx
+   * @param {*} val
+   * @author:
+   */
+  ywlx (val) {
+    if (val === "1") {
+      return "预售商品房买卖预告登记"
+    } else if (val === "2") {
+      return "预售商品房抵押权预告登记"
+    } else if (val === "3") {
+      return "商品房初始登记"
+    } else if (val === "4") {
+      return "不动产抵押登记"
+    } else if (val === "5") {
+      return "预购商品房预告登记/预购商品房抵押登记"
+    } else if (val === "6") {
+      return "预售商品房预告登记转房屋所有权登记/预售商品房抵押登记转抵押权登记"
+    } else if (val === "7") {
+      return "查封登记"
+    } else if (val === "8") {
+      return "解封登记"
+    } else if (val === "9") {
+      return "商品房转移登记"
+    } else if (val === "10") {
+      return "存量房转移登记"
+    } else if (val === "23") {
+      return "续封登记"
+    } else if (val === "41") {
+      return "独幢宅基地首次登记"
+    } else if (val === "42") {
+      return "多幢宅基地首次登记"
+    }
+  }
+
   /**
   /**
    * @description: filterHtml
    * @description: filterHtml
    * @param {*} content
    * @param {*} content

 /*
 /*
- * @Description: 
+ * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-10-30 09:01:21
+ * @LastEditTime: 2023-11-14 13:28:47
  */
  */
 import { mapGetters } from 'vuex'
 import { mapGetters } from 'vuex'
 import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar";
 import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar";
@@ -29,7 +29,6 @@ export default {
      */
      */
     handkeyCode (e) {
     handkeyCode (e) {
       if (e.keyCode === 13) {
       if (e.keyCode === 13) {
-        console.log("安");
         this.handleSearch()
         this.handleSearch()
       }
       }
     },
     },

+/*
+ * @Description: 
+ * @Autor: renchao
+ * @LastEditTime: 2023-11-22 13:42:26
+ */
+import { mapGetters } from 'vuex'
+import { defaultParameters } from "../../views/ywbl/ywsq/javascript/publicDefaultPar";
+export default {
+  data () {
+    return {
+      pageData: {
+        currentPage: 1,
+        pageSize: 10
+      }
+    }
+  },
+  computed: {
+    ...mapGetters(['dictData']),
+  },
+  mounted () {
+    window.addEventListener('keydown', this.handkeyCode, true)//开启监听键盘按下事件
+    this.handleSearch()
+  },
+  methods: {
+    /**
+     * @description: handkeyCode
+     * @param {*} e
+     * @author: renchao
+     */
+    handkeyCode (e) {
+      if (e.keyCode === 13) {
+        this.handleSearch()
+      }
+    },
+    /**
+     * @description: handleSearch
+     * @author: renchao
+     */
+    handleSearch () {
+      this.pageData.currentPage = 1
+      if (this.fetchData) {
+        this.fetchData()
+      }
+      if (this.queryClick) {
+        this.queryClick()
+      }
+    },
+    /**
+     * @description: handleSizeChange
+     * @param {*} val
+     * @author: renchao
+     */
+    handleSizeChange (val) {
+      this.pageData.currentPage = 1
+      this.pageData.pageSize = val
+      this.queryClick()
+    },
+    /**
+     * @description: handleCurrentChange
+     * @param {*} val
+     * @author: renchao
+     */
+    handleCurrentChange (val) {
+      this.pageData.currentPage = val
+      if (this.queryClick) {
+        this.queryClick()
+      }
+    },
+    /**
+     * @description: handleDel
+     * @author: renchao
+     */
+    handleDel () {
+      let deleteAfterPage = Math.ceil((this.tableData.total - 1) / this.pageData.pageSize)
+      let currentPage = this.pageData.currentPage > deleteAfterPage ? deleteAfterPage : this.pageData.currentPage
+      this.pageData.currentPage = currentPage < 1 ? 1 : currentPage
+    },
+    /**
+     * @description: resetForm
+     * @param {*} isYwbl
+     * @author: renchao
+     */
+    resetForm (isYwbl) {
+      if (isYwbl) {
+        this.queryForm = defaultParameters.defaultParameters();
+        this.pageData.currentPage = 1;
+        this.queryClick()
+      }
+    }
+  }
+}

@@ -66,7 +66,6 @@ export function judgeSort (arr) {
   }
   }
   return arr
   return arr
 }
 }
-// 上下移动
 /**
 /**
  * @description: 上下移动
  * @description: 上下移动
  * @param {*} bsmDict
  * @param {*} bsmDict
@@ -98,7 +97,6 @@ export function realMove (bsmDict, operate, data) {
   }
   }
   data = judgeSort(changeSort(data, bsmDict));
   data = judgeSort(changeSort(data, bsmDict));
 }
 }
-// 获取所有父节点
 /**
 /**
  * @description: 获取所有父节点
  * @description: 获取所有父节点
  * @param {*} treeData
  * @param {*} treeData
@@ -161,9 +159,38 @@ export function down (index, data) {
  * @author: renchao
  * @author: renchao
  */
  */
 export function getIdCardInfo (level) {
 export function getIdCardInfo (level) {
+  var webSocket = new WebSocket('ws://localhost:1818');
+
+  function start () {
+    return new Promise((resolve, reject) => {
+      webSocket.onopen = function (event) {
+        webSocket.send('ReadCard(1001,d:\\)');
+      }
+      webSocket.onerror = function (error) {
+        console.error('WebSocket发生错误:', error);
+      }
+
+      webSocket.onclose = function (event) {
+        if (event.wasClean) {
+          console.log(`WebSocket连接已关闭，代码: ${event.code}, 原因: ${event.reason}`);
+        } else {
+          console.error('WebSocket连接断开'); // 例如，服务器断电导致连接中断
+        }
+      }
+      webSocket.onmessage = function (event) {
+        if (event.data.indexOf('BeginReadCard') >= 0) {
+          // 处理数据并返回结果
+          const processedData = event.data.replace('BeginReadCard', '').replace('EndReadCard', '');
+          // 返回处理后的数据
+          resolve(processedData);
+        }
+      }
+    })
+  }
   const resultMap = {
   const resultMap = {
-    A: '设备',
-    default: axios.post(Vue.prototype.BASE_API.IDCARDURL),
+    jy: start(),
+    lt: axios.post(Vue.prototype.BASE_API.IDCARDURL),
+    default: axios.post(Vue.prototype.BASE_API.IDCARDURL)
   }
   }
   return resultMap[level] || resultMap.default
   return resultMap[level] || resultMap.default
 }
 }

@@ -2,7 +2,7 @@
 /*
 /*
  * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
  * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-09-20 14:20:39
+ * @LastEditTime: 2024-01-22 17:02:42
  */
  */
 import axios from 'axios'
 import axios from 'axios'
 import Router from '@/router'
 import Router from '@/router'
@@ -18,7 +18,7 @@ const service = axios.create({
             : window._config.baseUrl + "/",
             : window._config.baseUrl + "/",
     withCredentials: true,  //是否允许跨域
     withCredentials: true,  //是否允许跨域
     headers: {
     headers: {
-        'Content-Type': 'application/json; charset=utf-8'
+        'Content-Type': 'application/json'
     },
     },
     timeout: 15000
     timeout: 15000
 })
 })

+/*
+ * @Description: 申请书
+ * @Autor: renchao
+ * @LastEditTime: 2023-11-20 15:42:45
+ */
+import Vue from 'vue'
+// 创建不同的适配器策略
+const strategies = {
+  dysqs: function (data) {
+    return data.name;
+  },
+  default: function (data) {
+    return data;
+  }
+};
+
+// 创建适配器函数，并使用策略模式进行数据处理
+export default function adapter (data) {
+  const type = Vue.prototype.BASE_API.adapter;
+  const selectedStrategy = strategies[type] || strategies['default'];
+
+  return selectedStrategy(data);
+}
\ No newline at end of file

@@ -4,57 +4,57 @@ import cookies from './util.cookies'
  * @param {*} paraName
  * @param {*} paraName
  * @author: renchao
  * @author: renchao
  */
  */
-export function getUrlParam (paraName) {
-    let url = document.location.toString();
-    let arrObj = url.split('?');
+export function getUrlParam(paraName) {
+  let url = document.location.toString();
+  let arrObj = url.split('?');
 
 
-    if (arrObj.length > 1) {
-        let arrPara = arrObj[1].split('&');
-        let arr;
+  if (arrObj.length > 1) {
+    let arrPara = arrObj[1].split('&');
+    let arr;
 
 
-        for (let i = 0; i < arrPara.length; i++) {
-            arr = arrPara[i].split('=');
+    for (let i = 0; i < arrPara.length; i++) {
+      arr = arrPara[i].split('=');
 
 
-            if (arr != null && arr[0] === paraName) {
-                // 截取#之前的内容
-                let result = arr[1].endsWith('#/') ? arr[1].substr(0, arr[1].indexOf('#')) : arr[1];
-                return result;
-            }
-        }
-        return '';
-    } else {
-        return '';
+      if (arr != null && arr[0] === paraName) {
+        // 截取#之前的内容
+        let result = arr[1].endsWith('#/') ? arr[1].substr(0, arr[1].indexOf('#')) : arr[1];
+        return result;
+      }
     }
     }
+    return '';
+  } else {
+    return '';
+  }
 }
 }
 /**
 /**
  * @description: setToken
  * @description: setToken
  * @param {*} token
  * @param {*} token
  * @author: renchao
  * @author: renchao
  */
  */
-export function setToken (token) {
-    if (token === undefined) {
-        if (process.env.NODE_ENV === 'development') {
-            sessionStorage.removeItem('token')
-        } else {
-            cookies.remove('ACCESS_TOKEN')
-        }
+export function setToken(token) {
+  if (token === undefined) {
+    if (process.env.NODE_ENV === 'development') {
+      sessionStorage.removeItem('token')
+    } else {
+      cookies.remove('ACCESS_TOKEN')
+    }
+  } else {
+    if (process.env.NODE_ENV === 'development') {
+      sessionStorage.setItem('token', token);
     } else {
     } else {
-        if (process.env.NODE_ENV === 'development') {
-            sessionStorage.setItem('token', token);
-        } else {
-            cookies.set('ACCESS_TOKEN', token)
-        }
+      cookies.set('ACCESS_TOKEN', token)
     }
     }
+  }
 }
 }
 /**
 /**
  * @description: getToken
  * @description: getToken
  * @author: renchao
  * @author: renchao
  */
  */
-export function getToken () {
-    if (process.env.NODE_ENV === 'development') {
-        return sessionStorage.getItem('token')
-    }
-    return cookies.get('ACCESS_TOKEN')
+export function getToken() {
+  if (process.env.NODE_ENV === 'development') {
+    return sessionStorage.getItem('token')
+  }
+  return cookies.get('ACCESS_TOKEN')
 }
 }
 
 
 // 获取当前时间
 // 获取当前时间
@@ -63,22 +63,22 @@ export function getToken () {
  * @param {*} type
  * @param {*} type
  * @author: renchao
  * @author: renchao
  */
  */
-export function getNewDate (type = 1) {
-    const now = new Date();
-    const year = now.getFullYear();
-    const month = String(now.getMonth() + 1).padStart(2, '0');
-    const day = String(now.getDate()).padStart(2, '0');
-    const hours = String(now.getHours()).padStart(2, '0');
-    const minutes = String(now.getMinutes()).padStart(2, '0');
-    const seconds = String(now.getSeconds()).padStart(2, '0');
-    if (type == 1) {
-        return `${year}年${month}月${day}日`
-    } else {
-        return `${year}年${month}月${day}日 ${hours}时${minutes}分${seconds}秒`
-    }
+export function getNewDate(type = 1) {
+  const now = new Date();
+  const year = now.getFullYear();
+  const month = String(now.getMonth() + 1).padStart(2, '0');
+  const day = String(now.getDate()).padStart(2, '0');
+  const hours = String(now.getHours()).padStart(2, '0');
+  const minutes = String(now.getMinutes()).padStart(2, '0');
+  const seconds = String(now.getSeconds()).padStart(2, '0');
+  if (type == 1) {
+    return `${year}年${month}月${day}日`
+  } else {
+    return `${year}年${month}月${day}日 ${hours}时${minutes}分${seconds}秒`
+  }
 }
 }
 
 
-export function getNewDatesh () {
+export function getNewDatesh() {
   const now = new Date();
   const now = new Date();
   const year = now.getFullYear();
   const year = now.getFullYear();
   const month = String(now.getMonth() + 1).padStart(2, '0');
   const month = String(now.getMonth() + 1).padStart(2, '0');
@@ -88,3 +88,31 @@ export function getNewDatesh () {
   const seconds = String(now.getSeconds()).padStart(2, '0');
   const seconds = String(now.getSeconds()).padStart(2, '0');
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
 }
 }
+
+// 近一个月时间
+export function getdatamonth() {
+  var tempDate = new Date();
+  var year = tempDate.getFullYear();
+  var month = tempDate.getMonth();
+  var arr = []
+  arr.push(
+    formatDate(new Date(year, month, 1)),
+    formatDate(tempDate)
+  );
+  return arr
+}
+// 格式化日期
+export function formatDate(date) {
+  var year = date.getFullYear();
+  var month = changeNum(date.getMonth() + 1);
+  var day = changeNum(date.getDate());
+  return `${year}-${month}-${day}`;
+}
+// 数字转换
+export function changeNum(num) {
+  if (num >= 10) {
+    return num;
+  } else {
+    return "0" + num;
+  }
+}

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-10-31 14:39:57
+ * @LastEditTime: 2023-12-14 16:42:28
 -->
 -->
 <template>
 <template>
   <div class="rlPopup">
   <div class="rlPopup">
@@ -12,7 +12,8 @@
       <i class="el-icon-arrow-right"></i>
       <i class="el-icon-arrow-right"></i>
     </div>
     </div>
     <div class="img-list-wrap" v-Loading="loading">
     <div class="img-list-wrap" v-Loading="loading">
-      <img src="http://127.0.0.1:38088/video=stream&camidx=0" v-if="isScan" alt="高拍仪">
+      <img id="photo" src="" v-if="isScan && this.BASE_API.gaopaiyi=='jy'" alt="高拍仪捷宇">
+      <img src="http://127.0.0.1:38088/video=stream&camidx=0" v-else-if="isScan && this.BASE_API.gaopaiyi=='lt'" alt="高拍仪良田">
       <div v-for="(img, i) in previewImg.imgList" :key="i" v-else>
       <div v-for="(img, i) in previewImg.imgList" :key="i" v-else>
         <photo-zoom :url="img.fjurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2"
         <photo-zoom :url="img.fjurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2"
           overlayStyle="width: 100%;height:100%">
           overlayStyle="width: 100%;height:100%">
@@ -89,6 +90,7 @@
         showViewer: false,
         showViewer: false,
         initialIndex: 0,
         initialIndex: 0,
         allLi: [],
         allLi: [],
+        webSocket: null
       }
       }
     },
     },
     watch: {
     watch: {
@@ -125,6 +127,7 @@
        * @author: renchao
        * @author: renchao
        */
        */
       handleOpenScan () {
       handleOpenScan () {
+        let that = this
         this.isScan = !this.isScan
         this.isScan = !this.isScan
         if (this.isScan) {
         if (this.isScan) {
           this.loading = true
           this.loading = true
@@ -139,6 +142,38 @@
         } else {
         } else {
           this.scanTitle = '打开高拍仪'
           this.scanTitle = '打开高拍仪'
         }
         }
+        if (this.BASE_API.gaopaiyi == 'jy') {
+          let webSocket = new WebSocket('ws://localhost:1818');
+          this.webSocket = webSocket
+          webSocket.onopen = function (event) {
+            webSocket.send('bStartPlay')
+            webSocket.send('vSetPreviewRect(1600,1200)')
+          };
+          webSocket.onmessage = function (event) {
+            let begin_data = "data:image/jpeg;base64,";
+            document.getElementById('photo').src = begin_data + event.data;
+            if (event.data.indexOf('BeginsGetBase64') >= 0) {
+              let blob = that.dataURLtoBlob('data:image/png;base64,' + event.data.replace('BeginsGetBase64', '').replace('EndsGetBase64', ''));
+              let file = that.blobToFile(blob);
+              var formData = new FormData();
+              formData.append('file', file)
+              formData.append("bsmSj", that.previewImg.bsmSj);
+              formData.append("bsmSlsq", that.previewImg.bsmSlsq);
+              if (that.previewImg.imgList.length > 0) {
+                formData.append("ssBsmClmx", that.previewImg.imgList[that.previewImg.index].bsmClmx);
+              }
+              uploadSjClmx(formData).then((res) => {
+                if (res.code == 200) {
+                  that.$emit('updateList', { children: res.result, bsmSj: that.previewImg.bsmSj })
+                  that.$message({
+                    message: '上传成功!',
+                    type: 'success'
+                  })
+                }
+              })
+            }
+          }
+        }
       },
       },
       // 左右移动
       // 左右移动
       handleMove (direction) {
       handleMove (direction) {
@@ -164,32 +199,36 @@
        * @description: 拍照
        * @description: 拍照
        * @author: renchao
        * @author: renchao
        */
        */
-      handleViewScan () {
-        function dataURLtoBlob (base64String) {
-          const arr = base64String.split(',');
-          if (arr.length !== 2) {
-            throw new Error('Invalid Base64 format');
-          }
-          const mime = arr[0].match(/:(.*?);/)[1];
-          if (!mime) {
-            throw new Error('Cannot retrieve MIME type');
-          }
-          const bstr = atob(arr[1]);
-          const n = bstr.length;
-          const u8arr = new Uint8Array(n);
-          for (let i = 0; i < n; i++) {
-            u8arr[i] = bstr.charCodeAt(i);
-          }
-          return new Blob([u8arr], { type: mime });
+      dataURLtoBlob (base64String) {
+        const arr = base64String.split(',');
+        if (arr.length !== 2) {
+          throw new Error('Invalid Base64 format');
+        }
+        const mime = arr[0].match(/:(.*?);/)[1];
+        if (!mime) {
+          throw new Error('Cannot retrieve MIME type');
+        }
+        const bstr = atob(arr[1]);
+        const n = bstr.length;
+        const u8arr = new Uint8Array(n);
+        for (let i = 0; i < n; i++) {
+          u8arr[i] = bstr.charCodeAt(i);
         }
         }
-        function blobToFile (blob) {
-          let name = getUuid(8) + '.jpg'
-          const file = new File([blob], name);
-          return file;
+        return new Blob([u8arr], { type: mime });
+      },
+      blobToFile (blob) {
+        let name = getUuid(8) + '.jpg'
+        const file = new File([blob], name);
+        return file;
+      },
+      handleViewScan () {
+        if (this.BASE_API.gaopaiyi == 'jy') {
+          this.webSocket.send('sGetBase64');
+          return
         }
         }
         getAltimeterInfo().then(res => {
         getAltimeterInfo().then(res => {
-          let blob = dataURLtoBlob('data:image/png;base64,' + res.data.photoBase64);
-          let file = blobToFile(blob);
+          let blob = this.dataURLtoBlob('data:image/png;base64,' + res.data.photoBase64);
+          let file = this.blobToFile(blob);
           var formData = new FormData();
           var formData = new FormData();
           formData.append('file', file)
           formData.append('file', file)
           formData.append("bsmSj", this.previewImg.bsmSj);
           formData.append("bsmSj", this.previewImg.bsmSj);
@@ -329,6 +368,7 @@
           deleteClmx(bsmClmx).then(res => {
           deleteClmx(bsmClmx).then(res => {
             if (res.code == 200) {
             if (res.code == 200) {
               that.$emit('updateList', { children: this.previewImg.imgList, bsmSj: bsmSj })
               that.$emit('updateList', { children: this.previewImg.imgList, bsmSj: bsmSj })
+              that.initialIndex = that.previewImg.index
               that.$message({
               that.$message({
                 message: '删除成功!',
                 message: '删除成功!',
                 type: 'success'
                 type: 'success'
@@ -361,7 +401,7 @@
       height: 66px;
       height: 66px;
       line-height: 75px;
       line-height: 75px;
       color: #fff;
       color: #fff;
-      background-color: rgb(239, 239, 239);
+      background-color: #ccc;
       border-radius: 50%;
       border-radius: 50%;
       cursor: pointer;
       cursor: pointer;
       text-align: center;
       text-align: center;
@@ -397,7 +437,8 @@
         display: block;
         display: block;
         object-fit: scale-down;
         object-fit: scale-down;
         transition: all 0.3s;
         transition: all 0.3s;
-        max-width: 100%;
+        width: 100%;
+        height: 100%;
       }
       }
     }
     }
 
 

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-11-01 08:55:44
+ * @LastEditTime: 2023-12-15 14:42:12
 -->
 -->
 <template>
 <template>
   <div class="rlPopup">
   <div class="rlPopup">
@@ -12,7 +12,8 @@
       <i class="el-icon-arrow-right"></i>
       <i class="el-icon-arrow-right"></i>
     </div>
     </div>
     <div class="img-list-wrap" v-Loading="loading">
     <div class="img-list-wrap" v-Loading="loading">
-      <img src="http://127.0.0.1:38088/video=stream&camidx=0" v-if="isScan" alt="高拍仪">
+      <img id="photo" src="" v-show="isScan && this.BASE_API.gaopaiyi=='jy'" alt="高拍仪捷宇">
+      <img src="http://127.0.0.1:38088/video=stream&camidx=0" v-if="isScan && this.BASE_API.gaopaiyi=='lt'" alt="高拍仪">
       <div v-for="(img, i) in previewImg.imgList" :key="i" v-else>
       <div v-for="(img, i) in previewImg.imgList" :key="i" v-else>
         <photo-zoom :url="img.fjurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2"
         <photo-zoom :url="img.fjurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2"
           overlayStyle="width: 100%;height:100%">
           overlayStyle="width: 100%;height:100%">
@@ -89,6 +90,7 @@
         showViewer: false,
         showViewer: false,
         initialIndex: 0,
         initialIndex: 0,
         allLi: [],
         allLi: [],
+        webSocket: null
       }
       }
     },
     },
     watch: {
     watch: {
@@ -125,6 +127,7 @@
        * @author: renchao
        * @author: renchao
        */
        */
       handleOpenScan () {
       handleOpenScan () {
+        let that = this
         this.isScan = !this.isScan
         this.isScan = !this.isScan
         if (this.isScan) {
         if (this.isScan) {
           this.loading = true
           this.loading = true
@@ -139,6 +142,37 @@
         } else {
         } else {
           this.scanTitle = '打开高拍仪'
           this.scanTitle = '打开高拍仪'
         }
         }
+        if (this.BASE_API.gaopaiyi == 'jy') {
+          let webSocket = new WebSocket('ws://localhost:1818');
+          this.webSocket = webSocket
+          webSocket.onopen = function (event) {
+            webSocket.send('bStartPlay')
+            webSocket.send('vSetPreviewRect(1600,1200)')
+          }
+          webSocket.onmessage = function (event) {
+            let begin_data = "data:image/jpeg;base64,";
+            document.getElementById('photo').src = begin_data + event.data;
+            if (event.data.indexOf('BeginsGetBase64') >= 0) {
+              let blob = that.dataURLtoBlob('data:image/png;base64,' + event.data.replace('BeginsGetBase64', '').replace('EndsGetBase64', ''));
+              let file = that.blobToFile(blob);
+              var formData = new FormData();
+              formData.append('file', file)
+              formData.append("bsmSj", that.previewImg.bsmSj);
+              if (that.previewImg.imgList.length > 0) {
+                formData.append("index", that.previewImg.imgList[that.previewImg.index].sxh);
+              }
+              uploadSjClmx(formData).then((res) => {
+                if (res.code == 200) {
+                  that.$emit('updateList', { children: res.result, bsmSj: that.previewImg.bsmSj })
+                  that.$message({
+                    message: '上传成功!',
+                    type: 'success'
+                  })
+                }
+              })
+            }
+          }
+        }
       },
       },
       // 左右移动
       // 左右移动
       handleMove (direction) {
       handleMove (direction) {
@@ -164,28 +198,32 @@
        * @description: 拍照
        * @description: 拍照
        * @author: renchao
        * @author: renchao
        */
        */
-      handleViewScan () {
-        function dataURLtoBlob (base64String) {
-          const arr = base64String.split(',');
-          if (arr.length !== 2) {
-            throw new Error('Invalid Base64 format');
-          }
-          const mime = arr[0].match(/:(.*?);/)[1];
-          if (!mime) {
-            throw new Error('Cannot retrieve MIME type');
-          }
-          const bstr = atob(arr[1]);
-          const n = bstr.length;
-          const u8arr = new Uint8Array(n);
-          for (let i = 0; i < n; i++) {
-            u8arr[i] = bstr.charCodeAt(i);
-          }
-          return new Blob([u8arr], { type: mime });
+      dataURLtoBlob (base64String) {
+        const arr = base64String.split(',');
+        if (arr.length !== 2) {
+          throw new Error('Invalid Base64 format');
+        }
+        const mime = arr[0].match(/:(.*?);/)[1];
+        if (!mime) {
+          throw new Error('Cannot retrieve MIME type');
+        }
+        const bstr = atob(arr[1]);
+        const n = bstr.length;
+        const u8arr = new Uint8Array(n);
+        for (let i = 0; i < n; i++) {
+          u8arr[i] = bstr.charCodeAt(i);
         }
         }
-        function blobToFile (blob) {
-          let name = getUuid(8) + '.jpg'
-          const file = new File([blob], name);
-          return file;
+        return new Blob([u8arr], { type: mime });
+      },
+      blobToFile (blob) {
+        let name = getUuid(8) + '.jpg'
+        const file = new File([blob], name);
+        return file;
+      },
+      handleViewScan () {
+        if (this.BASE_API.gaopaiyi == 'jy') {
+          this.webSocket.send('sGetBase64');
+          return
         }
         }
         getAltimeterInfo().then(res => {
         getAltimeterInfo().then(res => {
           let blob = dataURLtoBlob('data:image/png;base64,' + res.data.photoBase64);
           let blob = dataURLtoBlob('data:image/png;base64,' + res.data.photoBase64);
@@ -328,6 +366,7 @@
           deleteClmx(bsmClmx).then(res => {
           deleteClmx(bsmClmx).then(res => {
             if (res.code == 200) {
             if (res.code == 200) {
               that.$emit('updateList', { children: this.previewImg.imgList, bsmSj: bsmSj })
               that.$emit('updateList', { children: this.previewImg.imgList, bsmSj: bsmSj })
+              that.initialIndex = that.previewImg.index
               that.$message({
               that.$message({
                 message: '删除成功!',
                 message: '删除成功!',
                 type: 'success'
                 type: 'success'
@@ -360,7 +399,7 @@
       height: 66px;
       height: 66px;
       line-height: 75px;
       line-height: 75px;
       color: #fff;
       color: #fff;
-      background-color: rgb(239, 239, 239);
+      background-color: #ccc;
       border-radius: 50%;
       border-radius: 50%;
       cursor: pointer;
       cursor: pointer;
       text-align: center;
       text-align: center;
@@ -396,7 +435,8 @@
         display: block;
         display: block;
         object-fit: scale-down;
         object-fit: scale-down;
         transition: all 0.3s;
         transition: all 0.3s;
-        max-width: 100%;
+        width: 100%;
+        height: 100%;
       }
       }
     }
     }
 
 

@@ -46,6 +46,7 @@
         </div>
         </div>
         <image-preview
         <image-preview
           ref="imageRef"
           ref="imageRef"
+          :key="imgKey"
           v-if="tableData.length > 0"
           v-if="tableData.length > 0"
           :previewImg="previewImg"
           :previewImg="previewImg"
           @updateList="updateList"
           @updateList="updateList"
@@ -75,6 +76,7 @@
     },
     },
     data () {
     data () {
       return {
       return {
+        imgKey: 0,
         isDialog: false,
         isDialog: false,
         iclass: "",
         iclass: "",
         // 材料目录选中
         // 材料目录选中
@@ -284,6 +286,7 @@
         if (this.$refs.imageRef) {
         if (this.$refs.imageRef) {
           this.$refs.imageRef.initialIndex = 0
           this.$refs.imageRef.initialIndex = 0
         }
         }
+        this.imgKey++
       },
       },
       /**
       /**
        * @description: 小图片点击
        * @description: 小图片点击

-<!--
- * @Description: 功能：流程图
- * @Autor: renchao
- * @LastEditTime: 2023-05-17 10:40:57
--->
-<template>
-  <div class='flowChart'>
-    <img :src="formData" alt="">
-  </div>
-</template>
-<script>
-
-  export default {
-    props: {
-      formData: {
-        type: String,
-        default: ''
-      }
-    }
-  }
-</script>
-<style scoped lang="scss">
-  @import "~@/styles/mixin.scss";
-
-  .flowChart {
-    margin: 20px 0;
-  }
-</style>
\ No newline at end of file

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-09-28 15:15:37
+ * @LastEditTime: 2024-01-18 15:03:56
 -->
 -->
 <template>
 <template>
   <div>
   <div>
@@ -10,7 +10,7 @@
       :pagination="false"
       :pagination="false"
       :key="key"
       :key="key"
       :heightNumSetting="true"
       :heightNumSetting="true"
-      :minHeight="150"
+      :minHeight="0"
       :data="tableDataList">
       :data="tableDataList">
     </lb-table>
     </lb-table>
     <addQlr
     <addQlr
@@ -178,21 +178,15 @@
           let that = this;
           let that = this;
           this.$nextTick(() => {
           this.$nextTick(() => {
             if (val.length == 0 || !val) {
             if (val.length == 0 || !val) {
-              that.tableDataList = _.cloneDeep([
-                // {
-                //   qlrmc: "",
-                //   dlrzjlx: "",
-                //   dlrzjh: "",
-                //   fr: "",
-                // },
-              ]);
+              that.tableDataList = _.cloneDeep([])
             } else {
             } else {
-              that.tableDataList = _.cloneDeep(val);
+              that.tableDataList = _.cloneDeep(val)
+              that.key++
             }
             }
-          });
+          })
         },
         },
         immediate: true,
         immediate: true,
-        deep: true,
+        deep: true
       },
       },
       gyfs: {
       gyfs: {
         handler (newVal, oldValue) {
         handler (newVal, oldValue) {
@@ -200,6 +194,7 @@
           if (newVal == 0) {
           if (newVal == 0) {
             this.column = _.cloneDeep(dataList);
             this.column = _.cloneDeep(dataList);
             this.tableDataList = _.cloneDeep(this.tableData);
             this.tableDataList = _.cloneDeep(this.tableData);
+            this.key++
           } else if (newVal == "1" || newVal == "3") {
           } else if (newVal == "1" || newVal == "3") {
             this.column = dataList;
             this.column = dataList;
           } else {
           } else {
@@ -211,8 +206,8 @@
           }
           }
         },
         },
         immediate: true,
         immediate: true,
-        deep: true,
-      },
+        deep: true
+      }
     },
     },
     methods: {
     methods: {
       /**
       /**
@@ -254,31 +249,70 @@
       deleClick (index, row) {
       deleClick (index, row) {
         this.tableDataList.splice(index, 1);
         this.tableDataList.splice(index, 1);
         this.$emit("upDateQlrxxList", this.tableDataList);
         this.$emit("upDateQlrxxList", this.tableDataList);
+        this.key++
       },
       },
       /**
       /**
        * @description: 身份证读取
        * @description: 身份证读取
        * @author: renchao
        * @author: renchao
        */
        */
       readClick (row) {
       readClick (row) {
-        getIdCardInfo().then(res => {
-          if (res.data.code == 0) {
-            let data = res.data.IDCardInfo
-            row.qlrmc = data.name
-            row.zjzl = '1'
-            row.zjh = data.cardID
-            row.xb = data.sexCode
-            row.dz = data.address
-            row.fzjg = data.issueOrgan
-            this.$message({
-              message: '读取成功！',
-              type: 'success'
-            })
+        function getObjectByValue (arrayOfObjects, value) {
+          var name = ''
+          arrayOfObjects.forEach(item => {
+            if (item.dname.includes(value)) name = item.dcode
+          })
+          return name
+        }
+        getIdCardInfo(this.BASE_API.gaopaiyi).then(res => {
+          if (this.BASE_API.gaopaiyi == 'jy') {
+            const {
+              Name,
+              IdNo,
+              Sex,
+              Address,
+              Agencvy,
+              PhotoB64
+            } = JSON.parse(res)
+            if (Name) {
+              row.qlrmc = Name;
+              row.zjzl = '1';
+              row.zjh = IdNo;
+              row.xb = getObjectByValue(this.dictData['A43'], Sex);
+              row.dz = Address;
+              row.fzjg = Agencvy;
+              row.avatar = 'data:image/png;base64,' + PhotoB64
+              this.$message({
+                message: '读取成功！',
+                type: 'success'
+              })
+            } else {
+              this.$message({
+                message: '请放置身份证',
+                type: 'warning'
+              })
+            }
           } else {
           } else {
-            this.$message({
-              message: res.data.message,
-              type: 'warning'
-            })
+            if (res.data.code == 0) {
+              let data = res.data.IDCardInfo
+              row.qlrmc = data.name
+              row.zjzl = '1'
+              row.zjh = data.cardID
+              row.xb = data.sexCode
+              row.dz = data.address
+              row.fzjg = data.issueOrgan
+              row.avatar = 'data:image/png;base64,' + data.photoBase64
+              this.$message({
+                message: '读取成功！',
+                type: 'success'
+              })
+            } else {
+              this.$message({
+                message: res.data.message,
+                type: 'warning'
+              })
+            }
           }
           }
+          this.$emit('upDateQlrxxList', this.tableDataList)
         })
         })
       },
       },
       /**
       /**

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-09-28 15:15:21
+ * @LastEditTime: 2024-01-18 14:22:11
 -->
 -->
 <template>
 <template>
   <div>
   <div>
@@ -10,7 +10,7 @@
       :pagination="false"
       :pagination="false"
       :key="key"
       :key="key"
       :heightNumSetting="true"
       :heightNumSetting="true"
-      :minHeight="150"
+      :minHeight="0"
       :data="tableDataList">
       :data="tableDataList">
     </lb-table>
     </lb-table>
     <addYwr
     <addYwr
@@ -178,27 +178,20 @@
           let that = this;
           let that = this;
           this.$nextTick(() => {
           this.$nextTick(() => {
             if (val.length == 0 || !val) {
             if (val.length == 0 || !val) {
-              that.tableDataList = _.cloneDeep([
-                // {
-                //   ywrmc: "",
-                //   dlrzjlx: "",
-                //   dlrzjh: "",
-                //   fr: "",
-                // },
-              ]);
+              that.tableDataList = _.cloneDeep([])
             } else {
             } else {
-              that.tableDataList = _.cloneDeep(val);
+              that.tableDataList = _.cloneDeep(val)
+              that.key++
             }
             }
-          });
+          })
         },
         },
         immediate: true,
         immediate: true,
-        deep: true,
+        deep: true
       },
       },
       gyfs: {
       gyfs: {
         handler (newVal, oldValue) {
         handler (newVal, oldValue) {
           let dataList = _.cloneDeep(this.InformationTable);
           let dataList = _.cloneDeep(this.InformationTable);
           if (newVal == 0) {
           if (newVal == 0) {
-            // this.column = _.cloneDeep(dataList).slice(1, dataList.length)
             this.column = _.cloneDeep(dataList);
             this.column = _.cloneDeep(dataList);
           } else if (newVal == "1" || newVal == "3") {
           } else if (newVal == "1" || newVal == "3") {
             this.column = dataList;
             this.column = dataList;
@@ -254,6 +247,7 @@
       deleClick (index, row) {
       deleClick (index, row) {
         this.tableDataList.splice(index, 1);
         this.tableDataList.splice(index, 1);
         this.$emit("upDateQlrxxList", this.tableDataList);
         this.$emit("upDateQlrxxList", this.tableDataList);
+        this.key++
       },
       },
 
 
       /**
       /**
@@ -261,25 +255,63 @@
        * @author: renchao
        * @author: renchao
        */
        */
       readClick (row) {
       readClick (row) {
-        getIdCardInfo().then(res => {
-          if (res.data.code == 0) {
-            let data = res.data.IDCardInfo
-            row.ywrmc = data.name
-            row.zjzl = '1'
-            row.zjh = data.cardID
-            row.xb = data.sexCode
-            row.txdz = data.address
-            row.fzjg = data.issueOrgan
-            this.$message({
-              message: '读取成功！',
-              type: 'success'
-            })
+        function getObjectByValue (arrayOfObjects, value) {
+          var name = ''
+          arrayOfObjects.forEach(item => {
+            if (item.dname.includes(value)) name = item.dcode
+          })
+          return name
+        }
+        getIdCardInfo(this.BASE_API.gaopaiyi).then(res => {
+          if (this.BASE_API.gaopaiyi == 'jy') {
+            const {
+              Name,
+              IdNo,
+              Sex,
+              Address,
+              Agencvy,
+              PhotoB64
+            } = JSON.parse(res)
+            if (Name) {
+              row.ywrmc = Name;
+              row.zjzl = '1';
+              row.zjh = IdNo;
+              row.xb = getObjectByValue(this.dictData['A43'], Sex);
+              row.txdz = Address;
+              row.fzjg = Agencvy;
+              row.avatar = 'data:image/png;base64,' + PhotoB64
+              this.$message({
+                message: '读取成功！',
+                type: 'success'
+              })
+            } else {
+              this.$message({
+                message: '请放置身份证',
+                type: 'warning'
+              })
+            }
           } else {
           } else {
-            this.$message({
-              message: res.data.message,
-              type: 'warning'
-            })
+            if (res.data.code == 0) {
+              let data = res.data.IDCardInfo
+              row.ywrmc = data.name
+              row.zjzl = '1'
+              row.zjh = data.cardID
+              row.xb = data.sexCode
+              row.txdz = data.address
+              row.fzjg = data.issueOrgan
+              row.avatar = 'data:image/png;base64,' + data.photoBase64
+              this.$message({
+                message: '读取成功！',
+                type: 'success'
+              })
+            } else {
+              this.$message({
+                message: res.data.message,
+                type: 'warning'
+              })
+            }
           }
           }
+          this.$emit("upDateQlrxxList", this.tableDataList)
         })
         })
       },
       },
 
 

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-10-19 16:23:02
+ * @LastEditTime: 2024-01-19 16:48:37
 -->
 -->
 <template>
 <template>
   <div class="from-clues">
   <div class="from-clues">
@@ -41,8 +41,6 @@
   import { popupCacel } from "@/utils/popup.js";
   import { popupCacel } from "@/utils/popup.js";
   import { mapGetters } from "vuex";
   import { mapGetters } from "vuex";
   export default {
   export default {
-    computed: {
-    },
     props: {
     props: {
       formData: {
       formData: {
         type: Object,
         type: Object,
@@ -56,15 +54,6 @@
         shyj: "",
         shyj: "",
       };
       };
     },
     },
-    // watch: {
-    //   yjsqOptions: {
-    //     handler (val) {
-    //       this.add(val.opinion);
-    //     },
-    //     deep: true,
-    //     immediate: true,
-    //   },
-    // },
     methods: {
     methods: {
       /**
       /**
        * @description: submitForm
        * @description: submitForm
@@ -80,6 +69,7 @@
         })
         })
       },
       },
       submitForm () {
       submitForm () {
+        let that = this
         this.queryForm = {
         this.queryForm = {
           bsmSlsq: this.formData.bsmSlsq,
           bsmSlsq: this.formData.bsmSlsq,
           shyj: this.shyj,
           shyj: this.shyj,
@@ -87,35 +77,25 @@
         };
         };
         completeTask(this.queryForm).then((res) => {
         completeTask(this.queryForm).then((res) => {
           if (res.code === 200) {
           if (res.code === 200) {
-            this.$message.success("转件成功");
-            // setTimeout(() => {
-            //   window.opener = null;
-            //   window.open("about:blank", "_self");
-            //   window.close();
-            //   this.$emit("input", false);
-            // }, 1000);
             popupCacel();
             popupCacel();
+            that.$message.success("转件成功");
             setTimeout(() => {
             setTimeout(() => {
-              // window.opener.location.reload(); //刷新父窗口
+              window.close();
+              that.$emit("input", false);
               if (window.opener && window.opener.getBpageList) {
               if (window.opener && window.opener.getBpageList) {
                 window.opener.getBpageList();
                 window.opener.getBpageList();
               } else {
               } else {
                 window.opener.frames[0].getBpageList();
                 window.opener.frames[0].getBpageList();
               }
               }
-              window.close();
-              this.$emit("input", false);
-            }, 1000);
+            }, 360);
           } else {
           } else {
             this.$message.error(res.message);
             this.$message.error(res.message);
           }
           }
+        }).catch((error) => {
+          // 可以添加适当的错误处理
+          this.$message.error("提交任务失败");
         });
         });
       },
       },
-      // add (val) {
-      //   if (val != "") {
-      //     this.shyj;
-      //   }
-      // },
-
       /**
       /**
        * @description: closeDialog
        * @description: closeDialog
        * @author: renchao
        * @author: renchao

@@ -2,7 +2,7 @@
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
  :show-message="false"
  :show-message="false"
- * @LastEditTime: 2023-11-03 14:46:48
+ * @LastEditTime: 2023-11-13 16:37:21
 -->
 -->
 <template>
 <template>
   <!-- 受理信息 -->
   <!-- 受理信息 -->
@@ -49,7 +49,6 @@
               :rules="rules.ztQlxxrules">
               :rules="rules.ztQlxxrules">
               <select-table
               <select-table
                 v-model="ruleForm.ztQlxx"
                 v-model="ruleForm.ztQlxx"
-                :table-width="730"
                 :tableData="ztQlxxList"
                 :tableData="ztQlxxList"
                 :props="props"
                 :props="props"
                 @change="ztQlxxchange">
                 @change="ztQlxxchange">
@@ -138,7 +137,6 @@
               v-if="ruleForm.qlxx.djlx == '300'">
               v-if="ruleForm.qlxx.djlx == '300'">
               <select-table
               <select-table
                 v-model="ruleForm.ssQlxx"
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :tableData="ssQlxxList"
                 :props="props"
                 :props="props"
                 @change="ssQlxxchange">
                 @change="ssQlxxchange">
@@ -186,8 +184,9 @@
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="8">
           <el-col :span="8">
-            <el-form-item label="是否被续封："
-              prop="cfdj.sfbxf"
+            <el-form-item
+              label="是否被续封："
+              prop="qlxx.djlx"
               :rules="rules.sfbxfrules">
               :rules="rules.sfbxfrules">
               <el-radio-group v-model="ruleForm.qlxx.djlx" @change="djlxchange">
               <el-radio-group v-model="ruleForm.qlxx.djlx" @change="djlxchange">
                 <el-radio label="300">是</el-radio>
                 <el-radio label="300">是</el-radio>

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-11-03 14:54:52
+ * @LastEditTime: 2023-11-13 14:32:38
 -->
 -->
 <template>
 <template>
   <!-- 受理信息 -->
   <!-- 受理信息 -->
@@ -49,7 +49,6 @@
               :rules="rules.ztQlxxrules">
               :rules="rules.ztQlxxrules">
               <select-table
               <select-table
                 v-model="ruleForm.ztQlxx"
                 v-model="ruleForm.ztQlxx"
-                table-width="100%"
                 :tableData="ztQlxxList"
                 :tableData="ztQlxxList"
                 :props="props"
                 :props="props"
                 @change="ztQlxxchange">
                 @change="ztQlxxchange">
@@ -132,7 +131,6 @@
               :rules="rules.ssQlxxrules">
               :rules="rules.ssQlxxrules">
               <select-table
               <select-table
                 v-model="ruleForm.ssQlxx"
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :tableData="ssQlxxList"
                 :props="props"
                 :props="props"
                 @change="ssQlxxchange">
                 @change="ssQlxxchange">
@@ -411,10 +409,10 @@
               :rules="rules.zxsjrules">
               :rules="rules.zxsjrules">
               <el-date-picker
               <el-date-picker
                 v-model="ruleForm.qlxx.zxsj"
                 v-model="ruleForm.qlxx.zxsj"
-                type="date"
+                type="datetime"
                 placeholder="选择日期"
                 placeholder="选择日期"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd">
+                format="yyyy-MM-dd HH:mm:ss">
               </el-date-picker>
               </el-date-picker>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-09-26 13:26:40
+ * @LastEditTime: 2023-11-07 09:25:27
 -->
 -->
 <template>
 <template>
   <!-- 受理信息 -->
   <!-- 受理信息 -->
@@ -43,11 +43,11 @@
           <div class="count">
           <div class="count">
             <el-form-item
             <el-form-item
               label="地役权不动产情况"
               label="地役权不动产情况"
+              style="display:flex"
               prop="ztQlxx.bdcqzh"
               prop="ztQlxx.bdcqzh"
               :rules="rules.ztQlxxrules">
               :rules="rules.ztQlxxrules">
               <select-table
               <select-table
                 v-model="ruleForm.ztQlxx"
                 v-model="ruleForm.ztQlxx"
-                :table-width="730"
                 :tableData="ztQlxxList"
                 :tableData="ztQlxxList"
                 :props="props"
                 :props="props"
                 @change="ztQlxxchange">
                 @change="ztQlxxchange">
@@ -130,7 +130,6 @@
               :rules="rules.ssQlxxrules">
               :rules="rules.ssQlxxrules">
               <select-table
               <select-table
                 v-model="ruleForm.ssQlxx"
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :tableData="ssQlxxList"
                 :props="props"
                 :props="props"
                 @change="ssQlxxchange">
                 @change="ssQlxxchange">

@@ -48,7 +48,6 @@
               :rules="rules.ssQlxxrules">
               :rules="rules.ssQlxxrules">
               <select-table
               <select-table
                 v-model="ruleForm.ssQlxx"
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :tableData="ssQlxxList"
                 :props="props"
                 :props="props"
                 @change="ssQlxxchange">
                 @change="ssQlxxchange">

@@ -45,7 +45,6 @@
               :rules="rules.ssQlxxrules">
               :rules="rules.ssQlxxrules">
               <select-table
               <select-table
                 v-model="ruleForm.ssQlxx"
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :tableData="ssQlxxList"
                 :props="props"
                 :props="props"
                 @change="ssQlxxchange">
                 @change="ssQlxxchange">

@@ -47,7 +47,6 @@
               :rules="rules.ssQlxxrules">
               :rules="rules.ssQlxxrules">
               <select-table
               <select-table
                 v-model="ruleForm.ssQlxx"
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :tableData="ssQlxxList"
                 :props="props"
                 :props="props"
                 @change="ssQlxxchange">
                 @change="ssQlxxchange">

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-11-03 14:48:37
+ * @LastEditTime: 2024-01-18 14:06:53
 -->
 -->
 <template>
 <template>
   <!-- 受理信息 -->
   <!-- 受理信息 -->
@@ -44,10 +44,10 @@
             <el-form-item
             <el-form-item
               label="上手权利信息："
               label="上手权利信息："
               prop="ssQlxx.bdcqzh"
               prop="ssQlxx.bdcqzh"
+              style="display:flex"
               :rules="rules.ssQlxxrules">
               :rules="rules.ssQlxxrules">
               <select-table
               <select-table
                 v-model="ruleForm.ssQlxx"
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :tableData="ssQlxxList"
                 :props="props"
                 :props="props"
                 @change="ssQlxxchange">
                 @change="ssQlxxchange">
@@ -724,10 +724,6 @@
     width: 100%;
     width: 100%;
   }
   }
 
 
-  /deep/.el-form-item {
-    margin-bottom: 8px;
-  }
-
   .marginBot0 {
   .marginBot0 {
     margin-bottom: 0 !important;
     margin-bottom: 0 !important;
   }
   }
@@ -749,17 +745,6 @@
     height: 50px;
     height: 50px;
   }
   }
 
 
-  .slxx_title {
-    border-bottom: 1px solid $borderColor;
-    padding-left: 10px;
-    padding-bottom: 5px;
-    margin-bottom: 10px;
-    margin-top: 5px;
-    font-size: 16px;
-    font-weight: 500;
-    color: #4a4a4a;
-  }
-
   .btn {
   .btn {
     text-align: center;
     text-align: center;
     padding-top: 10px;
     padding-top: 10px;

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-11-02 13:27:43
+ * @LastEditTime: 2023-11-07 09:26:12
  :show-message="false"
  :show-message="false"
 -->
 -->
 <template>
 <template>
@@ -45,11 +45,11 @@
           <div class="count">
           <div class="count">
             <el-form-item
             <el-form-item
               label="预告买卖登记"
               label="预告买卖登记"
+              style="display:flex"
               prop="ztQlxx.bdcqzh"
               prop="ztQlxx.bdcqzh"
               :rules="rules.ztQlxxrules">
               :rules="rules.ztQlxxrules">
               <select-table
               <select-table
                 v-model="ruleForm.ztQlxx"
                 v-model="ruleForm.ztQlxx"
-                table-width="100%"
                 :tableData="ztQlxxList"
                 :tableData="ztQlxxList"
                 :props="props"
                 :props="props"
                 @change="ztQlxxchange">
                 @change="ztQlxxchange">
@@ -127,10 +127,10 @@
             <el-form-item
             <el-form-item
               label="上手权利信息："
               label="上手权利信息："
               prop="ssQlxx.bdcqzh"
               prop="ssQlxx.bdcqzh"
+
               :rules="rules.ssQlxxrules">
               :rules="rules.ssQlxxrules">
               <select-table
               <select-table
                 v-model="ruleForm.ssQlxx"
                 v-model="ruleForm.ssQlxx"
-                table-width="100%"
                 :tableData="ssQlxxList"
                 :tableData="ssQlxxList"
                 :props="props"
                 :props="props"
                 @change="ssQlxxchange">
                 @change="ssQlxxchange">
@@ -172,13 +172,13 @@
           </el-col>
           </el-col>
         </el-row>
         </el-row>
         <el-row :gutter="10">
         <el-row :gutter="10">
-         
+
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="权利类型：">
             <el-form-item label="权利类型：">
               <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
               <el-input disabled v-model="ruleForm.qlxx.qllxmc"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-            <el-col :span="8">
+          <el-col :span="8">
             <el-form-item
             <el-form-item
               label="登记类型："
               label="登记类型："
               prop="qlxx.djlx"
               prop="qlxx.djlx"
@@ -193,7 +193,7 @@
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-           <el-col :span="8">
+          <el-col :span="8">
             <el-form-item
             <el-form-item
               label="预告登记种类："
               label="预告登记种类："
               prop="ygdj.ygdjzl"
               prop="ygdj.ygdjzl"
@@ -208,7 +208,7 @@
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-         
+
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item>
             <el-form-item>
               <span slot="label" style="display: inline-block">
               <span slot="label" style="display: inline-block">
@@ -250,7 +250,7 @@
               </el-date-picker>
               </el-date-picker>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-           <el-col :span="8">
+          <el-col :span="8">
             <el-form-item label="债务履行结束时间：">
             <el-form-item label="债务履行结束时间：">
               <el-date-picker
               <el-date-picker
                 v-model="ruleForm.qlxx.zwlxjssj"
                 v-model="ruleForm.qlxx.zwlxjssj"
@@ -261,18 +261,18 @@
                 format="yyyy-MM-dd">
                 format="yyyy-MM-dd">
               </el-date-picker>
               </el-date-picker>
             </el-form-item>
             </el-form-item>
-          </el-col>         
+          </el-col>
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="债务履行期限：">
             <el-form-item label="债务履行期限：">
               <el-input v-model="ruleForm.ygdj.dyqx"></el-input>
               <el-input v-model="ruleForm.ygdj.dyqx"></el-input>
             </el-form-item>
             </el-form-item>
-          </el-col>        
+          </el-col>
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item label="不动产坐落：">
             <el-form-item label="不动产坐落：">
               <el-input v-model="ruleForm.qlxx.zl"></el-input>
               <el-input v-model="ruleForm.qlxx.zl"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-            <el-col :span="8">
+          <el-col :span="8">
             <el-form-item
             <el-form-item
               label="登记机构："
               label="登记机构："
               prop="qlxx.djjg"
               prop="qlxx.djjg"
@@ -280,13 +280,13 @@
               <el-input v-model="ruleForm.qlxx.djjg"></el-input>
               <el-input v-model="ruleForm.qlxx.djjg"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-           
+
           <!-- <el-col :span="8">
           <!-- <el-col :span="8">
             <el-form-item label="区县代码：" prop="qlxx.qxdm" :rules="rules.qxdmrules">
             <el-form-item label="区县代码：" prop="qlxx.qxdm" :rules="rules.qxdmrules">
               <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
               <el-input v-model="ruleForm.qlxx.qxdm"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col> -->
           </el-col> -->
-        
+
           <el-col :span="8">
           <el-col :span="8">
             <el-form-item
             <el-form-item
               label="登簿人："
               label="登簿人："
@@ -310,7 +310,7 @@
               </el-date-picker>
               </el-date-picker>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-           <el-col :span="8">
+          <el-col :span="8">
             <el-form-item label="不动产登记证明号：" prop="qlxx.bdcqzh"
             <el-form-item label="不动产登记证明号：" prop="qlxx.bdcqzh"
               :rules="rules.bdcqzhrules">
               :rules="rules.bdcqzhrules">
               <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
               <el-input v-model="ruleForm.qlxx.bdcqzh"></el-input>
@@ -321,7 +321,7 @@
               <el-input v-model="ruleForm.ygdj.djyy"></el-input>
               <el-input v-model="ruleForm.ygdj.djyy"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-             <el-col :span="24">
+          <el-col :span="24">
             <el-form-item label="附记：">
             <el-form-item label="附记：">
               <el-input v-model="ruleForm.ygdj.fj" type="textarea" maxlength="500" show-word-limit></el-input>
               <el-input v-model="ruleForm.ygdj.fj" type="textarea" maxlength="500" show-word-limit></el-input>
             </el-form-item>
             </el-form-item>
@@ -338,7 +338,7 @@
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-           <el-col :span="8">
+          <el-col :span="8">
             <el-form-item label="担保范围：">
             <el-form-item label="担保范围：">
               <el-input maxlength="10" v-model="ruleForm.ygdj.dbfw"></el-input>
               <el-input maxlength="10" v-model="ruleForm.ygdj.dbfw"></el-input>
             </el-form-item>
             </el-form-item>
@@ -376,7 +376,7 @@
               </el-date-picker>
               </el-date-picker>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
-           <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
+          <el-col :span="8" v-if="ruleForm.qlxx.qszt == '2'">
             <el-form-item label="注销登簿人：">
             <el-form-item label="注销登簿人：">
               <el-input v-model="ruleForm.qlxx.zxdbr"></el-input>
               <el-input v-model="ruleForm.qlxx.zxdbr"></el-input>
             </el-form-item>
             </el-form-item>

@@ -45,11 +45,11 @@
           <div class="count" v-if="ssqlxxshow">
           <div class="count" v-if="ssqlxxshow">
             <el-form-item
             <el-form-item
               label="上手权利信息："
               label="上手权利信息："
+              style="display:flex"
               prop="ssQlxx.bdcqzh"
               prop="ssQlxx.bdcqzh"
               :rules="rules.ssQlxxrules">
               :rules="rules.ssQlxxrules">
               <select-table
               <select-table
                 v-model="ruleForm.ssQlxx"
                 v-model="ruleForm.ssQlxx"
-                :table-width="730"
                 :tableData="ssQlxxList"
                 :tableData="ssQlxxList"
                 :props="props"
                 :props="props"
                 @change="ssQlxxchange">
                 @change="ssQlxxchange">

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-10-08 09:35:26
+ * @LastEditTime: 2023-11-07 09:26:20
 -->
 -->
 <template>
 <template>
   <!-- 受理信息 -->
   <!-- 受理信息 -->
@@ -44,11 +44,11 @@
           <div class="count">
           <div class="count">
             <el-form-item
             <el-form-item
               label="抵押不动产信息："
               label="抵押不动产信息："
+              style="display:flex"
               prop="ztQlxx.bdcqzh"
               prop="ztQlxx.bdcqzh"
               :rules="rules.ztQlxxrules">
               :rules="rules.ztQlxxrules">
               <select-table
               <select-table
                 v-model="ruleForm.ztQlxx"
                 v-model="ruleForm.ztQlxx"
-                :table-width="550"
                 :tableData="ztQlxxList"
                 :tableData="ztQlxxList"
                 :props="props"
                 :props="props"
                 @change="ztQlxxchange">
                 @change="ztQlxxchange">
@@ -125,11 +125,11 @@
           <div class="count" v-if="ssqlxxshow">
           <div class="count" v-if="ssqlxxshow">
             <el-form-item
             <el-form-item
               label="上手权利信息："
               label="上手权利信息："
+              style="display:flex"
               prop="ssQlxx.bdcqzh"
               prop="ssQlxx.bdcqzh"
               :rules="rules.ssQlxxrules">
               :rules="rules.ssQlxxrules">
               <select-table
               <select-table
                 v-model="ruleForm.ssQlxx"
                 v-model="ruleForm.ssQlxx"
-                :table-width="550"
                 :tableData="ssQlxxList"
                 :tableData="ssQlxxList"
                 :props="props"
                 :props="props"
                 @change="ssQlxxchange">
                 @change="ssQlxxchange">

 /*
 /*
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-09-21 09:55:21
+ * @LastEditTime: 2024-01-22 14:59:51
  */
  */
 //流程环节操作按钮
 //流程环节操作按钮
 export function getForm (tabName) {
 export function getForm (tabName) {
   let form;
   let form;
+  if (tabName == 0) return
   switch (tabName) {
   switch (tabName) {
     case "zdjbxx":
     case "zdjbxx":
       form = require("@/views/registerBook/zdjbxx.vue");
       form = require("@/views/registerBook/zdjbxx.vue");
@@ -52,7 +53,7 @@ export function getForm (tabName) {
       break;
       break;
     //森林林木使用权
     //森林林木使用权
     case "sllmslxx":
     case "sllmslxx":
-      form = require("@/views/ywbl/slsqxx/sllmslxx");
+      form = require("@/views/workflow/main/slsqxx/sllmslxx");
       break;
       break;
     case "slxxjsydsyq":
     case "slxxjsydsyq":
       form = require("@/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue");
       form = require("@/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue");

 /*
 /*
  * @Description:workFramezu.vue组件的方法  头部按钮弹框方法
  * @Description:workFramezu.vue组件的方法  头部按钮弹框方法
  * @Autor: miaofang
  * @Autor: miaofang
- * @LastEditTime: 2023-09-26 14:25:23
+ * @LastEditTime: 2024-01-31 17:09:45
  */
  */
 import { getPrintTemplateByCode } from "@/api/print";
 import { getPrintTemplateByCode } from "@/api/print";
 import { getQllxByBdcdyid } from "@/api/djbDetail.js";
 import { getQllxByBdcdyid } from "@/api/djbDetail.js";
@@ -85,15 +85,12 @@ export default {
       let that = this;
       let that = this;
       switch (item.value) {
       switch (item.value) {
         case "B0":
         case "B0":
-          // this.openDialog()
-          this.$alert('此功能正在开发', '提示', {
-            confirmButtonText: '确定',
-          })
+          this.openDialog()
           break;
           break;
         case "B1":
         case "B1":
           getWorkFlowImage(this.bsmSlsq, this.bestepid ? this.bestepid : '').then(res => {
           getWorkFlowImage(this.bsmSlsq, this.bestepid ? this.bestepid : '').then(res => {
             let { result } = res
             let { result } = res
-            this.$popupDialog("流程图", "workflow/components/processViewer", {
+            this.$popupDialog("流程图", "workflow/top/processViewer/index", {
               xml: result.xml,
               xml: result.xml,
               finishedInfo: {
               finishedInfo: {
                 finishedTaskSet: result.finishedActivityIds,
                 finishedTaskSet: result.finishedActivityIds,
@@ -142,27 +139,9 @@ export default {
           }
           }
           break;
           break;
         case "B6":
         case "B6":
-          //根据编号获取对应信息
-          getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => {
-            if (res.code == 200) {
-              getPrintApplicationForm(this.currentSelectProps.bsmSldy).then(infoRes => {
-                if (infoRes.code == 200) {
-                  //打开模板设计
-                  let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
-                  LODOP.ADD_PRINT_DATA("ProgramData", res.result.tmpcontent); //装载模板
-                  //todo 调取后端接口获取数据 循环set
-                  for (let key in infoRes.result) {
-                    LODOP.SET_PRINT_STYLEA(key, "CONTENT", infoRes.result[key]);
-                  }
-                  LODOP.PREVIEW();
-                } else {
-                  this.$message.error(infoRes.message)
-                }
-              })
-            } else {
-              this.$message.error(res.message)
-            }
-          })
+          this.$popupDialog("打印申请书", "workflow/components/dialog/sqs",
+            { bsmSldy: this.currentSelectProps.bsmSldy }, '30%', true
+          )
           break;
           break;
         case "B7":
         case "B7":
           this.$popupDialog("证书领取", "workflow/components/dialog/zslq",
           this.$popupDialog("证书领取", "workflow/components/dialog/zslq",
@@ -176,7 +155,7 @@ export default {
           }, '90%', true)
           }, '90%', true)
           break;
           break;
         case "back": //退回按钮
         case "back": //退回按钮
-          this.$popupDialog("退回", "workflow/components/th", {
+          this.$popupDialog("退回", "workflow/top/back/index", {
             bsmSlsq: this.bsmSlsq,
             bsmSlsq: this.bsmSlsq,
             bestepid: this.bestepid ? this.bestepid : ''
             bestepid: this.bestepid ? this.bestepid : ''
           }, '800px', true)
           }, '800px', true)

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-10-10 09:07:29
+ * @LastEditTime: 2024-02-01 09:28:19
 -->
 -->
 <template>
 <template>
   <div class="container">
   <div class="container">
@@ -286,6 +286,16 @@
           .catch((res) => {
           .catch((res) => {
             console.log("错", res)
             console.log("错", res)
           })
           })
+      },
+      openDialog () {
+        let data = JSON.parse(localStorage.getItem('ywbl'))
+        let title = ''
+        if (data?.sqywmc) {
+          title = "申请业务：" + data?.sqywmc
+        } else {
+          title = "申请业务：" + data?.djywmc
+        }
+        this.$popupDialog(title, "ywbl/ywsq/selectBdc", { 'sqywInfo': { ...data, bsmSlsq: this.bsmSlsq, isworkFrame: true } }, "90%", true)
       }
       }
     }
     }
   }
   }

@@ -14,6 +14,12 @@
     align-items: center;
     align-items: center;
   }
   }
 
 
+  .homeItem {
+    /deep/.el-card__body {
+      height: 83%;
+    }
+  }
+
   .workbench {
   .workbench {
     flex-wrap: wrap;
     flex-wrap: wrap;
     height: 100%;
     height: 100%;
@@ -21,11 +27,12 @@
 
 
     li {
     li {
       width: 32.5%;
       width: 32.5%;
-      height: 90px;
+      height: calc(50% - 5px);
       @include flex-center;
       @include flex-center;
       flex-direction: column;
       flex-direction: column;
       color: #fff;
       color: #fff;
       font-size: 14px;
       font-size: 14px;
+      margin-bottom: 0;
 
 
       i {
       i {
         color: #fff;
         color: #fff;
@@ -55,10 +62,10 @@
   }
   }
 
 
   .home-left {
   .home-left {
-    width: 70%;
+    width: 100%;
     padding-right: 3px;
     padding-right: 3px;
-    height: 100%;
     font-size: 14px;
     font-size: 14px;
+    min-height: 625px;
 
 
     .list-title {
     .list-title {
       overflow: hidden;
       overflow: hidden;
@@ -81,7 +88,8 @@
 
 
   .box-mountNode {
   .box-mountNode {
     flex: 1;
     flex: 1;
-    height: calc(100% - 490px);
+    // height: calc(100% - 490px);
+    min-height: 130px;
   }
   }
 
 
   .home-right {
   .home-right {
@@ -89,6 +97,7 @@
     width: 30%;
     width: 30%;
     display: flex;
     display: flex;
     flex-direction: column;
     flex-direction: column;
+    min-height: 620px;
 
 
     .list-title {
     .list-title {
       overflow: hidden;
       overflow: hidden;

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-07-12 09:23:03
+ * @LastEditTime: 2024-02-01 10:04:32
 -->
 -->
 <template>
 <template>
   <div class="home">
   <div class="home">
     <div class="home-left">
     <div class="home-left">
-      <el-row :gutter="8">
-        <el-col :span="12">
-          <el-card shadow="hover" :body-style="{ padding: '0' }" style="height:260px">
+      <el-row :gutter="8" class="height50">
+        <el-col :span="12" class="height100">
+          <el-card shadow="hover" :body-style="{ padding: '0' }" class="height100 homeItem">
             <div slot="header" class="flexst">
             <div slot="header" class="flexst">
               <h5 class="title">常办项目</h5>
               <h5 class="title">常办项目</h5>
               <el-button type="primary" @click="setFrequencyProject">配置常办</el-button>
               <el-button type="primary" @click="setFrequencyProject">配置常办</el-button>
             </div>
             </div>
-            <ul class="workbench flexst">
+            <ul class="workbench flexst" style="margin:5px">
               <li v-for="(item, index) in projectList" @click="handleProject(item)" class="pointer" :key="index"
               <li v-for="(item, index) in projectList" @click="handleProject(item)" class="pointer" :key="index"
                 :style="{ backgroundColor: newsListColor[index] }">
                 :style="{ backgroundColor: newsListColor[index] }">
                 <i class="el-icon-s-claim"></i>
                 <i class="el-icon-s-claim"></i>
@@ -22,13 +22,13 @@
             </ul>
             </ul>
           </el-card>
           </el-card>
         </el-col>
         </el-col>
-        <el-col :span="12">
-          <el-card shadow="hover" style="height:260px">
+        <el-col :span="12" class="height100">
+          <el-card shadow="hover" class="height100">
             <div slot="header" class="flexst">
             <div slot="header" class="flexst">
               <h5 class="title">系统通知</h5>
               <h5 class="title">系统通知</h5>
               <el-popover placement="right" width="50" trigger="hover">
               <el-popover placement="right" width="50" trigger="hover">
                 <ul class="pointer">
                 <ul class="pointer">
-                  <li @click="$store.dispatch('tagsView/addView', moreNotice)">查看更多</li>
+                  <li @click="handleMore('xxtz')">查看更多</li>
                 </ul>
                 </ul>
                 <i class="el-icon-s-unfold pointer" slot="reference"></i>
                 <i class="el-icon-s-unfold pointer" slot="reference"></i>
               </el-popover>
               </el-popover>
@@ -44,12 +44,17 @@
           </el-card>
           </el-card>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
-      <el-row :gutter="8" class="marginTop10">
-        <el-col :span="12">
-          <el-card shadow="hover" style="height:215px">
+      <el-row :gutter="8" class="marginTop10 height50">
+        <el-col :span="12" class="height100">
+          <el-card shadow="hover" class="height100">
             <div slot="header" class="flexst">
             <div slot="header" class="flexst">
               <h5 class="title">待办事项</h5>
               <h5 class="title">待办事项</h5>
-              <i class="el-icon-s-unfold pointer"></i>
+              <el-popover placement="right" width="50" trigger="hover">
+                <ul class="pointer">
+                  <li @click="handleMore('dbsx')">查看更多</li>
+                </ul>
+                <i class="el-icon-s-unfold pointer" slot="reference"></i>
+              </el-popover>
             </div>
             </div>
             <ul>
             <ul>
               <li v-for="(item, index) in todoList" :key="index" class="flexst">
               <li v-for="(item, index) in todoList" :key="index" class="flexst">
@@ -59,13 +64,13 @@
             </ul>
             </ul>
           </el-card>
           </el-card>
         </el-col>
         </el-col>
-        <el-col :span="12">
-          <el-card shadow="hover" style="height:215px">
+        <el-col :span="12" class="height100">
+          <el-card shadow="hover" class="height100">
             <div slot="header" class="flexst">
             <div slot="header" class="flexst">
               <h5 class="title">政策法规</h5>
               <h5 class="title">政策法规</h5>
               <el-popover placement="right" width="50" trigger="hover">
               <el-popover placement="right" width="50" trigger="hover">
                 <ul class="pointer">
                 <ul class="pointer">
-                  <li @click="$store.dispatch('tagsView/addView', moreNotice)">查看更多</li>
+                  <li @click="handleMore('flfg')">查看更多</li>
                 </ul>
                 </ul>
                 <i class="el-icon-s-unfold pointer" slot="reference"></i>
                 <i class="el-icon-s-unfold pointer" slot="reference"></i>
               </el-popover>
               </el-popover>
@@ -80,12 +85,12 @@
           </el-card>
           </el-card>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
-      <el-card shadow="hover" class="marginTop10 box-mountNode" id="mountNodeCon"
+      <!-- <el-card shadow="hover" class="marginTop10 box-mountNode" id="mountNodeCon"
         :body-style="{ padding: '8px 6px 0 6px' }">
         :body-style="{ padding: '8px 6px 0 6px' }">
         <div id="mountNode"></div>
         <div id="mountNode"></div>
-      </el-card>
+      </el-card> -->
     </div>
     </div>
-    <div class="home-right">
+    <!-- <div class="home-right">
       <el-card shadow="hover">
       <el-card shadow="hover">
         <div slot="header" class="flexst">
         <div slot="header" class="flexst">
           <h5 class="title">用户登录时间</h5>
           <h5 class="title">用户登录时间</h5>
@@ -104,7 +109,7 @@
           </li>
           </li>
         </ul>
         </ul>
       </el-card>
       </el-card>
-    </div>
+    </div> -->
     <addDialog ref="addProject" v-model="projectDialog" :bindItem="projectList" />
     <addDialog ref="addProject" v-model="projectDialog" :bindItem="projectList" />
   </div>
   </div>
 </template>
 </template>
@@ -185,14 +190,22 @@
       }
       }
     },
     },
     mounted () {
     mounted () {
-      this.buildChart();//构建图标
-      this.loginTimeChart()
+      // this.buildChart();//构建图标
+      // this.loginTimeChart()
       this.queryTodoList();//获取待办列表
       this.queryTodoList();//获取待办列表
       this.queryDoneList();//获取已办列表
       this.queryDoneList();//获取已办列表
       this.queryNoticeList();//获取通知、法律法规列表
       this.queryNoticeList();//获取通知、法律法规列表
       this.queryProjectList();//获取常办项目列表
       this.queryProjectList();//获取常办项目列表
     },
     },
     methods: {
     methods: {
+      handleMore (val) {
+        let obj = {
+          'xxtz': '/system/xttz',
+          'dbsx': '/ywbl/dbx',
+          'flfg': '/system/flfg'
+        }
+        this.$router.push(obj[val])
+      },
       /**
       /**
        * @description: handleProject
        * @description: handleProject
        * @param {*} item
        * @param {*} item
@@ -403,6 +416,12 @@
   }
   }
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
+  .height50 {
+    height: calc(50% - 4px);
+  }
+  .height100 {
+    height: 100%;
+  }
   @import "~@/styles/mixin.scss";
   @import "~@/styles/mixin.scss";
   @import "./index.scss";
   @import "./index.scss";
   /deep/.el-card__header {
   /deep/.el-card__header {

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 09:50:45
+ * @LastEditTime: 2023-11-30 17:07:18
 -->
 -->
 <template>
 <template>
   <div id="login">
   <div id="login">
@@ -260,7 +260,12 @@
       position: absolute;
       position: absolute;
       left: 50%;
       left: 50%;
       top: calc(50% + 10px);
       top: calc(50% + 10px);
-      transform: translate(-50%, -50%);
+      margin: -225px 0 0 -468px;
+    }
+    @media screen and (max-width: 1440px) {
+      .login-content-wrap {
+        transform: scale(0.8);
+      }
     }
     }
     .login-logo {
     .login-logo {
       height: 70px;
       height: 70px;

@@ -18,7 +18,7 @@
         lpbData.xmmc
         lpbData.xmmc
       }}</el-checkbox>
       }}</el-checkbox>
     </p>
     </p>
-    <el-button type="primary" class="save-btn" v-if="!onlyShow && showSave" @click="saveLpb">保存</el-button>
+    <el-button type="primary" class="save-btn" v-if="!onlyShow && showSave" @click="saveLpb">选择确认</el-button>
     <el-button type="primary" class="save-btn" v-if="!onlyShow && !showSave" @click="submitForm" :loading="loading">发起申请</el-button>
     <el-button type="primary" class="save-btn" v-if="!onlyShow && !showSave" @click="submitForm" :loading="loading">发起申请</el-button>
     <!-- 右键菜单 -->
     <!-- 右键菜单 -->
     <ul
     <ul
@@ -36,7 +36,7 @@ import { getLpb } from "@/api/lpcx.js";
 import chCpn from "./ch.vue";
 import chCpn from "./ch.vue";
 import zdyCpn from "./zdys.vue";
 import zdyCpn from "./zdys.vue";
 import ljzsCpn from "./ljzs.vue";
 import ljzsCpn from "./ljzs.vue";
-import { startBusinessFlow, choiceBdcdy } from "@/api/workFlow.js";
+import { startBusinessFlow, choiceBdcdy,againAddSldy } from "@/api/workFlow.js";
 import jump from "../../ywbl/ywsq/components/mixin/jump";
 import jump from "../../ywbl/ywsq/components/mixin/jump";
 import store from '@/store/index.js'
 import store from '@/store/index.js'
 import { ywPopupCacel } from "@/utils/popup.js";
 import { ywPopupCacel } from "@/utils/popup.js";
@@ -132,10 +132,45 @@ export default {
      * @author: renchao
      * @author: renchao
      */ 
      */ 
     saveLpb(){
     saveLpb(){
+       if (this.bsmList.length == 0) {
+          this.$message.error("请至少选择一条数据");
+          return;
+        }
+      this.loading = true;
+      againAddSldy({
+        bsmSqyw: this.sqywInfo.bsmSqyw,            
+        bsmSlsq: this.sqywInfo.bsmSlsq,
+        bdcdysz: this.bsmList,
+        sjlx: "houses"
+      }).then((res) => {
+        this.loading = false
+        if (res.code == 200) {
+          this.$message({
+            showClose: true,
+            message: '添加成功',
+            type: 'success'
+          })
+          if (!this.isJump) {
+            this.jump(res.result, this.sqywInfo.djywbm)
+          } else {
+            store.dispatch('user/refreshPage', true);
+          }
+          //this.close();
+          this.$popupCacel();
+        } else {
+          if (res.result && res.result.length > 0) {
+            this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{result: res.result} })
+          } else {
+            this.$popup("申请错误明细", "components/ywdialog", { width:'36%', formData:{message: res.message} })
+          }
+        }
+      }).catch(() => {
+        this.loading = false
+      })
       // todo 调用保存接口 传入参数待定
       // todo 调用保存接口 传入参数待定
-      console.log(this.bsmList,'this.bsmList');
+      //console.log(this.bsmList,'this.bsmList');
       // 保存成功后关闭弹框
       // 保存成功后关闭弹框
-      this.$popupCacel()
+      //this.$popupCacel()
     },
     },
     // 改变户选中状态
     // 改变户选中状态
     /**
     /**

@@ -70,7 +70,7 @@
 <style lang="scss" scoped>
 <style lang="scss" scoped>
   .djbfm {
   .djbfm {
     width: 100%;
     width: 100%;
-    height: 80%;
+    height: 100%;
     background: #fff;
     background: #fff;
     line-height: 45px;
     line-height: 45px;
     text-align: center;
     text-align: center;

@@ -219,10 +219,9 @@
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
   @import "~@/styles/tablecss.scss";
   @import "~@/styles/tablecss.scss";
-  .tableDivCss{
+  .tableDivCss {
     width: 100%;
     width: 100%;
     height: 100%;
     height: 100%;
     background-color: rgb(255, 255, 255);
     background-color: rgb(255, 255, 255);
-
   }
   }
 </style>
 </style>

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 09:52:07
+ * @LastEditTime: 2023-11-08 14:12:17
 -->
 -->
 <template>
 <template>
   <div class="bdcqljqtsx">
   <div class="bdcqljqtsx">
     <el-button class="print" v-print="printObj">打印</el-button>
     <el-button class="print" v-print="printObj">打印</el-button>
     <div class="content" v-if="qlxxList.ztqlmc" id="box">
     <div class="content" v-if="qlxxList.ztqlmc" id="box">
       <div class="title">不动产权利及其他事项<br />登记信息</div>
       <div class="title">不动产权利及其他事项<br />登记信息</div>
-      <div>
+      <div style="text-align:center">
         不动产单元号:
         不动产单元号:
         <div class="underline">{{ propsParam.bdcdyh }}</div>
         <div class="underline">{{ propsParam.bdcdyh }}</div>
       </div>
       </div>
       <br /><br /><br />
       <br /><br /><br />
-      <div>
+      <div class="detail">
         <div class="underline">{{ qlxxList.ztqlmc }}</div>
         <div class="underline">{{ qlxxList.ztqlmc }}</div>
         登记 共
         登记 共
         <div class="underline">{{ qlxxList.ztql.total }}</div>
         <div class="underline">{{ qlxxList.ztql.total }}</div>
         条
         条
       </div>
       </div>
       <br /><br />
       <br /><br />
-      <div>
+      <div class="detail">
         抵押权登记 共
         抵押权登记 共
         <div class="underline">{{ qlxxList.diyaq.total }}</div>
         <div class="underline">{{ qlxxList.diyaq.total }}</div>
         条
         条
       </div>
       </div>
       <br />
       <br />
-      <div>
+      <div class="detail">
         地役权登记 共
         地役权登记 共
         <div class="underline">{{ qlxxList.diyiq.total }}</div>
         <div class="underline">{{ qlxxList.diyiq.total }}</div>
         条
         条
       </div>
       </div>
       <br />
       <br />
-      <div>
+      <div class="detail">
         预告登记 共
         预告登记 共
         <div class="underline">{{ qlxxList.ygdj.total }}</div>
         <div class="underline">{{ qlxxList.ygdj.total }}</div>
         条
         条
       </div>
       </div>
       <br />
       <br />
-      <div>
+      <div class="detail">
         异议登记 共
         异议登记 共
         <div class="underline">{{ qlxxList.yydj.total }}</div>
         <div class="underline">{{ qlxxList.yydj.total }}</div>
         条
         条
       </div>
       </div>
       <br />
       <br />
-      <div>
+      <div class="detail">
         查封登记 共
         查封登记 共
         <div class="underline">{{ qlxxList.cfdj.total }}</div>
         <div class="underline">{{ qlxxList.cfdj.total }}</div>
         条
         条
@@ -60,10 +60,10 @@
     name: "bdcqljqtsx",
     name: "bdcqljqtsx",
     data () {
     data () {
       return {
       return {
-          printObj: {
-        id: "box",
-        //其他配置项，
-      },
+        printObj: {
+          id: "box",
+          //其他配置项，
+        },
         //传递参数
         //传递参数
         propsParam: this.$attrs,
         propsParam: this.$attrs,
         qlxxList: "",
         qlxxList: "",
@@ -83,44 +83,45 @@
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
+  .detail {
+    margin-right: 19%;
+  }
   .bdcqljqtsx {
   .bdcqljqtsx {
     width: 100%;
     width: 100%;
     height: 100%;
     height: 100%;
     background: #fff;
     background: #fff;
-  position: relative;
-  .print {
-    // background-color: #0079fe;
-    z-index: 10;
-    position: absolute;
-    left: 11px;
-    top: 5px;
-  }
-
+    position: relative;
+    .print {
+      // background-color: #0079fe;
+      z-index: 10;
+      position: absolute;
+      left: 11px;
+      top: 5px;
+    }
   }
   }
-    .content {
-      width: 50%;
-      height: 100%;
-      margin: 0 auto;
-      text-align: right;
-      color: #333;
-      font-family: "Arial Negreta", "Arial Normal", "Arial", sans-serif;
-      font-weight: 700;
-      font-size: 18px;
-      line-height: 16px;
-
+  .content {
+    width: 50%;
+    height: 100%;
+    margin: 0 auto;
+    text-align: right;
+    color: #333;
+    font-family: "Arial Negreta", "Arial Normal", "Arial", sans-serif;
+    font-weight: 700;
+    font-size: 18px;
+    line-height: 16px;
 
 
-      .title {
-        font-size: 32px;
-        text-align: center;
-        padding: 40px 0;
-        line-height: 34px;
-      }
+    .title {
+      font-size: 32px;
+      text-align: center;
+      padding: 40px 0;
+      line-height: 34px;
+    }
 
 
-      .underline {
-        font-size: 14px;
-        font-weight: normal;
-        text-decoration: underline;
-        display: inline-block;
-      }
+    .underline {
+      font-size: 14px;
+      font-weight: normal;
+      text-decoration: underline;
+      display: inline-block;
     }
     }
+  }
 </style>
 </style>

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-10-12 09:56:45
+ * @LastEditTime: 2023-12-15 14:42:16
 -->
 -->
 <template>
 <template>
   <div class="rlPopup">
   <div class="rlPopup">
@@ -12,8 +12,7 @@
       <i class="el-icon-arrow-right"></i>
       <i class="el-icon-arrow-right"></i>
     </div>
     </div>
     <div class="img-list-wrap" v-Loading="loading">
     <div class="img-list-wrap" v-Loading="loading">
-      <img src="http://127.0.0.1:38088/video=stream&camidx=0" v-if="isScan" alt="">
-      <div v-for="(img, i) in previewImg.imgList" :key="i" v-else>
+      <div v-for="(img, i) in previewImg.imgList" :key="i">
         <photo-zoom :url="img.fjurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2"
         <photo-zoom :url="img.fjurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2"
           overlayStyle="width: 100%;height:100%">
           overlayStyle="width: 100%;height:100%">
         </photo-zoom>
         </photo-zoom>
@@ -60,8 +59,6 @@
         loading: false,
         loading: false,
         key: 0,
         key: 0,
         isScan: false,
         isScan: false,
-        // 打开高拍仪
-        scanTitle: '打开高拍仪',
         transform: {
         transform: {
           scale: 1,
           scale: 1,
           degree: 0
           degree: 0
@@ -165,7 +162,7 @@
       height: 66px;
       height: 66px;
       line-height: 75px;
       line-height: 75px;
       color: #fff;
       color: #fff;
-      background-color: rgb(239, 239, 239);
+      background-color: #ccc;
       border-radius: 50%;
       border-radius: 50%;
       cursor: pointer;
       cursor: pointer;
       text-align: center;
       text-align: center;
@@ -201,7 +198,8 @@
         display: block;
         display: block;
         object-fit: scale-down;
         object-fit: scale-down;
         transition: all 0.3s;
         transition: all 0.3s;
-        max-width: 100%;
+        width: 100%;
+        height: 100%;
       }
       }
     }
     }
 
 

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-10-09 10:18:46
+ * @LastEditTime: 2024-01-29 14:27:07
 -->
 -->
 <template>
 <template>
   <div class="clxx">
   <div class="clxx">
@@ -45,7 +45,7 @@
 <script>
 <script>
   import store from '@/store/index.js'
   import store from '@/store/index.js'
   import imagePreview from "./dialog/imagePreview.vue";
   import imagePreview from "./dialog/imagePreview.vue";
-  import { repairInitClml, getClmxList } from "@/api/clxx.js";
+  import { InitClml, repairInitClml, getClmxList } from "@/api/clxx.js";
   export default {
   export default {
     components: { imagePreview },
     components: { imagePreview },
     props: {
     props: {
@@ -87,7 +87,7 @@
       }
       }
     },
     },
     created () {
     created () {
-      this.clmlInitList()
+      this.clmlInitList(1)
     },
     },
     methods: {
     methods: {
       /**
       /**
@@ -148,25 +148,51 @@
       clmlInitList (type) {
       clmlInitList (type) {
         // 1：列表初始化  2：新增材料
         // 1：列表初始化  2：新增材料
         return new Promise((resolve) => {
         return new Promise((resolve) => {
-          repairInitClml(this.formData).then((res) => {
-            if (res.code == 200) {
-              resolve(res.code);
-              if (res.result && res.result.length > 0) {
-                this.tableData = res.result;
-                if (type == 1) {
-                  this.treeClick(this.tableData[0], 0);
-                } else {
-                  //新增材料后刷新列表焦点置于新增的对象上
-                  this.treeClick(
-                    this.tableData[this.tableData.length - 1],
-                    this.tableData.length - 1
-                  );
+          if (this.formData.sjlx == 2) {
+            repairInitClml(this.formData).then((res) => {
+              if (res.code == 200) {
+                resolve(res.code);
+                if (res.result && res.result.length > 0) {
+                  this.tableData = res.result;
+                  if (type == 1) {
+                    this.treeClick(this.tableData[0], 0);
+                  } else {
+                    //新增材料后刷新列表焦点置于新增的对象上
+                    this.treeClick(
+                      this.tableData[this.tableData.length - 1],
+                      this.tableData.length - 1
+                    );
+                  }
                 }
                 }
+              } else {
+                this.$message.error(res.message);
               }
               }
-            } else {
-              this.$message.error(res.message);
-            }
-          })
+            })
+          } else {
+            var formdata = new FormData();
+            formdata.append("bsmSlsq", this.formData.bsmSlsq ? this.formData.bsmSlsq : '');
+            formdata.append("bsmSldy", this.formData.bsmSldy ? this.formData.bsmSldy : '');
+            console.log(this.formData);
+            InitClml(formdata).then((res) => {
+              if (res.code == 200) {
+                resolve(res.code);
+                if (res.result && res.result.length > 0) {
+                  this.tableData = res.result;
+                  if (type == 1) {
+                    this.treeClick(this.tableData[0], 0);
+                  } else {
+                    //新增材料后刷新列表焦点置于新增的对象上
+                    this.treeClick(
+                      this.tableData[this.tableData.length - 1],
+                      this.tableData.length - 1
+                    );
+                  }
+                }
+              } else {
+                this.$message.error(res.message);
+              }
+            })
+          }
         })
         })
       },
       },
       /**
       /**
@@ -279,13 +305,11 @@
       position: absolute;
       position: absolute;
 
 
       .menu-tree {
       .menu-tree {
-        width: 20%;
+        width: 26%;
         min-width: 160px;
         min-width: 160px;
         height: 100%;
         height: 100%;
-        margin-right: 10px;
+        margin-right: 5px;
         border-right: 1px dotted #d9d9d9;
         border-right: 1px dotted #d9d9d9;
-        padding: 0 15px;
-
         .item {
         .item {
           line-height: 30px;
           line-height: 30px;
           padding-top: 5px;
           padding-top: 5px;

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-11-02 13:39:28
+ * @LastEditTime: 2024-01-30 16:53:30
 -->
 -->
 <template>
 <template>
   <div class="tableBox">
   <div class="tableBox">
@@ -74,7 +74,7 @@
               <el-link v-if="['zxywh', 'ywh'].includes(item.prop)"
               <el-link v-if="['zxywh', 'ywh'].includes(item.prop)"
                 @click="handleSelectYwh(row, row[item.prop])"
                 @click="handleSelectYwh(row, row[item.prop])"
                 type="primary">{{ row[item.prop] }}</el-link>
                 type="primary">{{ row[item.prop] }}</el-link>
-              <span v-if="!['qszt','ywh', 'zxywh' ].includes(item.prop)">{{ getLable(item.prop,row[item.prop]) }}</span>
+              <span v-if="!['qszt','ywh', 'zxywh'].includes(item.prop)">{{ getLable(item.prop,row[item.prop],row) }}</span>
             </p>
             </p>
 
 
             <el-tooltip
             <el-tooltip
@@ -139,7 +139,7 @@
       };
       };
     },
     },
     methods: {
     methods: {
-      getLable (prop, label) {
+      getLable (prop, label, row) {
         const ztObj = {
         const ztObj = {
           0: '否',
           0: '否',
           1: '是'
           1: '是'
@@ -158,9 +158,25 @@
           },
           },
           default: (label) => label
           default: (label) => label
         };
         };
-
         const strategy = strategies[prop] || strategies.default;
         const strategy = strategies[prop] || strategies.default;
-        return strategy(label);
+        if (['zgzqse', 'bdbzzqse'].includes(prop)) {
+          let title = strategy(label) ? strategy(label) : ''
+          if (strategy(label) && row.jedw == 2) {
+            title = title + '万元'
+          } else if (strategy(label) && row.jedw == 1) {
+            title = title + '元'
+          }
+          return title
+        } else if (prop == 'dymj' && row.mjdw) {
+          let arr = store.getters.dictData['A7'].filter(item => item.dcode === row.mjdw);
+          if (strategy(label)) {
+            return strategy(label) + arr[0].dname
+          } else {
+            return strategy(label)
+          }
+        } else {
+          return strategy(label);
+        }
       },
       },
       openPrint () {
       openPrint () {
         this.render = true;
         this.render = true;
@@ -242,20 +258,25 @@
       },
       },
       // 选择业务号
       // 选择业务号
       handleSelectYwh (row, ywh) {
       handleSelectYwh (row, ywh) {
+        let that = this
         let sjlx = row.sjlx,
         let sjlx = row.sjlx,
           bsmQlxx = row.bsmQlxx
           bsmQlxx = row.bsmQlxx
-        if (sjlx == '系统数据') {
+        if (['系统数据', '存量数据'].includes(sjlx)) {
           getXtParamsByYwh(ywh).then(res => {
           getXtParamsByYwh(ywh).then(res => {
             let data = res.result
             let data = res.result
-            const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
-            window.open(href, `urlname${new Date().getTime()}`)
+            that.$popup('材料信息', 'registerBook/components/clxx/index', {
+              width: '70%',
+              formData: { ...data, sjlx: 1, bsmSldy: row.bsmSldy }
+            })
+            // const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
+            // window.open(href, `urlname${new Date().getTime()}`)
           })
           })
         } else {
         } else {
           getBlParamsByYwh(ywh, bsmQlxx).then(res => {
           getBlParamsByYwh(ywh, bsmQlxx).then(res => {
             let data = res.result
             let data = res.result
             this.$popup('材料信息', 'registerBook/components/clxx/index', {
             this.$popup('材料信息', 'registerBook/components/clxx/index', {
-              width: '60%',
-              formData: data
+              width: '70%',
+              formData: { ...data, sjlx: 2 }
             })
             })
           })
           })
         }
         }

@@ -4,7 +4,7 @@ class data extends filter {
   constructor() {
   constructor() {
     super()
     super()
   }
   }
-  columns() {
+  columns () {
     return {
     return {
       //空列值个数
       //空列值个数
       emptycolNum: 3,
       emptycolNum: 3,
@@ -200,21 +200,13 @@ class data extends filter {
           label: "权利性质",
           label: "权利性质",
         },
         },
         {
         {
-          prop: "ytmc",
+          prop: "qlytmc",
           label: "土地用途",
           label: "土地用途",
         },
         },
         {
         {
           prop: "syqqzsj",
           prop: "syqqzsj",
           label: "使用权起止时间",
           label: "使用权起止时间",
         },
         },
-        // {
-        //   prop: "syqjssj",
-        //   label: "使用权结束时间",
-        // },
-        // {
-        //   prop: "tdsyqx",
-        //   label: "土地使用期限",
-        // },
         {
         {
           prop: "tdsyqx",
           prop: "tdsyqx",
           label: "土地使用期限",
           label: "土地使用期限",
@@ -242,7 +234,7 @@ class data extends filter {
         {
         {
           prop: "fj",
           prop: "fj",
           label: "附记",
           label: "附记",
-        },
+        }
       ],
       ],
       FDCQ1: [
       FDCQ1: [
         {
         {

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-10-13 14:30:26
+ * @LastEditTime: 2024-01-29 14:19:56
 -->
 -->
 <template>
 <template>
   <div class="content">
   <div class="content">
@@ -11,20 +11,22 @@
         :data="treedata"
         :data="treedata"
         :props="defaultProps"
         :props="defaultProps"
         @node-click="handleNodeClick"
         @node-click="handleNodeClick"
+        :highlight-current="highlight"
         :default-expand-all="true"
         :default-expand-all="true"
         :expand-on-click-node="false"
         :expand-on-click-node="false"
         node-key="id"
         node-key="id"
         :default-checked-keys="[showTab]">
         :default-checked-keys="[showTab]">
       </el-tree>
       </el-tree>
-      <el-collapse v-model="activeName" accordion>
-        <el-collapse-item
+      <ElCollapse v-model="activeName" accordion>
+        <ElCollapse-item
           class="sfqqq"
           class="sfqqq"
           ref="sfq"
           ref="sfq"
           v-for="(item, index) in sfqdata"
           v-for="(item, index) in sfqdata"
           :key="index"
           :key="index"
           :name="index">
           :name="index">
           <template slot="title">
           <template slot="title">
-            <span class="text" @click="tap(item, index)">
+            <!-- nameSelect -->
+            <span class="text" :class="[titleActive == index ? 'curentSelect' : '']" @click="tap(item, index)">
               <span> {{ item.label }}</span>
               <span> {{ item.label }}</span>
             </span>
             </span>
           </template>
           </template>
@@ -41,8 +43,8 @@
               {{ item.zt }}
               {{ item.zt }}
             </span>
             </span>
           </p>
           </p>
-        </el-collapse-item>
-      </el-collapse>
+        </ElCollapse-item>
+      </ElCollapse>
     </div>
     </div>
     <div class="right">
     <div class="right">
       <component
       <component
@@ -54,11 +56,18 @@
 </template>
 </template>
 <script>
 <script>
   import { getBdcqljqtsx } from "@/api/djbDetail.js";
   import { getBdcqljqtsx } from "@/api/djbDetail.js";
+  import ElCollapse from "@/components/collapse/index";
+  import ElCollapseItem from "@/components/collapse/src/collapse-item.vue";
   import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
   import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
   export default {
   export default {
+    comments: {
+      ElCollapse, ElCollapseItem
+    },
     data () {
     data () {
       return {
       return {
+        highlight: true,
         activeName: 0,
         activeName: 0,
+        titleActive: "",
         //接收参数
         //接收参数
         // propsParam: this.$attrs,
         // propsParam: this.$attrs,
         //左侧目录
         //左侧目录
@@ -85,8 +94,17 @@
       };
       };
     },
     },
     props: ["formData"],
     props: ["formData"],
-    mounted () {
-      this.loadData(this.formData.bdcdyh);
+    // mounted () {
+    //   this.loadData(this.formData.bdcdyh);
+    // },
+    watch: {
+      'formData.bdcdyh': {
+        handler (newName, oldName) {
+          this.loadData(this.formData.bdcdyh);
+        },
+        immediate: true,
+        deep: true
+      }
     },
     },
     methods: {
     methods: {
       /**
       /**
@@ -95,6 +113,7 @@
        * 点击不动产单元号事件
        * 点击不动产单元号事件
        */
        */
       getBdcdyh (val) {
       getBdcdyh (val) {
+        this.highlight = false
         this.addloadData(val);
         this.addloadData(val);
       },
       },
       /**
       /**
@@ -109,27 +128,36 @@
           if (res.code === 200) {
           if (res.code === 200) {
             if (this.sfqdata.some((item) => item.bdcdyid === val.bdcdyid)) {
             if (this.sfqdata.some((item) => item.bdcdyid === val.bdcdyid)) {
               let index = this.sfqdata.findIndex((item) => {
               let index = this.sfqdata.findIndex((item) => {
-                return item.bdcdyid == val.bdcdyid;
-              });
-              this.activeName = index;
-
-              // this.setstyle(index, 0, this.iskey);
+                return item.bdcdyid == val.bdcdyid
+              })
+              this.activeName = index
             } else {
             } else {
-              this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
-              this.activeName = this.sfqdata.length - 1;
-              this.isActive = ""
-              // this.$nextTick(() => {
-              //   this.setstyle(this.sfqdata.length - 1, 0, this.iskey);
-              // })
+              this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid))
+              this.activeName = this.sfqdata.length - 1
             }
             }
+
+            this.$nextTick(function () {
+              this.defaultNode = getNode(
+                this.formData.qllx,
+                { linShi: 0, xianShi: 0, liShi: 0 },
+                res.result.bdcdylx || ""
+              );
+              this.sfqdata[0].children.forEach((item, index) => {
+                if (item.id == this.defaultNode.id) {
+                  this.isActive = index
+                  this.titleActive = -1
+                  this.loadComponent(item.form)
+                }
+              })
+            })
           }
           }
-        });
+        })
         this.currentSelectProps = {
         this.currentSelectProps = {
           bdcdyid: val.bdcdyid,
           bdcdyid: val.bdcdyid,
           bdcdyh: val.bdcdyh,
           bdcdyh: val.bdcdyh,
           qllx: this.formData.qllx,
           qllx: this.formData.qllx,
-          bsmQlxx: this.formData.bsmQlxx,
-        };
+          bsmQlxx: this.formData.bsmQlxx
+        }
       },
       },
       /**
       /**
        * @description: loadData
        * @description: loadData
@@ -155,10 +183,10 @@
                 if (item.id == this.defaultNode.id) {
                 if (item.id == this.defaultNode.id) {
                   this.loadComponent(item.form);
                   this.loadComponent(item.form);
                   this.isActive = index;
                   this.isActive = index;
+                  this.titleActive = -1
                 }
                 }
-              });
-              // this.setstyle(0, 0, this.iskey);
-            });
+              })
+            })
           }
           }
         });
         });
         this.currentSelectProps = {
         this.currentSelectProps = {
@@ -174,27 +202,11 @@
        * @author: renchao
        * @author: renchao
        */
        */
       handleNodeClick (data) {
       handleNodeClick (data) {
+        this.highlight = true
+        this.titleActive = -1
+        this.isActive = -1
         this.loadComponent(data.form);
         this.loadComponent(data.form);
       },
       },
-      // setstyle(newindex, index, key) {
-      //   if (key != undefined || this.keyy == index) {
-      //     if (key != undefined) {
-      //       this.keyy = key;
-      //     }
-      //     this.loadComponent(
-      //       this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form
-      //     );
-      //     let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el;
-      //     dpme.style.backgroundColor = "#f5f5f5";
-      //     dpme.style.color = "#0079fe";
-      //     dpme.style.borderRight = "4px solid #0079fe";
-      //   } else {
-      //     let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el;
-      //     dpme.style.backgroundColor = "#ffffff";
-      //     dpme.style.color = "black";
-      //     dpme.style.border = "none";
-      //   }
-      // },
       /**
       /**
        * @description: addlist
        * @description: addlist
        * @param {*} data
        * @param {*} data
@@ -202,11 +214,19 @@
        * 新增列表功能
        * 新增列表功能
        */
        */
       tap (data, index) {
       tap (data, index) {
+        this.activeName = index.toString()
+        this.isActive = -1
+        this.titleActive = index
         this.loadComponent(data.form);
         this.loadComponent(data.form);
+         this.currentSelectProps.bdcdyid=data.bdcdyid;
+         this.currentSelectProps.bdcdyh=data.bdcdyh;
+        this.highlight = false
       },
       },
       taplist (data, index) {
       taplist (data, index) {
         this.loadComponent(data.form);
         this.loadComponent(data.form);
         this.isActive = index;
         this.isActive = index;
+        this.titleActive = -1;
+        this.highlight = false
       },
       },
       /**
       /**
        * @description: loadComponent
        * @description: loadComponent
@@ -216,15 +236,39 @@
       loadComponent (form) {
       loadComponent (form) {
         this.componentTag = (r) =>
         this.componentTag = (r) =>
           require.ensure([], () => r(require("@/views/registerBook/" + form)));
           require.ensure([], () => r(require("@/views/registerBook/" + form)));
-      },
-    },
-  };
+      }
+    }
+  }
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
-  // /deep/.rollTable {
-  //   height: calc(100vh - 300px) !important;
-  // }
-
+  /deep/.el-collapse-item__header:hover {
+    background-color: #f5f7fa;
+  }
+  /deep/.el-collapse-item__content {
+    .unselected:hover {
+      background-color: #f5f7fa;
+    }
+  }
+  /deep/.el-collapse-item__header .el-collapse-item__arrow:hover {
+    transition: transform 0.3s;
+    transform: scale(1.3);
+    z-index: 1;
+    color: #0079fe;
+    font-weight: 700;
+  }
+  /deep/.el-tree--highlight-current
+    .el-tree-node.is-current
+    > .el-tree-node__content {
+    background-color: #f5f5f5;
+    color: #0079fe;
+    border-right: 4px solid #0079fe;
+  }
+  .curentSelect {
+    background-color: #f5f5f5;
+    color: #0079fe;
+    border-right: 4px solid #0079fe;
+    border-bottom: 1px solid #ffffff;
+  }
   .content {
   .content {
     width: 100%;
     width: 100%;
     height: 100%;
     height: 100%;
@@ -242,8 +286,6 @@
     .right {
     .right {
       width: calc(100% - 256px);
       width: calc(100% - 256px);
       height: 704px;
       height: 704px;
-      // overflow-y: scroll;
-      // overflow: auto;
       background-color: #f5f5f5;
       background-color: #f5f5f5;
       border: 1px solid rgb(228, 228, 228);
       border: 1px solid rgb(228, 228, 228);
     }
     }
@@ -259,22 +301,10 @@
     height: 45px;
     height: 45px;
   }
   }
 
 
-  /deep/ .el-tree-node:focus > .el-tree-node__content {
-    // background-color: #f5f5f5;
-    // color: #0079fe;
-    // border-right: 4px solid #0079fe;
-  }
-
   /deep/.el-tree-node {
   /deep/.el-tree-node {
     white-space: pre-wrap;
     white-space: pre-wrap;
   }
   }
 
 
-  /deep/ .is-current > .el-tree-node__content {
-    // background-color: #f5f5f5;
-    // color: #0079fe;
-    // border-right: 4px solid #0079fe;
-  }
-
   /deep/.el-collapse-item__header {
   /deep/.el-collapse-item__header {
     width: 100%;
     width: 100%;
     cursor: pointer;
     cursor: pointer;
@@ -322,7 +352,10 @@
       align-items: center;
       align-items: center;
     }
     }
   }
   }
-
+  .nameSelect {
+    color: #000000;
+    font-weight: 700;
+  }
   .select {
   .select {
     border: none;
     border: none;
     cursor: pointer;
     cursor: pointer;

+
 /*
 /*
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-09-15 10:52:40
+ * @LastEditTime: 2024-01-25 13:37:19
  */
  */
 var qlxxPage = [
 var qlxxPage = [
     { qllx: "A01", id: "tdsyq", form: "tdsyq.vue", label: "集体土地所有权" },
     { qllx: "A01", id: "tdsyq", form: "tdsyq.vue", label: "集体土地所有权" },
@@ -12,7 +13,7 @@ var qlxxPage = [
     { qllx: "A06", id: "", form: "", label: "宅基地使用权/房屋所有权" },
     { qllx: "A06", id: "", form: "", label: "宅基地使用权/房屋所有权" },
     { qllx: "A07", id: "jsydsyq", form: "jsydsyq.vue", label: "集体建设用地使用权" },
     { qllx: "A07", id: "jsydsyq", form: "jsydsyq.vue", label: "集体建设用地使用权" },
     { qllx: "A08", id: "", form: "", label: "集体建设用地使用权/房屋所有权" },
     { qllx: "A08", id: "", form: "", label: "集体建设用地使用权/房屋所有权" },
-    { qllx: "A09", id: "jsydsyq", form: "jsydsyq.vue", label: "土地承包经营权" },
+    { qllx: "A09", id: "tdcbjyq", form: "tdcbjyq.vue", label: "土地承包经营权" },
     { qllx: "A11", id: "ldsyq", form: "ldsyq.vue", label: "林地使用权" },
     { qllx: "A11", id: "ldsyq", form: "ldsyq.vue", label: "林地使用权" },
     { qllx: "A12", id: "sllmsyq", form: "sllmsyq.vue", label: "林地使用权/森林、林木使用权" },
     { qllx: "A12", id: "sllmsyq", form: "sllmsyq.vue", label: "林地使用权/森林、林木使用权" },
     { qllx: "A13", id: "jsydsyq", form: "jsydsyq.vue", label: "草原使用权" },
     { qllx: "A13", id: "jsydsyq", form: "jsydsyq.vue", label: "草原使用权" },
@@ -57,7 +58,7 @@ export function loadTreeData (bdcdyh) {
 }
 }
 export function loadsfqData (qlxxData, bdcdyh, bdcdyid) {
 export function loadsfqData (qlxxData, bdcdyh, bdcdyid) {
     let treedata = {
     let treedata = {
-        bdcdyid: bdcdyid, id: "bdcqljqtsx", form: "bdcqljqtsx.vue", label: "不动产权利及其他事项\n (" + bdcdyh.slice(19) + ")", children: [],
+      bdcdyh:bdcdyh,bdcdyid: bdcdyid, id: "bdcqljqtsx", form: "bdcqljqtsx.vue", label: "不动产权利及其他事项\n (" + bdcdyh.slice(19) + ")", children: [],
     };
     };
     //主体权利
     //主体权利
     treedata.children.push(getNode(qlxxData.ztqllx, qlxxData.ztql, qlxxData.bdcdylx, bdcdyid));
     treedata.children.push(getNode(qlxxData.ztqllx, qlxxData.ztql, qlxxData.bdcdylx, bdcdyid));
@@ -89,12 +90,12 @@ export function getNode (qllx, qlxx, bdcdylx, bdcdyid) {
         if (qlxxPage[i].qllx == qllx) {
         if (qlxxPage[i].qllx == qllx) {
             if (qllx == "A04" || qllx == "A06" || qllx == "A08") {
             if (qllx == "A04" || qllx == "A06" || qllx == "A08") {
                 if (bdcdylx == "4") {
                 if (bdcdylx == "4") {
-                    node = { bdcdyid: bdcdyid, id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label ,zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
+                    node = { bdcdyid: bdcdyid, id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label, zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
                 } else {
                 } else {
-                    node = { bdcdyid: bdcdyid, id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label  ,zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
+                    node = { bdcdyid: bdcdyid, id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label, zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
                 }
                 }
             } else {
             } else {
-                node = { bdcdyid: bdcdyid, id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label ,zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
+                node = { bdcdyid: bdcdyid, id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label, zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
             }
             }
             break;
             break;
         }
         }

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-09-19 10:48:40
+ * @LastEditTime: 2024-01-31 09:52:39
 -->
 -->
 <template>
 <template>
   <div class="content loadingtext">
   <div class="content loadingtext">
@@ -55,10 +55,8 @@
   </div>
   </div>
 </template>
 </template>
 <script>
 <script>
-  import { getBdcqljqtsx } from "@/api/djbDetail.js";
+  import { getBdcqljqtsx, getBdcqljqtsxBdcdyh } from "@/api/djbDetail.js";
   import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
   import { loadTreeData, loadsfqData, getNode } from "./djbFrameData.js";
-  import { searchTaskToDo } from "@/api/workflow/search.js";
-  import { leftMenu } from "@/api/workFlow.js";
   export default {
   export default {
     data () {
     data () {
       return {
       return {
@@ -91,8 +89,98 @@
         showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
         showTab: "bdcqldjml", // 选中状态,根据表格中权利类型判断
       };
       };
     },
     },
-    mounted () {
-      this.getdata();
+    /**
+     * @description: loadData
+     * @author: renchao
+     */
+    loadData(val) {
+      getBdcqljqtsxBdcdyh({
+        bdcdyh: val,
+      }).then((res) => {
+        if (res.code === 200) {
+          this.treedata = loadTreeData(val);
+          this.sfqdata.push(loadsfqData(res.result, val, res.result.bdcdyid));
+          this.$nextTick(function () {
+            this.defaultNode = getNode(
+              res.result.ztqllx,
+              { linShi: 0, xianShi: 0, liShi: 0 },
+              res.result.bdcdylx || ""
+            );
+            this.sfqdata[0].children.forEach((item, index) => {
+              if (item.id == this.defaultNode.id) {
+                this.loadComponent(item.form);
+                this.isActive = index;
+              }
+            });
+            this.currentSelectProps = {
+              bdcdyid: res.result.bdcdyid,
+              bdcdyh: val,
+              qllx: res.result.qllx,
+              bsmQlxx: this.currentSelectProps.bsmQlxx,
+            };
+            // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
+            // this.loadComponent(this.defaultNode.form);
+
+            // this.setstyle(0, 0, this.iskey);
+          });
+        }
+      });
+    },
+    /*
+          点击登记簿菜单
+         */
+    /**
+     * @description: 点击登记簿菜单
+     * @param {*} data
+     * @author: renchao
+     */
+    handleNodeClick(data) {
+      this.loadComponent(data.form);
+    },
+
+    /**
+     * @description: setstyle
+     * @param {*} data
+     * @author: renchao
+     * 设置样式和点击定位到当前功能
+     */
+    // setstyle (newindex, index, key) {
+    //   if (key != undefined || this.keyy == index) {
+    //     if (key != undefined) {
+    //       this.keyy = key
+    //     }
+    //     this.loadComponent(this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form);
+    //     let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
+    //     dpme.style.backgroundColor = "#f5f5f5";
+    //     dpme.style.color = "#0079fe";
+    //     dpme.style.borderRight = "4px solid #0079fe";
+    //   } else {
+    //     let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
+    //     dpme.style.backgroundColor = "#ffffff";
+    //     dpme.style.color = "black";
+    //     dpme.style.border = "none";
+    //   }
+    // },
+    /**
+     * @description: tap
+     * @param {*} data
+     * @author: renchao
+     * 新增列表功能
+     */
+    tap(data, index) {
+      this.loadComponent(data.form);
+       this.currentSelectProps.bdcdyid=data.bdcdyid
+       this.currentSelectProps.bdcdyh=data.bdcdyh
+    },
+    /**
+     * @description: taplist
+     * @param {*} data
+     * @author: renchao
+     * 新增列表功能
+     */
+    taplist(data, index) {
+      this.loadComponent(data.form);
+      this.isActive = index;
     },
     },
     methods: {
     methods: {
       // 截取字符的方法
       // 截取字符的方法
@@ -106,62 +194,11 @@
         obj = obj.substring(index + 1, obj.length);
         obj = obj.substring(index + 1, obj.length);
         return obj;
         return obj;
       },
       },
-      // 通过不动产业务号获取参数
       /**
       /**
-       * @description: 通过不动产业务号获取参数
-       * @author: renchao
-       */
-      getdata () {
-        this.queryForm = {
-          bdcdyh: this.getCaption(window.location.href),
-          currentPage: 1,
-          djlx: "",
-          pageSize: 10,
-          qllx: "",
-          ywh: "",
-          ywly: "",
-        };
-        if (this.queryForm) {
-          this.$startLoading();
-          searchTaskToDo({
-            ...this.queryForm,
-          }).then((res) => {
-            if (res.code === 200) {
-              let { records } = res.result;
-
-              this.loadBdcdylist(records[0].bsmSlsq, records[0].bestepid);
-              this.$endLoading();
-            }
-          });
-        }
-      },
-
-      // 获取不动产信息
-      /**
-       * @description: 获取不动产信息
-       * @param {*} a
-       * @param {*} b
-       * @author: renchao
+       * @description: getBdcdyh
+       * @author: miaofang
+       * 点击不动产单元号事件
        */
        */
-      loadBdcdylist (a, b) {
-        var formdata = new FormData();
-        formdata.append("bsmSlsq", a);
-        formdata.append("bestepid", b);
-        leftMenu(formdata).then((res) => {
-          if (res.code === 200) {
-            if (res.result) {
-              this.currentSelectProps = res.result[0];
-              this.loadData(this.currentSelectProps.bdcdyh);
-            }
-          }
-        });
-      },
-
-      /**
-      * @description: getBdcdyh
-      * @author: miaofang
-      * 点击不动产单元号事件
-      */
       getBdcdyh (val) {
       getBdcdyh (val) {
         this.addloadData(val);
         this.addloadData(val);
       },
       },
@@ -179,7 +216,7 @@
               let index = this.sfqdata.findIndex((item) => {
               let index = this.sfqdata.findIndex((item) => {
                 return item.bdcdyid == val.bdcdyid;
                 return item.bdcdyid == val.bdcdyid;
               });
               });
-              this.activeName = index
+              this.activeName = index;
             } else {
             } else {
               this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
               this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
               this.activeName = this.sfqdata.length - 1;
               this.activeName = this.sfqdata.length - 1;
@@ -198,18 +235,15 @@
        * @author: renchao
        * @author: renchao
        */
        */
       loadData (val) {
       loadData (val) {
-        getBdcqljqtsx({
-          bdcdyid: this.currentSelectProps.bdcdyid,
+        getBdcqljqtsxBdcdyh({
           bdcdyh: val,
           bdcdyh: val,
         }).then((res) => {
         }).then((res) => {
           if (res.code === 200) {
           if (res.code === 200) {
             this.treedata = loadTreeData(val);
             this.treedata = loadTreeData(val);
-            this.sfqdata.push(
-              loadsfqData(res.result, val, this.currentSelectProps.bdcdyid)
-            );
+            this.sfqdata.push(loadsfqData(res.result, val, res.result.bdcdyid));
             this.$nextTick(function () {
             this.$nextTick(function () {
               this.defaultNode = getNode(
               this.defaultNode = getNode(
-                this.currentSelectProps.qllx,
+                res.result.ztqllx,
                 { linShi: 0, xianShi: 0, liShi: 0 },
                 { linShi: 0, xianShi: 0, liShi: 0 },
                 res.result.bdcdylx || ""
                 res.result.bdcdylx || ""
               );
               );
@@ -218,64 +252,49 @@
                   this.loadComponent(item.form);
                   this.loadComponent(item.form);
                   this.isActive = index;
                   this.isActive = index;
                 }
                 }
-              })
-              // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
-              // this.loadComponent(this.defaultNode.form);
-
-              // this.setstyle(0, 0, this.iskey);
-
-              // this.setstyle(0, 0, this.iskey);
-            });
+              });
+              this.currentSelectProps = {
+                bdcdyid: res.result.bdcdyid,
+                bdcdyh: val,
+                qllx: res.result.qllx,
+                bsmQlxx: this.currentSelectProps.bsmQlxx,
+              };
+            })
           }
           }
-        });
-        this.currentSelectProps = {
-          bdcdyid: this.currentSelectProps.bdcdyid,
-          bdcdyh: this.currentSelectProps.bdcdyh,
-          qllx: this.currentSelectProps.qllx,
-          bsmQlxx: this.currentSelectProps.bsmQlxx,
-        };
+        })
       },
       },
-      /*
-          点击登记簿菜单
-         */
+      /**
+       * @description: 点击登记簿菜单
+       * @param {*} data
+       * @author: renchao
+       */
       handleNodeClick (data) {
       handleNodeClick (data) {
         this.loadComponent(data.form);
         this.loadComponent(data.form);
       },
       },
-    /*
-        点击登记簿菜单
-       */
-    /**
-     * @description: 点击登记簿菜单
-     * @param {*} data
+      tap (data, index) {
+        this.loadComponent(data.form);
+      },
+      /**
+      * @description: taplist
+      * @param {*} data
+      * @author: renchao
+      * 新增列表功能
+      */
+      taplist (data, index) {
+        this.loadComponent(data.form);
+        this.isActive = index;
+      },
+      /**
+     * @description: loadComponent
+     * @param {*} form
      * @author: renchao
      * @author: renchao
      */
      */
-    handleNodeClick (data) {
-      this.loadComponent(data.form);
-    },
-    tap (data, index) {
-      this.loadComponent(data.form);
-    },
-    /**
-    * @description: taplist
-    * @param {*} data
-    * @author: renchao
-    * 新增列表功能
-    */
-    taplist (data, index) {
-      this.loadComponent(data.form);
-      this.isActive = index;
-    },
-    /**
-   * @description: loadComponent
-   * @param {*} form
-   * @author: renchao
-   */
-    loadComponent (form) {
-      this.componentTag = (r) =>
-        require.ensure([], () => r(require("@/views/registerBook/" + form)));
-    }
+      loadComponent (form) {
+        this.componentTag = (r) =>
+          require.ensure([], () => r(require("@/views/registerBook/" + form)));
+      }
     }
     }
-  };
+  }
 </script>
 </script>
 <style scoped lang="scss">
 <style scoped lang="scss">
   /deep/.rollTable {
   /deep/.rollTable {
@@ -315,8 +334,6 @@
     height: 45px;
     height: 45px;
   }
   }
 
 
-
-
   /deep/.el-tree-node {
   /deep/.el-tree-node {
     white-space: pre-wrap;
     white-space: pre-wrap;
   }
   }
@@ -341,6 +358,9 @@
         display: inline-block;
         display: inline-block;
         line-height: 15px;
         line-height: 15px;
       }
       }
+      height: 45px;
+      border: 1px solid rgb(228, 228, 228);
+      border-right: 4px solid #f5f5f5;
     }
     }
     height: 45px;
     height: 45px;
     display: inline-block;
     display: inline-block;

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-10-10 09:11:05
+ * @LastEditTime: 2023-11-14 14:50:46
 -->
 -->
 <template>
 <template>
   <div class="djbfm">
   <div class="djbfm">
@@ -75,7 +75,7 @@
 <style lang="scss" scoped>
 <style lang="scss" scoped>
   .djbfm {
   .djbfm {
     width: 100%;
     width: 100%;
-    height: 80%;
+    height: 100%;
     position: relative;
     position: relative;
     .print {
     .print {
       z-index: 10;
       z-index: 10;

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: miaofang
  * @Autor: miaofang
- * @LastEditTime: 2023-11-02 13:39:22
+ * @LastEditTime: 2024-01-25 15:08:01
 -->
 -->
 <template>
 <template>
   <div class="djxxTable">
   <div class="djxxTable">
@@ -263,7 +263,7 @@
        */
        */
       judge (label) {
       judge (label) {
         if (
         if (
-          "项目名称幢号总层数规划用途用途名称批准用途实际用途房屋结构房屋结构名称建筑面积竣工时间总套数".indexOf(
+          "项目名称幢号自然幢号总层数规划用途用途名称批准用途实际用途房屋结构房屋结构名称建筑面积竣工时间总套数".indexOf(
             label
             label
           ) > -1
           ) > -1
         ) {
         ) {
@@ -301,20 +301,25 @@
       },
       },
       // 选择业务号
       // 选择业务号
       handleSelectYwh (row, ywh) {
       handleSelectYwh (row, ywh) {
+        let that = this
         let sjlx = row.sjlx,
         let sjlx = row.sjlx,
           bsmQlxx = row.bsmQlxx
           bsmQlxx = row.bsmQlxx
-        if (sjlx == '系统数据') {
+        if (['系统数据', '存量数据'].includes(sjlx)) {
           getXtParamsByYwh(ywh).then(res => {
           getXtParamsByYwh(ywh).then(res => {
             let data = res.result
             let data = res.result
-            const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
-            window.open(href, `urlname${new Date().getTime()}`)
+            that.$popup('材料信息', 'registerBook/components/clxx/index', {
+              width: '70%',
+              formData: { ...data, sjlx: 1, bsmSldy: row.bsmSldy }
+            })
+            // const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
+            // window.open(href, `urlname${new Date().getTime()}`)
           })
           })
         } else {
         } else {
           getBlParamsByYwh(ywh, bsmQlxx).then(res => {
           getBlParamsByYwh(ywh, bsmQlxx).then(res => {
             let data = res.result
             let data = res.result
             this.$popup('材料信息', 'registerBook/components/clxx/index', {
             this.$popup('材料信息', 'registerBook/components/clxx/index', {
-              width: '60%',
-              formData: data
+              width: '70%',
+              formData: { ...data, sjlx: 2 }
             })
             })
           })
           })
         }
         }

 <!--
 <!--
  * @Description:
  * @Description:
  * @Autor: miaofang
  * @Autor: miaofang
- * @LastEditTime: 2023-10-30 10:40:48
+ * @LastEditTime: 2023-12-20 17:20:23
 -->
 -->
 <template>
 <template>
   <div class="djxxTable">
   <div class="djxxTable">

@@ -80,7 +80,7 @@ class data extends filter {
         {
         {
           prop: "qlrzjhm",
           prop: "qlrzjhm",
           label: "证件号",
           label: "证件号",
-        },       
+        },
         {
         {
           prop: "ytmc",
           prop: "ytmc",
           label: "土地用途",
           label: "土地用途",
@@ -192,7 +192,7 @@ class data extends filter {
           label: "证件号",
           label: "证件号",
         },
         },
         {
         {
-          prop: "mjmc",
+          prop: "qlmjmc",
           label: "使用权面积",
           label: "使用权面积",
         },
         },
         {
         {
@@ -200,21 +200,13 @@ class data extends filter {
           label: "权利性质",
           label: "权利性质",
         },
         },
         {
         {
-          prop: "ytmc",
+          prop: "qlytmc",
           label: "土地用途",
           label: "土地用途",
         },
         },
         {
         {
           prop: "syqqzsj",
           prop: "syqqzsj",
           label: "使用权起止时间",
           label: "使用权起止时间",
         },
         },
-        // {
-        //   prop: "syqjssj",
-        //   label: "使用权结束时间",
-        // },
-        // {
-        //   prop: "tdsyqx",
-        //   label: "土地使用期限",
-        // },
         {
         {
           prop: "tdsyqx",
           prop: "tdsyqx",
           label: "土地使用期限",
           label: "土地使用期限",
@@ -337,7 +329,10 @@ class data extends filter {
           prop: "zh",
           prop: "zh",
           label: "幢号",
           label: "幢号",
         },
         },
-
+        {
+          prop: "zrzh",
+          label: "自然幢号",
+        },
         {
         {
           prop: "zcs",
           prop: "zcs",
           label: "总层数",
           label: "总层数",
@@ -357,20 +352,20 @@ class data extends filter {
         {
         {
           prop: "sjyt",
           prop: "sjyt",
           label: "实际用途",
           label: "实际用途",
-        },{
+        }, {
           prop: "fwjg",
           prop: "fwjg",
           label: "房屋结构",
           label: "房屋结构",
-        },{
+        }, {
           prop: "fwjgmc",
           prop: "fwjgmc",
           label: "房屋结构名称",
           label: "房屋结构名称",
-        },{
+        }, {
           prop: "jzmj",
           prop: "jzmj",
           label: "建筑面积",
           label: "建筑面积",
         },
         },
         {
         {
           prop: "jgsj",
           prop: "jgsj",
           label: "竣工时间",
           label: "竣工时间",
-        },{
+        }, {
           prop: "zts",
           prop: "zts",
           label: "总套数",
           label: "总套数",
         },
         },
@@ -471,7 +466,7 @@ class data extends filter {
         {
         {
           prop: "tdsyqzsj",
           prop: "tdsyqzsj",
           label: "使用权起止时间",
           label: "使用权起止时间",
-        },        
+        },
         {
         {
           prop: "qdjgmc",
           prop: "qdjgmc",
           label: "房地产交易价格",
           label: "房地产交易价格",
@@ -679,13 +674,13 @@ class data extends filter {
           render: (h, scope) => {
           render: (h, scope) => {
             return (
             return (
               <div>
               <div>
-              <span v-show={scope.row.dybdclx == '1'}>土地</span>
-              <span v-show={scope.row.dybdclx == '2'}>土地和房屋</span>
-              <span v-show={scope.row.dybdclx == '3'}>林地和林木</span>
-              <span v-show={scope.row.dybdclx == '4'}>土地和在建建筑物</span>
-              <span v-show={scope.row.dybdclx == '5'}>海域</span>
-              <span v-show={scope.row.dybdclx == '6'}>海域和构筑物</span>
-              <span v-show={scope.row.dybdclx == '7'}>其它</span>
+                <span v-show={scope.row.dybdclx == '1'}>土地</span>
+                <span v-show={scope.row.dybdclx == '2'}>土地和房屋</span>
+                <span v-show={scope.row.dybdclx == '3'}>林地和林木</span>
+                <span v-show={scope.row.dybdclx == '4'}>土地和在建建筑物</span>
+                <span v-show={scope.row.dybdclx == '5'}>海域</span>
+                <span v-show={scope.row.dybdclx == '6'}>海域和构筑物</span>
+                <span v-show={scope.row.dybdclx == '7'}>其它</span>
               </div>
               </div>
             )
             )
           }
           }
@@ -713,11 +708,7 @@ class data extends filter {
         {
         {
           prop: "zl",
           prop: "zl",
           label: "在建建筑物坐落",
           label: "在建建筑物坐落",
-        },
-        {
-          prop: "dyfsmc",
-          label: "抵押方式",
-        },
+        },        
         {
         {
           prop: "qlrmc",
           prop: "qlrmc",
           label: "抵押权人",
           label: "抵押权人",
@@ -731,7 +722,7 @@ class data extends filter {
           label: "抵押权人证件号",
           label: "抵押权人证件号",
         },
         },
         {
         {
-          prop: "dyrlx",
+          prop: "ywrlx",
           label: "抵押人类型",
           label: "抵押人类型",
         },
         },
         {
         {
@@ -760,10 +751,18 @@ class data extends filter {
           label: "抵押面积",
           label: "抵押面积",
         },
         },
         {
         {
+          prop: "dyfsmc",
+          label: "抵押方式",
+        },
+        {
           prop: "bdbzzqse",
           prop: "bdbzzqse",
           label: "被担保主债权数额",
           label: "被担保主债权数额",
         },
         },
         {
         {
+          prop: "zgzqse",
+          label: "最高债权额",
+        },
+        {
           prop: "dbfw",
           prop: "dbfw",
           label: "担保范围",
           label: "担保范围",
         },
         },
@@ -780,7 +779,7 @@ class data extends filter {
           label: "债务履行期限(债务确定期间)",
           label: "债务履行期限(债务确定期间)",
         },
         },
         {
         {
-          prop: "zgzqqdsshse",
+          prop: "zgzqqdss",
           label: "最高债权确定事实和数额",
           label: "最高债权确定事实和数额",
         },
         },
         {
         {
@@ -995,7 +994,7 @@ class data extends filter {
         {
         {
           prop: "ytmc",
           prop: "ytmc",
           label: "房屋用途",
           label: "房屋用途",
-        },        
+        },
         {
         {
           prop: "szc",
           prop: "szc",
           label: "所在层",
           label: "所在层",
@@ -1019,7 +1018,19 @@ class data extends filter {
         {
         {
           prop: "qdjg",
           prop: "qdjg",
           label: "取得价格/被担保主债权数额",
           label: "取得价格/被担保主债权数额",
-        },        
+        },
+        {
+          prop: "zwlxqssj",
+          label: "债务履行起始时间",
+        },
+        {
+          prop: "zwlxjssj",
+          label: "债务履行结束时间",
+        },
+        {
+          prop: "dyqx",
+          label: "债务履行期限",
+        },
         {
         {
           prop: "dbfw",
           prop: "dbfw",
           label: "担保范围",
           label: "担保范围",
@@ -1286,7 +1297,7 @@ class data extends filter {
         {
         {
           prop: "gyqk",
           prop: "gyqk",
           label: "共有情况",
           label: "共有情况",
-        },       
+        },
         {
         {
           prop: "sllmsyq1",
           prop: "sllmsyq1",
           label: "森林林木所有权人",
           label: "森林林木所有权人",
@@ -1368,6 +1379,10 @@ class data extends filter {
           label: "小地名",
           label: "小地名",
         },
         },
         {
         {
+          prop: "bdcqzh",
+          label: "不动产权证号",
+        },
+        {
           prop: "djjg",
           prop: "djjg",
           label: "登记机构",
           label: "登记机构",
         },
         },