Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/views/ConstructionApplication3D/BenchmarkLandPriceAnalysis/jzdjfxsmInfo.vue

@@ -5,12 +5,12 @@
   >
     <el-row :gutter="10">
       <el-col :span="24">
-        根据2020年《三亚市国有建设用地土地定级与基准地价》和《三亚市集体建设用地土地定级与基准地价》编制成果，实现指定范围内国有建设用地和集体建设用的基准地价预估。
+        基于三亚市控制性详细规划数据和2020年《三亚市国有建设用地土地定级与基准地价》编制成果，实现指定范围内国有建设用地的基准地价预估。
       </el-col>
     </el-row>
     <el-row :gutter="10">
       <el-col :span="24" style="text-align: center">
-        国有建设用地和集体建设用地基准地价内涵说明
+        国有建设用地基准地价内涵说明
       </el-col>
     </el-row>
     <el-row :gutter="10">

src/views/cockpit/gdbh.vue

@@ -136,7 +136,7 @@
             </div>
             <div class="text">
               <p>面积变化</p>
-              <span>{{ (zbpg_hz.jcpg.lrgd - zbpg_hz.jcpg.lcgd).toFixed(2) }}</span>km²
+              <span>{{ mjbh }}</span>km²
 
             </div>
           </div>
@@ -208,6 +208,7 @@ export default {
     return {
       sdata: {},
       tab: 'gdxz',
+      mjbh: null,
       options: [
         { value: "gdxz", label: "耕地现状" },
         { value: "zbph", label: "占补平衡" },
@@ -646,7 +647,7 @@ export default {
       store.setCockpit_vector({
         title: "进出平衡",
         tableData: [],
-        word:"地类编码名称",
+        word: "地类编码名称",
         tablejscType: 'jsc_tdgy_gy_zbmx',
         columns: [
           "进出状态",
@@ -680,9 +681,15 @@ export default {
         id: params ? params.id : '4602',
         val0: store.state.cockpit_date[1].slice(0, 4)
       });
-      this.zbpg_hz.jcpg.lrgd = res.data.lrgd == '暂无' ? 0 : res.data.lrgd
-      this.zbpg_hz.jcpg.lcgd = res.data.lcgd == '暂无' ? 0 : res.data.lcgd
+      this.zbpg_hz.jcpg.lrgd = res.data.lrgd == '暂无' || res.data.lrgd == 0 ? '暂无' : res.data.lrgd
+      this.zbpg_hz.jcpg.lcgd = res.data.lcgd == '暂无' || res.data.lcgd == 0 ? '暂无' : res.data.lcgd
+      if (this.zbpg_hz.jcpg.lrgd == '暂无' || this.zbpg_hz.jcpg.lcgd == '暂无') {
+        this.mjbh = '暂无';
 
+      } else {
+        this.mjbh = (zbpg_hz.jcpg.lrgd - zbpg_hz.jcpg.lcgd).toFixed(2);
+
+      }
       this.zbpg_hz.jcpg.lc_st = res.data.lc_st == '暂无' ? 0 : res.data.lc_st
       this.zbpg_hz.jcpg.lc_hd = res.data.lc_hd == '暂无' ? 0 : res.data.lc_hd
       this.zbpg_hz.jcpg.lc_sjd = res.data.lc_sjd == '暂无' ? 0 : res.data.lc_sjd

src/views/cockpit/tdsy.vue

@@ -230,10 +230,10 @@ export default {
   beforeMount() { }, //生命周期 - 挂载之前
   methods: {
     flyDetails(item) {
-      this.drawWktPloygon(item.geom, "#ff0000", item.id);
+      this.drawWktPloygon(item.geom, "#66b1ff", item.id);
       let arr = [];
       Object.keys(item).forEach((key) => {
-        if (item != "geom" && item != "id") {
+        if ( key != '用地类型') {
           arr.push({
             name: key,
             value: item[key],
@@ -264,8 +264,8 @@ export default {
         .load(geojson, {
           clampToGround: true,
           stroke: Cesium.Color.fromCssColorString(yanse),
-          fill: Cesium.Color.WHITE.withAlpha(0.3), //注意：颜色必须大写，即不能为blue
-          strokeWidth: 5,
+          fill: Cesium.Color.WHITE.withAlpha(0.93), //注意：颜色必须大写，即不能为blue
+          strokeWidth: 2,
           // 恒定高度
           height: 1.1,
           // 是否显示
@@ -1135,6 +1135,8 @@ export default {
       //     columns:["项目名称","土地用途","出让面积(公顷）","土地使用权","土地座落","批准文号","批准机关"],
       //   })
       // }
+      console.log('this.vector_data: ', this.vector_data);
+
       store.setCockpit_vector({
         title: "土地供应完成项目",
         tableData: this.vector_data,
@@ -1142,9 +1144,15 @@ export default {
         tablejscType: 'jsc_tdgy_gy_zbmx',
         columns: [
           "项目名称",
+          "供应方式",
+          "面积(公顷）",
           "土地用途",
-          "出让面积(公顷）",
-          "土地使用权",
+          "容积率",
+          "成交价/起始价（万元）",
+          "批准日期",
+          "受让方",
+          // "出让面积(公顷）",
+          // "土地使用权",
           "土地座落",
           "批准文号",
           "批准机关",

src/views/cockpit/wpjg.vue

@@ -15,11 +15,11 @@
       </div>
       <div class="item">
         <span class="dlabel">违法占地：</span>
-        <span class="dvalue">{{ (title.wf_mj / 1000).toFixed(2) || 0 }}k㎡</span>
+        <span class="dvalue">{{ wf_mj_computed }}</span>
       </div>
       <div class="item">
         <span class="dlabel"> 违法率：</span>
-        <span class="dvalue">{{ title.wfl || 0 }}%</span>
+        <span class="dvalue">{{ wfl_computed }}</span>
       </div>
     </div>
     <div id="wpjg_echart" v-show="xzqh_flag"></div>
@@ -51,8 +51,7 @@ export default {
       xzqh_flag: true
     };
   },
-  //监听属性 类似于data概念
-  computed: {},
+
   //监控data中的数据变化
   watch: {},
 
@@ -590,6 +589,29 @@ export default {
       });
     },
   },
+  computed: {
+    // 计算属性的 getter  
+    wfl_computed: function () {
+      // `this` 指向 vm 实例
+      if (this.title.wfl != 0) {
+        return this.title.wfl + '%'
+
+      } else {
+        return '暂无'
+
+      }
+    },
+    wf_mj_computed: function () {
+      // `this` 指向 vm 实例
+      if ((this.title.wf_mj / 1000).toFixed(2) > 0) {
+        return (this.title.wf_mj / 1000).toFixed(2) + 'k㎡'
+
+      } else {
+        return '暂无'
+
+      }
+    }
+  },
   mounted() {
     this.$nextTick((res) => {
       this.init_wpjg_title();