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

src/components/Query/clickQuery/clickQuery.vue

@@ -6,9 +6,19 @@
     </div>
     <!-- <div class="sm-function-module-content-btn"> -->
     <div class="btnList">
-      <span v-for="(item, index) in actionOptions" :key="index" class="icon-span" :title="item.lable"
-        :class="item.isSelect ? 'selected-icon' : ''" @click="changleQueryItem(item)">
-        <i class="iconfont iconSize" :class="item.iconName" style="margin-top: 0px"></i>
+      <span
+        v-for="(item, index) in actionOptions"
+        :key="index"
+        class="icon-span"
+        :title="item.lable"
+        :class="item.isSelect ? 'selected-icon' : ''"
+        @click="changleQueryItem(item)"
+      >
+        <i
+          class="iconfont iconSize"
+          :class="item.iconName"
+          style="margin-top: 0px"
+        ></i>
       </span>
       <!-- <el-button type="primary" size="small" @click.stop="mapLayerQuery"
         >点击</el-button
@@ -19,22 +29,44 @@
     </div>
     <div class="sm-function-module-content-tabs">
       <el-tabs @tab-click="handleTabClick" v-model="activeLayerId">
-        <el-tab-pane :label="item.label" :name="item.id" v-for="(item, index) in layerList" :key="index"></el-tab-pane>
+        <el-tab-pane
+          :label="item.label"
+          :name="item.id"
+          v-for="(item, index) in layerList"
+          :key="index"
+        ></el-tab-pane>
       </el-tabs>
     </div>
     <div class="sm-function-module-content-table">
-      <el-collapse :value="activeNames" @change="handleCollapseChange" v-if="
-        activeLayerId &&
-        queryResults[activeLayerId] &&
-        queryResults[activeLayerId].length > 0
-      ">
-        <el-collapse-item :title="'查询结果' + (index + 1)" :name="'查询结果' + (index + 1)"
-          v-for="(item, index) in queryResults[activeLayerId]" :key="index">
+      <el-collapse
+        :value="activeNames"
+        @change="handleCollapseChange"
+        v-if="
+          activeLayerId &&
+          queryResults[activeLayerId] &&
+          queryResults[activeLayerId].length > 0
+        "
+      >
+        <el-collapse-item
+          :title="'查询结果' + (index + 1)"
+          :name="'查询结果' + (index + 1)"
+          v-for="(item, index) in queryResults[activeLayerId]"
+          :key="index"
+        >
           <template slot="title">
             查询结果{{ index + 1
-            }}<i title="定位" class="header-icon el-icon-s-promotion flyBtn2" @click.stop="flyTo(index)"></i>
+            }}<i
+              title="定位"
+              class="header-icon el-icon-s-promotion flyBtn2"
+              @click.stop="flyTo(index)"
+            ></i>
           </template>
-          <el-table :data="item" :show-header="false" border style="width: 100%">
+          <el-table
+            :data="item"
+            :show-header="false"
+            border
+            style="width: 100%"
+          >
             <el-table-column prop="name" label="字段" width="100">
             </el-table-column>
             <el-table-column prop="value" label="值" width="208">
@@ -106,7 +138,7 @@ export default {
       return store.state.toolBar[9];
     },
   },
-  created() { },
+  created() {},
   watch: {
     activeLayerId(val) {
       if (val && val != "0") {
@@ -275,7 +307,6 @@ export default {
             const selectedId = Number(buildingLayer.getSelection()[0]);
             buildingLayer.getAttributesById([selectedId]).then(function (atts) {
               if (atts) {
-                // console.log(atts);
                 Pid = atts["管线段"] || atts["物探点"];
                 var length = Object.keys(atts).length;
                 var des;
@@ -368,7 +399,7 @@ export default {
               queryByIDParameters
             );
           }
-          console.log(e)
+          console.log(e);
           if (e && e.totalCount > 0) {
             that.layerList.push(store.state.vectorlayerlist[i]);
             let queryData = [];
@@ -401,12 +432,12 @@ export default {
             let legendJson = getTreeId(tempTreeData, obj.id);
             for (let u = 0; u < e.features.length; u++) {
               let cur = [];
-              // console.log(e.features[u], "e.features[u]");
               if (legendJson.legend != "") {
                 //将数据转为json
                 let parseJson = JSON.parse(legendJson.legend);
                 //初始化下标
                 let index = -1;
+                var linSAr = JSON.parse(JSON.stringify(e.features[u]));
                 parseJson.forEach((p) => {
                   //将数据改为大写
                   p.fieldname = p.fieldname.toUpperCase();
@@ -416,16 +447,19 @@ export default {
                     //如果数据存在数组中并且进行了修改，找到它对应的下标对数据进行替换
                     e.features[u].fieldNames[index] = p.fieldaliasname;
                   }
+                  let index1 = linSAr.fieldNames.indexOf(p.fieldname);
+                  if (index1 > -1 && !condition(p)) {
+                    this.$delete(linSAr.fieldNames, index1);
+                    this.$delete(linSAr.fieldValues, index1);
+                  }
                 });
               }
+              function condition(ci) {
+                return ci.status != undefined && ci.status;
+              }
               if (e.features[u].fieldNames) {
-                e.features[u].fieldNames.forEach((fieldName, i) => {
-                  if (
-                    fieldName.toLowerCase().indexOf("shape") < 0 &&
-                    fieldName.toLowerCase().indexOf("sm") &&
-                    e.features[u].fieldValues[i] != ""
-                  ) {
-                    let v = e.features[u].fieldValues[i];
+                linSAr.fieldNames.forEach((fieldName, i) => {
+                    let v = linSAr.fieldValues[i];
                     if (!isNaN(parseFloat(v))) {
                       v = Math.round(parseFloat(v) * 100) / 100;
                     }
@@ -433,8 +467,23 @@ export default {
                       name: fieldName,
                       value: v,
                     });
-                  }
                 });
+                // e.features[u].fieldNames.forEach((fieldName, i) => {
+                //   if (
+                //     fieldName.toLowerCase().indexOf("shape") < 0 &&
+                //     fieldName.toLowerCase().indexOf("sm") &&
+                //     e.features[u].fieldValues[i] != ""
+                //   ) {
+                //     let v = e.features[u].fieldValues[i];
+                //     if (!isNaN(parseFloat(v))) {
+                //       v = Math.round(parseFloat(v) * 100) / 100;
+                //     }
+                //     cur.push({
+                //       name: fieldName,
+                //       value: v,
+                //     });
+                //   }
+                // });
               } else {
                 that.$message({
                   message: "查询结果为空！",
@@ -465,7 +514,7 @@ export default {
                 );
                 points.push([c.x, c.y]);
               }
-              parts.push(e.features[u].geometry.parts)
+              parts.push(e.features[u].geometry.parts);
               geoms.push(points);
               queryData.push(cur);
             }
@@ -477,7 +526,6 @@ export default {
         }
         if (that.layerList.length > 0) {
           that.activeLayerId = that.layerList[0].id;
-          console.log(that.activeLayerId, "that.activeLayerId");
         } else {
           that.$message({
             message: "查询结果为空！",

src/store/store.js

@@ -51,16 +51,24 @@ var store2 = {
             }
         },
         cockpit_tdsc: {
-            flag: true,
-            text: {
-                xzqhdm_number: 0,
-                zhmj: 0,
+            scjd: {
+                percentage: 0,
+                sj_mj: 0, //完成收储
+                jh_xzqdm_number: 0,//计划收储项目个数
+                jh_mj: 0,//计划收储面积
+                sj_xzqdm_number: 1//完成收储项目个数
             },
             echart: {
                 x: [],
                 bar: [],
             }
         },
+        cockpit_tdgy: {//土地供应
+            gy_jg: {
+                xdata:[],
+                result:[],
+            },
+        },
         regional_information: {
             id: 4602,
             name: '',
@@ -206,9 +214,7 @@ var store2 = {
     setCockpitHysyText(newValue) {
         this.state.cockpit_hysy.text = newValue;
     },
-    setCockpitTdsc(newValue) {
-        this.state.cockpit_tdsc.flag = newValue;
-    }, setCockpitDate(newValue) {
+    setCockpitDate(newValue) {
         this.state.cockpit_date = newValue;
     }, setCockpitGkzb(newValue) {
         this.state.cockpit_gkzb = newValue;

src/views/cockpit/jcbd.vue

@@ -4,71 +4,6 @@
             <div class="icon"></div>
             <span>基础本底</span>
         </div>
-
-
-        <!-- <div class="content">
-            <div class="item">
-                <div class="icon">
-                    <div class="icon_zxkg">
-
-                    </div>
-                </div>
-                <div class="text">
-                    <span>{{ store.state.cockpit_gkzb.tbmj_ys }}</span>k㎡
-                </div>
-            </div>
-            <div class="item">
-                <div class="icon">
-                    <div class="icon_zxkg">
-
-                    </div>
-                </div>
-                <div class="text">
-                    <span>{{ store.state.cockpit_gkzb.tbmj_ys }}</span>k㎡
-                </div>
-            </div>
-            <div class="item">
-                <div class="icon">
-                    <div class="icon_zxkg">
-
-                    </div>
-                </div>
-                <div class="text">
-                    <span>{{ store.state.cockpit_gkzb.tbmj_ys }}</span>k㎡
-                </div>
-            </div>
-            <div class="item">
-                <div class="icon">
-                    <div class="icon_zxkg">
-
-                    </div>
-                </div>
-                <div class="text">
-                    <span>{{ store.state.cockpit_gkzb.tbmj_ys }}</span>k㎡
-                </div>
-            </div>
-            <div class="item">
-                <div class="icon">
-                    <div class="icon_zxkg">
-
-                    </div>
-                </div>
-                <div class="text">
-                    <span>{{ store.state.cockpit_gkzb.tbmj_ys }}</span>k㎡
-                </div>
-            </div>
-            <div class="item">
-                <div class="icon">
-                    <div class="icon_zxkg">
-
-                    </div>
-                </div>
-                <div class="text">
-                    <span>{{ store.state.cockpit_gkzb.tbmj_ys }}</span>k㎡
-                </div>
-            </div>
-        </div> -->
-
         <div class="content">
             <div class="item" v-for="(item, index) in obj">
                 <div class="icon">

src/views/cockpit/tdsc.vue

@@ -11,22 +11,22 @@
       </el-select>
     </div>
 
-    <div v-show="tab == options[0].value">
+    <div v-show="tab == options[1].value">
       <div id="scje_echart"></div>
     </div>
-    <div v-show="tab == options[1].value">
+    <div v-show="tab == options[0].value">
       <div class="content_scjd">
         <div class="space">
           <div class="lt_box box">
             <div class="text">
-              <p>计划出让海域</p>
-              <span>66.23</span>公顷
+              <p>计划收储</p>
+              <span>{{ store.state.cockpit_tdsc.scjd.jh_mj }}</span>公顷
             </div>
           </div>
           <div class="lb_box box">
             <div class="text">
-              <p>计划出让海域</p>
-              <span>66.23</span>公顷
+              <p>计划收储项目</p>
+              <span>{{ store.state.cockpit_tdsc.scjd.jh_xzqdm_number }}</span>个
             </div>
           </div>
           <div id="dial_watch_scjg">
@@ -35,14 +35,14 @@
           </div>
           <div class="rt_box box">
             <div class="text">
-              <p>计划出让海域</p>
-              <span>66.23</span>公顷
+              <p>完成收储</p>
+              <span>{{ store.state.cockpit_tdsc.scjd.sj_mj }}</span>公顷
             </div>
           </div>
           <div class="rb_box box">
             <div class="text">
-              <p>计划出让海域</p>
-              <span>66.23</span>公顷
+              <p>完成收储</p>
+              <span>{{ store.state.cockpit_tdsc.scjd.jh_xzqdm_number }}</span>个
             </div>
           </div>
         </div>
@@ -53,6 +53,7 @@
 
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
+import { QueryOne, QueryList } from '@/api/cockpitNew'
 
 export default {
   components: {},
@@ -84,8 +85,8 @@ export default {
       const mockData = {
         xdata: ['居民用地', '公共管理用地', '商业商服用地', '工矿用地', '工矿用地仓储用地', "交通运输用地"],
         result: [
-          { name: '计划收储', data: [...new Array(33)].map((item, i) => +(Math.random(0, 10) * 1000).toFixed(0)) },
-          { name: '完成收储', data: [...new Array(33)].map((item, i) => +(Math.random(0, 0.5) * 1000).toFixed(0)) },
+          { name: '计划收储', data: [...new Array(5)].map((item, i) => +(Math.random(0, 10) * 1000).toFixed(0)) },
+          { name: '完成收储', data: [...new Array(5)].map((item, i) => +(Math.random(0, 0.5) * 1000).toFixed(0)) },
         ]
       }
 
@@ -414,14 +415,25 @@ export default {
     },
     change_model(e) {
       this.$forceUpdate();
-    }
+    },
+    async init_scjd(params) {
+      const that = this;
+      let obj = {
+        beginTime: params ? params.beginTime : store.state.cockpit_date[0],
+        endTime: params ? params.endTime : store.state.cockpit_date[1],
+        jscType: 'jsc_tdsc_ztgh_scjd',
+        id: params ? params.id : '4602'
+      };
+      let data = await QueryOne(obj);
+      store.state.cockpit_tdsc.scjd = data.data
+    },
   },
   mounted() {
     const that = this;
     this.$nextTick((res) => {
       that.init_scje_echart();
       that.init_dial_watch_scjg();
-
+      this.init_scjd();
     })
   },
   beforeUpdate() { }, //生命周期 - 更新之前

src/views/cockpit/tdsy.vue

@@ -178,12 +178,21 @@ export default {
       var myChart = window.echarts.init(dom);
       // Mock数据
       const mockData = {
+        xdata: store.state.cockpit_tdgy.gy_jg.xdata,
+        result: store.state.cockpit_tdgy.gy_jg.result
+      }
+
+      console.log('mockData: ', mockData);
+
+
+      const mockData1 = {
         xdata: ['居民用地', '公共管理用地', '商业商服用地', '工矿用地', '工矿用地仓储用地', "交通运输用地"],
         result: [
           { name: '计划收储', data: [...new Array(33)].map((item, i) => +(Math.random(0, 10) * 1000).toFixed(0)) },
           { name: '完成收储', data: [...new Array(33)].map((item, i) => +(Math.random(0, 0.5) * 1000).toFixed(0)) },
         ]
       }
+      console.log('mockData1: ', mockData1);
 
       const color = [
         [{ offset: 0, color: 'rgba(183, 117, 12, 0.8)' }, { offset: 0.5, color: 'rgba(183, 117, 12, 0.8)' }, { offset: 0.5, color: 'rgba(249, 180, 71, 0.8)' }, { offset: 1, color: 'rgba(249, 180, 71, 0.8)' }],
@@ -249,9 +258,11 @@ export default {
         axisTick: { show: false },
       }]
       const diamondData = mockData.result.reduce((pre, cur, index) => {
+        console.log('pre, cur, index: ', pre, cur, index);
         pre[index] = cur.data.map((el, id) => el + (pre[index - 1] ? pre[index - 1][id] : 0))
         return pre
       }, [])
+      console.log('diamondData: ', diamondData);
 
       let series = mockData.result.reduce((p, c, i, array) => {
         p.push({
@@ -318,14 +329,7 @@ export default {
     }, changeChartsRight() {
 
     },
-    async getInfo() {
-      let res = await QueryList({
-        val0: '区',
-        jscType: "jsc_tdgy_jt_xx",
-        id: 4602,
-      });
-      this.jiDataInfo = res.data
-    },
+
     init_echart() {
 
       var dom = document.getElementById("dial_watch");
@@ -716,14 +720,46 @@ export default {
       myChart.setOption(option);
 
     },
+    async init_tdgy_gy_jd(params) {
+      const that = this;
+      let obj = {
+        jscType: 'jsc_tdgy_gy_yelx',
+        id: params ? params.id : '4602'
+      };
+      let data = await QueryList(obj);
+      let xdata = [];
+      let result = [
+        {
+          name: "计划收储",
+          data: []
+        },
+        {
+          name: "完成收储",
+          data: []
+        }
+      ];
+
+      data.data.forEach((res) => {
+        xdata.push(res.tdyt);
+        result[0].data.push(res.jh_crmj);
+        result[1].data.push(res.sj_crmj);
+
+      })
+
+      store.state.cockpit_tdgy.gy_jg.xdata = xdata
+      store.state.cockpit_tdgy.gy_jg.result = result
+      that.init_gy_jg_echart();
+
+    }
   },
   mounted() {
     const that = this;
     this.$nextTick(() => {
-      that.getInfo();
+
+
+      this.init_tdgy_gy_jd();
       that.init_echart();
       that.init_dial_watch_scjg();
-      that.init_gy_jg_echart();
 
       this.$refs.tdgy_echart_gyjd.setOptions([
         { name: "未供应", value: 12 },

src/views/cockpit/wpjg.vue

@@ -21,7 +21,11 @@
         <span class="dvalue">{{ sdata.jcmj || 0 }}%</span>
       </div>
     </div>
-    <div id="wpjg_echart"></div>
+    <div id="wpjg_echart" v-show="false"></div>
+
+    <div id="wpjg_echart_xzqh">
+
+    </div>
   </borderTemplate>
 </template>
 
@@ -43,6 +47,189 @@ export default {
   watch: {},
 
   methods: {
+    init_wpjg_echart_xzqh() {
+
+      var dom = document.getElementById("wpjg_echart_xzqh");
+      var myChart = window.echarts.init(dom);
+      let barTopColor = ["#CBB835", "#33C6E2", '#157FFE', '#8F48F0'];
+      let barBottomColor = ["#D09311", "#279AB0", '#154AD2', '#670BFF'];
+      let option = {
+        backgroundColor: 'rgba(0,0,0,0)',
+        title: {
+          show: false,
+          text: '一行动一活动开展情况',
+          top: 20,
+          left: 'center',
+          textStyle: {
+            color: '#00eaff',
+            fontSize: 18,
+            fontWeight: 'normal'
+          }
+        },
+        tooltip: {
+          show: false,
+          trigger: 'axis',
+          formatter: '一行动一活动开展情况<br>{b}：{c}',
+          backgroundColor: 'rgba(18, 57, 60, .8)', //设置背景颜色
+          textStyle: {
+            color: '#fff'
+          },
+          borderColor: "rgba(18, 57, 60, .8)",
+          axisPointer: {
+            type: 'shadow',
+            shadowStyle: {
+              color: 'rgba(0, 11, 34, .4)',
+            }
+          }
+        },
+        grid: {
+          top: '14%',
+          bottom: '1%',
+          left: '0%',
+          right: '20%',
+          containLabel: true
+        },
+        xAxis: {
+
+          axisTick: {
+            show: false
+          },
+          axisLine: {
+            show: false,
+            lineStyle: {
+              color: '#1C82C5'
+            }
+          },
+          axisLabel: {
+            show: false,
+            rotate: 20,
+            margin: 30,
+            textStyle: {
+              fontSize: 14,
+              color: '#DEEBFF',
+              align: 'center'
+            }
+          },
+          interval: 0
+        },
+        yAxis: {
+          data: ['监测图斑', '占用耕地', '占用永久...', '违法占地'],
+
+          splitLine: {
+            show: false,
+            lineStyle: {
+              color: 'rgba(28, 130, 197, .3)'
+            }
+          },
+          axisTick: {
+            show: false
+          },
+          axisLine: {
+            show: false,
+            lineStyle: {
+              color: '#1C82C5'
+            }
+          },
+          axisLabel: {
+            show: true,
+            margin: 10,
+            textStyle: {
+              fontSize: 12,
+              color: '#DEEBFF',
+            }
+          },
+        },
+
+        series: [
+          {
+            name: '一行动一活动开展情况',
+            type: 'pictorialBar',
+            symbolSize: [8, 14],
+            symbolOffset: [4, 0],
+            z: 12,
+            itemStyle: {
+              normal: {
+                color: function (params) {
+                  return barBottomColor[params.dataIndex];
+                }
+              }
+            },
+            label: {
+              textStyle: {
+                rich: {
+                  name: {
+                    color: "#fff", //#BCD3E5
+                    fontSize: 14,
+                  },
+                  value: {
+                    color: "#64DAFF",
+                    fontSize: 14,
+                  },
+                  unit: {
+                    color: "#fff", //#BCD3E5
+                    fontSize: 14,
+                  },
+                },
+              },
+              show: true,
+              position: 'right',
+              fontSize: 16,
+              formatter: function (params) {
+                return `{value|${params.value}}  {unit|㎡}`;
+              }
+            },
+            symbolPosition: 'end',
+            data: [22.23, 23.57, 18.14, 14.75],
+
+          }, {
+            name: '一行动一活动开展情况',
+            type: 'pictorialBar',
+            symbolOffset: [-3, 0],
+
+            symbolSize: [8, 14],
+            z: 12,
+            itemStyle: {
+              normal: {
+                color: function (params) {
+                  return barTopColor[params.dataIndex];
+                }
+              }
+            },
+            data: [22, 23, 18, 14],
+
+          }, {
+            type: 'bar',
+            itemStyle: {
+              normal: {
+                color: function (params) {
+                  return new echarts.graphic.LinearGradient(
+                    0, 0, 0, 1,
+                    [{
+                      offset: 1,
+                      color: barTopColor[params.dataIndex]
+                    },
+                    {
+                      offset: 0,
+                      color: barBottomColor[params.dataIndex]
+                    }
+                    ]
+                  );
+                },
+                opacity: .9
+              }
+            },
+            z: 16,
+            silent: true,
+            barWidth: 15,
+            barCategoryGap: '100%',
+            data: [22.23, 23.57, 18.14, 14.75],
+
+          }]
+      };
+
+      myChart.setOption(option);
+
+    },
     init_wpjg_echart() {
       var tdsc_my_chart = window.echarts.init(document.getElementById('wpjg_echart'));
 
@@ -332,6 +519,8 @@ export default {
   mounted() {
     this.$nextTick((res) => {
       this.init_wpjg_echart();
+      this.init_wpjg_echart_xzqh();
+
     })
   },
 };
@@ -376,4 +565,12 @@ export default {
   width: 26rem;
   height: 12rem;
 }
+
+#wpjg_echart_xzqh {
+  left: 1rem;
+  top: 1rem;
+  width: 26rem;
+  height: 12rem;
+
+}
 </style>

src/views/viewer1.vue

@@ -14,9 +14,9 @@
             <JSYD ref="gkzb_ref" />
             <JCBD />
             <BJXM />
-            <TDSC />
+            <TDSC ref="tdsc_ref" />
             <HYSY ref="hysy_ref" />
-            <TDSY />
+            <TDSY ref="tdgy_ref"/>
             <GDBH ref="gdbh_ref" />
             <STXF ref="stxf_ref" />
             <WPJG ref="wpjg_ref" />
@@ -95,6 +95,10 @@ export default {
             this.$refs.gdbh_ref.setData({ id: this.params.id });
             // this.$refs.stxf_ref.setData({ id: this.params.id });
             this.$refs.wpjg_ref.setData(this.params);
+            this.$refs.tdsc_ref.init_scjd(this.params);
+            this.$refs.tdgy_ref.init_tdgy_gy_jd(this.params);
+
+            
         },
         dateChange(date) {
             this.params.beginTime = date[0]
@@ -110,7 +114,6 @@ export default {
                 id: address
             };
             let data = await cockpitInfo(obj);
-            console.log('data: ', data);
 
             let obg_text = {
                 xzqhdm_number: data.data[0].xzqhdm_number,
@@ -231,8 +234,6 @@ export default {
                         that.setDatas()
                         // 驾驶舱海域使用权
                         that.hysyq(adcode);
-                        // 驾驶舱土地收储
-                        that.tdsc_xzqh(adcode);
                         // 管控指标
                         that.gkzb_xzqh(adcode);
                         viewer.entities.values.forEach((res) => {
@@ -266,20 +267,13 @@ export default {
                     // 管控指标
                     that.gkzb();
 
+                    that.params.id = '4602'
+                    that.setDatas()
 
                 }
 
             }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
         },
-        tdsc() {
-            const that = this;
-            that.store.setCockpitTdsc(true);
-
-        },
-        tdsc_xzqh() {
-            const that = this;
-            that.store.setCockpitTdsc(false);
-        },
         colorFun(color) {