Merge branch 'dev'

@@ -210,9 +210,14 @@ aside {
 .ellipsis-line {
   display: inline-block;
   width: 300px !important;
+  word-break: break-all;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  /* 这里是超出几行省略 */
   overflow: hidden;
-  text-overflow: ellipsis; //文本溢出显示省略号
-  white-space: nowrap; //文本不会换行
+  margin: 0 auto;
 }
 
 .tooltip-width {

@@ -40,7 +40,7 @@
   }
 
   .menu-con {
-    width: 87%;
+    width: 93%;
   }
 
   .batchDel {
@@ -55,8 +55,10 @@
 
   .title-detail {
     display: flex;
-    flex-wrap: wrap;
     width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis; //文本溢出显示省略号
+    white-space: nowrap; //文本不会换行
   }
 
   .title-batch {
@@ -209,7 +211,8 @@
       box-sizing: border-box;
       width: 70px;
       margin: 0 5px;
-      .icon{
+
+      .icon {
         font-size: 10px;
       }
     }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 09:52:13
+ * @LastEditTime: 2023-08-25 17:06:44
 -->
 <template>
   <div class="djxxTable">
@@ -50,11 +50,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
-              <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
                 </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
+
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

@@ -58,13 +58,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
+
+              <p v-if="!['djyy','fj'].includes(item.prop)">
                 <span v-if="item.prop == 'qszt'">
                   {{ getQsztName(row[item.prop]) }}
                 </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-23 15:54:23
+ * @LastEditTime: 2023-08-25 17:12:43
 -->
 <template>
   <div class="djxxTable">
@@ -52,13 +52,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
+
+              <p v-if="!['djyy','fj'].includes(item.prop)">
                 <span v-if="item.prop == 'qszt'">
                   {{ getQsztName(row[item.prop]) }}
                 </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

@@ -52,7 +52,9 @@
                 </span>
               </el-tooltip>
 
-              <span v-if="(item.prop !== 'qszt' && item.prop !== 'djyy'&& item.prop !== 'fj') && !judge(item.label)"> {{ row[item.prop] }}</span>
+              <span v-if="(item.prop !== 'qszt' && item.prop !== 'djyy'&& item.prop !== 'fj') && !judge(item.label)">
+                {{ row[item.prop] }}
+              </span>
               <div class="many" v-if="judge(item.label)">
                 <div v-for="(label, index) in row.djQlxxFdcqxmDoList" :key="index">
                   {{ label[item.prop] }}

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-24 16:14:57
+ * @LastEditTime: 2023-08-25 17:17:06
 -->
 <template>
   <div class="djxxTable">
@@ -58,13 +58,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
+
+              <p v-if="!['djyy','fj'].includes(item.prop)">
                 <span v-if="item.prop == 'qszt'">
                   {{ getQsztName(row[item.prop]) }}
                 </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

@@ -47,13 +47,13 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
+
+              <p v-if="!['djyy','fj'].includes(item.prop)">
                 <span v-if="item.prop == 'qszt'">
                   {{ getQsztName(row[item.prop]) }}
                 </span>
-
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-16 11:29:20
+ * @LastEditTime: 2023-08-25 17:16:32
 -->
 <template>
   <div class="djxxTable">
@@ -13,8 +13,7 @@
             <el-checkbox
               v-for="item in qsztList"
               :key="item.value"
-              :label="item.value"
-            >{{ item.label }}</el-checkbox>
+              :label="item.value">{{ item.label }}</el-checkbox>
           </el-checkbox-group>
         </div>
       </div>
@@ -35,8 +34,7 @@
                 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
                 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
                 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
-              ]"
-            >
+              ]">
               <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
@@ -45,9 +43,19 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">正在补录</div>
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">正在申请</div>
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">正在注销</div>
-              <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
 
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
                 <span v-else>{{ row[item.prop] }}</span>
+              </p>
+              <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
+                <span class="ellipsis-line">
+                  {{ row[item.prop] }}
+                </span>
+              </el-tooltip>
+
             </td>
             <td v-for="count in emptycolNum" :key="~count"></td>
           </tr>
@@ -58,11 +66,11 @@
 </template>
   
 <script>
-import { datas } from "./qlxxFormData.js";
-import { getSjlx, getDictLeabel } from "@/utils/dictionary.js";
-import { getLqList } from "@/api/djbDetail.js";
-export default {
-  data() {
+  import { datas } from "./qlxxFormData.js";
+  import { getSjlx, getDictLeabel } from "@/utils/dictionary.js";
+  import { getLqList } from "@/api/djbDetail.js";
+  export default {
+    data () {
       return {
         title: "林权登记信息",
         qsztList: datas.columns().qsztList,
@@ -77,7 +85,7 @@ export default {
         columns: datas.columns().LDSYQ,
       };
     },
-  created() {
+    created () {
       this.loadData();
     },
     methods: {
@@ -85,7 +93,7 @@ export default {
        * @description: loadData
        * @author: renchao
        */
-    loadData() {
+      loadData () {
         if (this.$parent.addRepairRecord) {
           this.columns.unshift({
             prop: "cz",
@@ -118,7 +126,7 @@ export default {
        * @description: checkChange
        * @author: renchao
        */
-    checkChange() {
+      checkChange () {
         if (this.checkList.length === 0) {
           this.tableData = [];
           this.emptycolNum = datas.columns().emptycolNum;
@@ -131,7 +139,7 @@ export default {
        * @param {*} code
        * @author: renchao
        */
-    getQsztName(code) {
+      getQsztName (code) {
         let name = "";
         for (let item of this.qsztList) {
           if (item.value == code) {
@@ -148,7 +156,7 @@ export default {
        * @param {*} del
        * @author: renchao
        */
-    editDialog(row, del) {
+      editDialog (row, del) {
         this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -170,10 +178,10 @@ export default {
           });
       },
     },
-};
+  };
 </script>
   
   <style lang="scss" scoped>
-@import "./qlxxCommon.scss";
+  @import "./qlxxCommon.scss";
 </style>
   
\ No newline at end of file

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-24 16:15:05
+ * @LastEditTime: 2023-08-25 17:19:17
 -->
 <template>
   <div class="djxxTable">
@@ -47,13 +47,13 @@
               <div class="icon" v-if="row.qlzt == '4'">
                 正在注销
               </div>
+
+              <p v-if="!['djyy','fj'].includes(item.prop)">
                 <span v-if="item.prop == 'qszt'">
                   {{ getQsztName(row[item.prop]) }}
                 </span>
-
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
 
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
@@ -93,13 +93,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
+
+              <p v-if="!['djyy','fj'].includes(item.prop)">
                 <span v-if="item.prop == 'qszt'">
                   {{ getQsztName(row[item.prop]) }}
                 </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

@@ -23,8 +23,7 @@
             <el-checkbox
               v-for="item in qsztList"
               :key="item.value"
-              :label="item.value"
-            >{{ item.label }}</el-checkbox>
+              :label="item.value">{{ item.label }}</el-checkbox>
           </el-checkbox-group>
         </div>
       </div>
@@ -45,8 +44,7 @@
                 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
                 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
                 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
-              ]"
-            >
+              ]">
               <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
                 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
@@ -55,9 +53,23 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">正在补录</div>
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">正在申请</div>
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">正在注销</div>
-              <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
 
+              <!-- <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
+              <span v-else>{{ row[item.prop] }}</span> -->
+
+              <p v-if="!['djyy','fj'].includes(item.prop)">
+                <span v-if="item.prop == 'qszt'">
+                  {{ getQsztName(row[item.prop]) }}
+                </span>
                 <span v-else>{{ row[item.prop] }}</span>
+              </p>
+
+              <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
+                <span class="ellipsis-line">
+                  {{ row[item.prop] }}
+                </span>
+              </el-tooltip>
+
             </td>
             <td v-for="count in emptycolNum" :key="~count"></td>
           </tr>
@@ -68,11 +80,11 @@
 </template>
   
 <script>
-import { datas } from "./qlxxFormData.js";
-import { getSjlx } from "@/utils/dictionary.js";
-import { getLqList } from "@/api/djbDetail.js";
-export default {
-  data() {
+  import { datas } from "./qlxxFormData.js";
+  import { getSjlx } from "@/utils/dictionary.js";
+  import { getLqList } from "@/api/djbDetail.js";
+  export default {
+    data () {
       return {
         title: "林权登记信息",
         qsztList: datas.columns().qsztList,
@@ -87,7 +99,7 @@ export default {
         columns: datas.columns().LDSYQ,
       };
     },
-  created() {
+    created () {
       this.loadData();
     },
     methods: {
@@ -95,7 +107,7 @@ export default {
        * @description: loadData
        * @author: renchao
        */
-    loadData() {
+      loadData () {
         if (this.$parent.addRepairRecord) {
           this.columns.unshift({
             prop: "cz",
@@ -125,7 +137,7 @@ export default {
        * @description: checkChange
        * @author: renchao
        */
-    checkChange() {
+      checkChange () {
         if (this.checkList.length === 0) {
           this.tableData = [];
           this.emptycolNum = datas.columns().emptycolNum;
@@ -138,7 +150,7 @@ export default {
        * @param {*} code
        * @author: renchao
        */
-    getQsztName(code) {
+      getQsztName (code) {
         let name = "";
         for (let item of this.qsztList) {
           if (item.value == code) {
@@ -155,7 +167,7 @@ export default {
        * @param {*} del
        * @author: renchao
        */
-    editDialog(row, del) {
+      editDialog (row, del) {
         this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -177,10 +189,10 @@ export default {
           });
       },
     },
-};
+  };
 </script>
   
   <style lang="scss" scoped>
-@import "./qlxxCommon.scss";
+  @import "./qlxxCommon.scss";
 </style>
   
\ No newline at end of file

@@ -47,13 +47,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
+
+              <p v-if="!['djyy','fj'].includes(item.prop)">
                 <span v-if="item.prop == 'qszt'">
                   {{ getQsztName(row[item.prop]) }}
                 </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-24 16:15:42
+ * @LastEditTime: 2023-08-25 17:14:29
 -->
 <template>
   <div class="djxxTable">
@@ -46,13 +46,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
+
+              <p v-if="!['djyy','fj'].includes(item.prop)">
                 <span v-if="item.prop == 'qszt'">
                   {{ getQsztName(row[item.prop]) }}
                 </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

@@ -46,13 +46,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
+
+              <p v-if="!['djyy','fj'].includes(item.prop)">
                 <span v-if="item.prop == 'qszt'">
                   {{ getQsztName(row[item.prop]) }}
                 </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-25 16:39:06
+ * @LastEditTime: 2023-08-25 17:35:22
 -->
 <template>
   <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
@@ -184,7 +184,7 @@
             setTimeout(() => {
               that.ruleForm.tmpcontent = document.getElementById("S1").value;
               if (that.ruleForm.tmpno == 'zsdy') {
-                LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='http://192.168.2.38:9000/bdcdj/zhengshu_image/bdcqzs2.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=KRMCXFVDPWMN0919UI1J%2F20230825%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20230825T080608Z&X-Amz-Expires=604800&X-Amz-Security-Token=eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJhY2Nlc3NLZXkiOiJLUk1DWEZWRFBXTU4wOTE5VUkxSiIsImV4cCI6MTY5Mjk1NDI1NiwicGFyZW50IjoibWluaW9hZG1pbiJ9.OOHyJOL0zk9n3pSdWC-uIMztKL2wwHM0DsFJr1sjhxTMlbSVnCWluQpf94D4fEq35c0Us2Mi7KKINDnojwox6A&X-Amz-SignedHeaders=host&versionId=null&X-Amz-Signature=67b9cea9b1e1386e3ec826ddd1e33e514715aabbb671be991df72f5e47b20c45'>");
+                LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='http://192.168.2.38:9000/bdcdj/zhengshu_image/bdcqzs2.jpg'>");
                 LODOP.SET_SHOW_MODE("BKIMG_PRINT", 1);//打印包含背景图	
                 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4");
               }

 <!--
  * @Description: workFrame左侧菜单列表-普通
  * @Autor: renchao
- * @LastEditTime: 2023-07-25 14:55:49
+ * @LastEditTime: 2023-08-28 08:44:31
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -20,7 +20,9 @@
           <p class="dot" v-if="item.issave == '0'"></p>
           <div class="menu-con">
             <p>{{ item.bdcdyh }}</p>
+            <el-tooltip effect="dark" :content="item.zl" placement="top">
               <p class="title-detail">{{ item.zl }}</p>
+            </el-tooltip>
           </div>
           <i class="el-icon-delete" v-if="unitData.length > 1" @click.stop="handleDel(item)"></i>
         </el-menu-item>

 <!--
  * @Description: workFrame左侧菜单列表-分割
  * @Autor: renchao
- * @LastEditTime: 2023-07-25 14:52:40
+ * @LastEditTime: 2023-08-28 08:46:04
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -19,7 +19,9 @@
         <el-menu-item v-for="(item, index) in aroundUnitData" :index="index.toString()" :key="index">
           <div>
             <p>{{ item.bdcdyh }}</p>
+            <el-tooltip effect="dark" :content="item.zl" placement="top">
               <p class="title-detail">{{ item.zl }}</p>
+            </el-tooltip>
           </div>
           <i class="el-icon-delete" v-if="aroundUnitData.length > 1" @click.stop="handleDel(item)"></i>
         </el-menu-item>
@@ -33,7 +35,9 @@
           <span class="dot" v-if="item.issave == '0'"></span>
           <div>
             <p>{{ item.bdcdyh }}</p>
+            <el-tooltip effect="dark" :content="item.zl" placement="top">
               <p class="title-detail">{{ item.zl }}</p>
+            </el-tooltip>
           </div>
           <i class="el-icon-delete" v-if="afterUnitData.length > 1" @click.stop="handleDel(item)"></i>
         </el-menu-item>

@@ -40,7 +40,7 @@
   }
 
   .menu-con {
-    width: 87%;
+    width: 93%;
   }
 
   .batchDel {
@@ -54,8 +54,10 @@
   }
 
   .title-detail {
-    word-wrap: break-word;
     width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis; //文本溢出显示省略号
+    white-space: nowrap; //文本不会换行
   }
 
   .title-batch {
@@ -208,7 +210,8 @@
       box-sizing: border-box;
       width: 70px;
       margin: 0 5px;
-      .icon{
+
+      .icon {
         font-size: 10px;
       }
     }

@@ -46,13 +46,14 @@
               <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
                 正在注销
               </div>
+
+              <p v-if="!['djyy','fj'].includes(item.prop)">
                 <span v-if="item.prop == 'qszt'">
                   {{ getQsztName(row[item.prop]) }}
                 </span>
+                <span v-else>{{ row[item.prop] }}</span>
+              </p>
 
-              <span v-if="!['djyy','fj'].includes(item.prop)">
-                {{ row[item.prop] }}
-              </span>
               <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
                 <span class="ellipsis-line">
                   {{ row[item.prop] }}