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

src/components/Query/clickQuery/CockpitVector.vue

@@ -20,7 +20,9 @@
               item.name !== 'val2'&&
               item.name !== 'xmmc' &&
               item.name !== 'zlmj' &&
-              item.name !== 'tzje' 
+              item.name !== 'tzje' &&
+              item.name !== 'dataid' 
+
           )
         "
         style="width: 100%"
@@ -29,7 +31,7 @@
           show-overflow-tooltip="true"
           prop="name"
           label="属性"
-          width="90"
+          width="140"
         >
         </el-table-column>
         <el-table-column

src/views/cockpit/bjxm.vue

@@ -28,7 +28,7 @@
         </div>
         <div class="text">
           <p>用地面积</p>
-          <span>{{ left_value == 'csbj' ? sdata.sj_mj : sdata_szbj.sj_mj }}</span>平方千米
+          <span>{{ left_value == 'csbj' ? sdata.sj_mj * 100 : sdata_szbj.sj_mj * 100 }}</span>公顷
         </div>
       </div>
       <!-- <div id="" v-show="xzqh_flag">
@@ -268,7 +268,8 @@ export default {
     },
     init_bjxm_cs_echart(data) {
       const _this = this;
-
+      data.bat_data = data.bat_data.map(value => (value / 1000).toFixed(2))
+      console.log('data: ', data);
 
       var dom = document.getElementById("bjxm_echart");
       var myChart = window.echarts.init(dom);
@@ -278,20 +279,9 @@ export default {
         tooltip: {
           backgroundColor: 'RGBA(20, 106, 178, 0.4)',
           trigger: "axis",
-          textStyle: { fontSize: '100%' },
-          formatter: params => {
-            let rander = params.map(item =>
-              `
-                        
-                    <div style='
-                        border:none;
-                        border-radius:3px;
-                        color:#FFF;
-                        font-size:12px
-                        '>
-                            ${item.seriesName}: ${item.value}
-                    </div>`).join('')
-            return rander
+          textStyle: {
+            fontSize: 14,
+            color: '#fff'
           }
         },
         grid: {
@@ -349,7 +339,7 @@ export default {
         }
         ],
         yAxis: [{
-          name: "用地面积/k㎡",
+          name: "用地面积/公顷",
 
           nameTextStyle: {
             color: "#fff",

src/views/cockpit/common/Graph3D.vue

@@ -63,22 +63,21 @@ export default {
             const tooltip = {
                 backgroundColor: 'RGBA(20, 106, 178, 0.4)',
                 trigger: "axis",
-                textStyle: { fontSize: '100%' },
-                formatter: params => {
-                    let rander = params.map(item =>
-                        `
-                    <div style='
-                        border:none;
-                        border-radius:3px;
-                        color:#FFF;
-                        font-size:12px
-                        '>
-                            ${item.seriesName ? item.seriesName : ''} ${item.value > 0 ? item.value : ''}
-                    </div>`).join('')
-                    return rander
+                textStyle: {
+                    fontSize: 14,
+                    color: '#fff'
+                },
+                formatter: function (params) {
+                    var res = `${params[0].name} <br/>`
+                    for (const item of params) {
+                        console.log('item: ', item);
+                        if (item.value > 0) {
+                           return res += `</span> ${item.seriesName} ：${item.value}<br/>`
+                        }
+                    }
+
                 }
             }
-
             const legend = {
                 data: legendData,      //图例名称
 

src/views/cockpit/tdsc.vue

@@ -88,21 +88,25 @@ export default {
         tooltip: {
           backgroundColor: 'RGBA(20, 106, 178, 0.4)',
           trigger: "axis",
-          textStyle: { fontSize: '100%' },
-          formatter: params => {
-            let rander = params.map(item =>
-              `
-                        
-                    <div style='
-                        border:none;
-                        border-radius:3px;
-                        color:#FFF;
-                        font-size:12px
-                        '>
-                            ${item.seriesName}: ${item.value}
-                    </div>`).join('')
-            return rander
+          textStyle: {
+            fontSize: 14,
+            color: '#fff'
           }
+          // formatter: params => {
+          //   console.log('params: ', params);
+          //   let rander = params.map(item =>
+          //     `
+
+          //           <div style='
+          //               border:none;
+          //               border-radius:3px;
+          //               color:#FFF;
+          //               font-size:12px
+          //               '>
+          //               ${item.name}  ${item.seriesName}: ${item.value}
+          //           </div>`).join('')
+          //   return rander
+          // }
         },
         grid: {
           left: '2%',
@@ -225,7 +229,7 @@ export default {
               }]),
             },
           },
-          data: result[0].data
+          data: result[1].data
         }
           , {
           name: "收储个数",
@@ -236,7 +240,7 @@ export default {
               color: '#FFCC64'  // 折线的颜色
             }
           },
-          data: result[1].data
+          data: result[0].data
         }
         ]
       };
@@ -279,11 +283,12 @@ export default {
         tablejscType: 'jsc_tdsc_zbmx',
         columns: [
           "序号",
-          "所属区",
-          "收储方式",
+          "项目类型",
           "收储项目名称",
           "收储面积（亩）",
           "预计收储成本(万元)",
+          "所属区",
+          "收储方式",
           "说明",
         ],
       });

src/views/cockpit/wpjg.vue

@@ -65,7 +65,7 @@ export default {
         word: "年份权属名称",
         tableData: [],
         tablejscType: 'jsc_vpjg_zbmx',
-        columns: ['图斑编号','面积','占用耕地面积','占用基本农田保护面积','下发日期','图斑分类', '前时相',  '前期影像名称', '后时相',  '年份期数名称', '当期影像名称','是否核查','是否调查','行政名称'],
+        columns: ['图斑编号', '面积', '占用耕地面积', '占用基本农田保护面积', '下发日期', '图斑分类', '前时相', '前期影像名称', '后时相', '年份期数名称', '当期影像名称', '是否核查', '是否调查', '行政名称'],
       })
     },
     switch_xzqh(value) {
@@ -319,20 +319,9 @@ export default {
         tooltip: {
           backgroundColor: 'RGBA(20, 106, 178, 0.4)',
           trigger: "axis",
-          textStyle: { fontSize: '100%' },
-          formatter: params => {
-            let rander = params.map(item =>
-              `
-                        
-                    <div style='
-                        border:none;
-                        border-radius:3px;
-                        color:#FFF;
-                        font-size:12px
-                        '>
-                            ${item.seriesName}: ${item.value}
-                    </div>`).join('')
-            return rander
+          textStyle: {
+            fontSize: 14,
+            color: '#fff'
           }
         },
         legend: {

src/views/cockpit/ydjc.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="ydjc">
-        <Title title='用地监管'></Title>
+        <Title title='重点用地监管'></Title>
         <div class="selectTab">
             <el-select v-model="value" placeholder="请选择" :popper-append-to-body="false" @change="changeChartsLeft">
                 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">