task 46154 产业一张图地图弹窗

src/views/industry/main-gis/index.js

@@ -141,23 +141,23 @@ export default {
   computed: {
   },
   created () {
-    this.getDicts("three_asset_type").then((response) => {
-      this.threeAssetTypeOptions = response.data;
+    this.getDicts("industry_rights_type").then(response => {
+      this.industryRightsOptions = response.data;
     });
-    this.getDicts("three_jtzyzc_type").then((response) => {
-      this.threeJtzyzcTypeOptions = response.data;
+    this.getDicts("purpose_type").then(response => {
+      this.industryTypeOptions = response.data;
     });
-    this.getDicts("three_nysssb_type").then((response) => {
-      this.threeNysssbTypeOptions = response.data;
+    this.getDicts("sys_yes_no").then(response => {
+      this.occupyLandOptions = response.data;
     });
-    this.getDicts("three_nh_type").then((response) => {
-      this.threeNhTypeOptions = response.data;
+    this.getDicts("occupy_land_type").then(response => {
+      this.occupyLandTypeOptions = response.data;
     });
-    this.getDicts("nature_ownership").then((response) => {
-      this.natureOwnershipTypeOptions = response.data;
+    this.getDicts("land_source").then(response => {
+      this.landSourceOptions = response.data;
     });
-    this.getDicts("sys_yes_no").then((response) => {
-      this.sysYesNoOptions = response.data;
+    this.getDicts("sys_yes_no").then(response => {
+      this.isLoanOptions = response.data;
     });
     this.getGeoServerUrl();
   },
@@ -356,21 +356,12 @@ export default {
               duration: 1000, // 缩放持续时间，默认不需要设置
             });
           } else {
-
-
-            feature.values_.detail.threeDetailType =
-                feature.values_.detail.threeAssetType == '1' ?
-                this.selectDictLabel(this.threeJtzyzcTypeOptions, feature.values_.detail.threeDetailType):
-                feature.values_.detail.threeAssetType == '2' ?
-                this.selectDictLabel(this.threeNysssbTypeOptions, feature.values_.detail.threeDetailType):
-                feature.values_.detail.threeAssetType == '3' ?
-                this.selectDictLabel(this.threeNhTypeOptions, feature.values_.detail.threeDetailType):''
-            ;
-            feature.values_.detail.threeAssetType = this.selectDictLabel(this.threeAssetTypeOptions, feature.values_.detail.threeAssetType);
-            feature.values_.detail.natureOwnership = this.selectDictLabel(this.natureOwnershipTypeOptions, feature.values_.detail.natureOwnership);
-            feature.values_.detail.qssfczzy = this.selectDictLabel(this.sysYesNoOptions, feature.values_.detail.qssfczzy);
-            feature.values_.detail.sfwtdg = this.selectDictLabel(this.sysYesNoOptions, feature.values_.detail.sfwtdg);
-            feature.values_.detail.sfnzcsy = this.selectDictLabel(this.sysYesNoOptions, feature.values_.detail.sfnzcsy);
+            feature.values_.detail.industryRightsText = this.selectDictLabel(this.industryRightsOptions, feature.values_.detail.industryRights);
+            feature.values_.detail.industryTypeText = this.selectDictLabel(this.industryTypeOptions, feature.values_.detail.industryType);
+            feature.values_.detail.occupyLandText = this.selectDictLabel(this.occupyLandOptions, feature.values_.detail.occupyLand);
+            feature.values_.detail.occupyLandTypeText = this.selectDictLabel(this.occupyLandTypeOptions, feature.values_.detail.occupyLandType);
+            feature.values_.detail.landSourceText = this.selectDictLabel(this.landSourceOptions, feature.values_.detail.landSource);
+            feature.values_.detail.isLoanText = this.selectDictLabel(this.isLoanOptions, feature.values_.detail.isLoan);
 
             this.listDialogHidden('detail');
             this.openResourceDialog(feature.values_.detail);
@@ -440,7 +431,7 @@ export default {
       console.log(data)
       let parmasData = {
         tableId: data.id,
-        tableName: 't_asset_three',
+        tableName: 't_asset_industry',
         bizPath: 'asset',
       };
       attachmentQuery(parmasData).then((res) => {

src/views/industry/popover/index.html

@@ -1,80 +1,62 @@
 <div class="popover_main">
-  <h1><i></i>{{data.zcmc}}<span @click="closePopover">×</span></h1>
+  <h1><i></i>{{data.industryName}}<span @click="closePopover">×</span></h1>
   <div>
-    <p>资产编码</p>
-    <p>{{data.zcdm}}</p>
-    <p>资产名称</p>
-    <p>{{data.zcmc}}</p>
+    <p>产业编码</p>
+    <p>{{data.industryCode}}</p>
+    <p>产业名称</p>
+    <p>{{data.industryName}}</p>
   </div>
   <div>
-    <p>三清类型</p>
-    <p>{{data.threeAssetType}}</p>
-    <p>资产类型</p>
-    <p>{{data.threeDetailType}}</p>
+    <p>产业权属</p>
+    <p>{{data.industryRightsText}}</p>
+    <p>产业类型</p>
+    <p>{{data.industryTypeText}}</p>
   </div>
   <div>
-    <p>用地面积(亩)</p>
-    <p>{{data.ydmj}}</p>
-    <p>建筑面积(㎡)</p>
-    <p>{{data.jzmj}}</p>
+    <p>其他产业</p>
+    <p>{{data.industryTypeOther}}</p>
+    <p>主要产品</p>
+    <p>{{data.productName}}</p>
   </div>
   <div>
-    <p>所在组</p>
-    <p>{{data.szz}}</p>
-    <p>权属性质</p>
-    <p>{{data.natureOwnership}}</p>
+    <p>占用土地</p>
+    <p>{{data.occupyLandText}}</p>
+    <p>占地面积(亩)</p>
+    <p>{{data.occupyLandArea}}</p>
   </div>
   <div>
-    <p>权属是否存在争议</p>
-    <p>{{data.qssfczzy}}</p>
-    <p>权属主体</p>
-    <p>{{data.qszt}}</p>
+    <p>占用类型</p>
+    <p>{{data.occupyLandTypeText}}</p>
+    <p>其他占用</p>
+    <p>{{data.occupyLandTypeOther}}</p>
   </div>
   <div>
-    <p>是否委托代管</p>
-    <p>{{data.sfwtdg}}</p>
-    <p>联系电话</p>
-    <p>{{data.lxdh}}</p>
+    <p>土地来源</p>
+    <p>{{data.landSourceText}}</p>
+    <p>其他来源</p>
+    <p>{{data.landSourceOther}}</p>
   </div>
   <div>
-    <p>23年盘活方式</p>
-    <p>{{data.phfs23}}</p>
-    <p>23年效益(万元)</p>
-    <p>{{data.xy23}}</p>
+    <p>产业投资金额(万)</p>
+    <p>{{data.investmentAmount}}</p>
+    <p>产业估值(万)</p>
+    <p>{{data.industryValuation}}</p>
   </div>
   <div>
-    <p>24年盘活方式</p>
-    <p>{{data.phfs24}}</p>
-    <p>24年效益(万元)</p>
-    <p>{{data.xy24}}</p>
+    <p>年销售额(万)</p>
+    <p>{{data.yearSaleAmount}}</p>
+    <p>年利润(万)</p>
+    <p>{{data.yearProfitAmount}}</p>
   </div>
   <div>
-    <p>盘活情况</p>
-    <p>{{data.phqk}}</p>
-    <p>资产闲置原因</p>
-    <p>{{data.xzyy}}</p>
-  </div>
-  <div>
-    <p>是否能正常使用</p>
-    <p>{{data.sfnzcsy}}</p>
-    <p>完善后使用</p>
-    <p>{{data.wshsy}}</p>
-  </div>
-  <div>
-    <p>不能使用</p>
-    <p>{{data.bnsy}}</p>
-    <p>盘活措施</p>
-    <p>{{data.phcs}}</p>
-  </div>
-  <div>
-    <p>盘活时限</p>
-    <p>{{data.phsx}}</p>
-    <p>资产统计年度</p>
-    <p>{{data.zctjnd}}</p>
+    <p>有贷款需求</p>
+    <p>{{data.isLoanText}}</p>
+    <p>计划贷款金额(万)</p>
+    <p>{{data.loanAmount}}</p>
   </div>
   <div>
     <p>备注</p>
-    <p style="width: 75%;">{{data.bz}}</p>
+    <p>{{data.industryBz}}</p>
   </div>
   <div style="justify-content: left">
     <p>附件</p>