Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

dsk-operate-ui/src/views/component/export-dialog.vue

@@ -93,7 +93,7 @@ export default {
   },
   methods: {
     handleEXCEL(){
-      if(value <= 2000){
+      if(this.value <= 2000){
         this.loading = true;
       }
       this.$nextTick(() => {

dsk-operate-ui/src/views/detail/groupAccount/component/landtransaction.vue

@@ -25,42 +25,12 @@
       @handle-current-change="handleCurrentChange"
     >
       <template slot="companyName" slot-scope="scope">
-        <el-tooltip v-if="scope.row.Names.length>19" class="item" effect="dark" :content="scope.row.Names" placement="top">
-          <div class="minwid">
-            <div v-if="scope.row.companyId&&scope.row.companyName" class="a-link" @click="getUipIdByCid(scope.row.companyId)" v-html="scope.row.companyName"></div>
-            <div v-else v-html="scope.row.companyName || '--'"></div>
-          </div>
-        </el-tooltip>
-        <div v-else>
-          <div v-if="scope.row.companyId&&scope.row.companyName" class="a-link" @click="getUipIdByCid(scope.row.companyId)" v-html="scope.row.companyName"></div>
-          <div v-else v-html="scope.row.companyName || '--'"></div>
-        </div>
+        <div v-if="scope.row.companyId&&scope.row.companyName" class="a-link" @click="getUipIdByCid(scope.row.companyId)" v-html="scope.row.companyName"></div>
+        <div v-else v-html="scope.row.companyName || '--'"></div>
       </template>
       <template slot="projectName" slot-scope="scope">
-        <el-tooltip v-if="scope.row.projectName.length>19" class="item" effect="dark" :content="scope.row.projectName" placement="top">
-          <div class="minwid">
-            <div v-if="scope.row.id&&scope.row.projectName" class="a-link" @click="getDetail(scope.row.id)" v-html="scope.row.projectName"></div>
-            <div v-else v-html="scope.row.projectName || '--'"></div>
-          </div>
-        </el-tooltip>
-        <div v-else class="minwid">
-          <div class="minwid">
-            <div v-if="scope.row.id&&scope.row.projectName" class="a-link" @click="getDetail(scope.row.id)" v-html="scope.row.projectName"></div>
-            <div v-else v-html="scope.row.projectName || '--'"></div>
-          </div>
-        </div>
-      </template>
-      <template slot="landAddr" slot-scope="scope">
-        <el-tooltip v-if="scope.row.landAddr.length>19" class="item" effect="dark" :content="scope.row.landAddr" placement="top">
-          <div class="minwid">
-            <div>
-            {{scope.row.landAddr || '--'}}
-            </div>
-          </div>
-        </el-tooltip>
-        <div v-else>
-          {{scope.row.landAddr || '--'}}
-        </div>
+        <div v-if="scope.row.id&&scope.row.projectName" class="a-link" @click="getDetail(scope.row.id)" v-html="scope.row.projectName"></div>
+        <div v-else v-html="scope.row.projectName || '--'"></div>
       </template>
       <template slot="stockPercent" slot-scope="scope">
         <div>{{scope.row.stockPercent || '--'}}{{scope.row.stockPercent ?  '%':''}}</div>
@@ -104,7 +74,7 @@
           {label: '出让面积(平方米)', prop: 'acreage',minWidth: '150'},
           {label: '土地用途', prop: 'landUse',minWidth: '120'},
           {label: '供应方式', prop: 'supplyLandWay', minWidth: '100'},
-          {label: '土地坐落', prop: 'landAddr', minWidth: '285',slot:true},
+          {label: '土地坐落', prop: 'landAddr', minWidth: '285'},
           {label: '合同签订日期', prop: 'contractSignTime', minWidth: '120'},
         ],
         formData: [
@@ -251,17 +221,17 @@
           })
           this.queryParams.pageNum = 1
             this.paramsData = {}
+            if(arr.area){
+              let area = []
+              arr.area.forEach(item=>{
+                area.push(item[item.length-1])
+              })
+              this.paramsData.area = area.toString()
+            }
         }else{
             arr = params
           }
         if(arr){
-          if(arr.area){
-            let area = []
-            arr.area.forEach(item=>{
-              area.push(item[item.length-1])
-            })
-            this.paramsData.area = area.toString()
-          }
           this.paramsData.landUse = arr.landUse?arr.landUse.toString():''
           this.paramsData.supplyLandWay = arr.supplyLandWay?arr.supplyLandWay.toString():''
           if (arr.StockPercent) {
@@ -303,10 +273,6 @@
           this.tableLoading = false
           if(res.code === 200){
             this.tableData = res.data.list
-            this.tableData.forEach(item=>{
-              item.Names = item.companyName.replace(new RegExp("<font color='#FF204E'>", 'g'),'');
-              item.Names = item.Names.replace(new RegExp("</font>", 'g'),'');
-            })
             this.tableDataTotal = res.data.total
           }else {
             this.tableData = []