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

src/views/cockpit/common/ThreeStackedBarAndLine.vue

@@ -35,20 +35,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: {

src/views/cockpit/ydjc.vue

@@ -20,8 +20,8 @@
                 </div>
 
             </div>
-            <ThreeStackedBarAndLine ref="lsyd_echart" v-if="xzqh_flag" class="qxjc_echart"></ThreeStackedBarAndLine>
-            <XZQHPieChart v-else="!xzqh_flag"></XZQHPieChart>
+            <ThreeStackedBarAndLine ref="lsyd_echart" v-show="xzqh_flag" class="qxjc_echart"></ThreeStackedBarAndLine>
+            <XZQHPieChart v-show="!xzqh_flag"></XZQHPieChart>
 
         </div>
         <!-- 临时用地(复垦监测) -->
@@ -62,8 +62,8 @@
                     <span class="dvalue">543.89公顷</span>
                 </div>
             </div>
-            <ThreeStackedBarAndLine ref="nzyd_echart" v-if="xzqh_flag" class="qxjc_echart"></ThreeStackedBarAndLine>
-            <XZQHPieChart v-else="!xzqh_flag"></XZQHPieChart>
+            <ThreeStackedBarAndLine ref="nzyd_echart" v-show="xzqh_flag" class="qxjc_echart"></ThreeStackedBarAndLine>
+            <XZQHPieChart v-show="!xzqh_flag"></XZQHPieChart>
         </div>
     </div>
 </template>
@@ -124,6 +124,7 @@ export default {
 
         },
         switch_xzqh(value) {
+            console.log('value: ', value);
             if (value.id == '4602') {
                 this.xzqh_flag = true
 

src/views/siteselection/components/fzxz.vue

@@ -87,7 +87,7 @@
             是否与控规用地性质一致</el-checkbox
           >
           <el-checkbox v-model="ruleForm.useMultiple"
-            >是否允许选出多个分散地块。</el-checkbox
+            >是否允许选出多个分散地块</el-checkbox
           >
           <div v-if="ruleForm.useMultiple">
             请输入地块间最大距离

src/views/siteselection/components/xzjg.vue

@@ -58,7 +58,7 @@
           >
             <template slot="title">
               <!-- 地块编号B_P_123 -->
-              地块编号{{ item.dkbm }} ({{ item.area || 0 }})亩
+              {{ item.dkbm }} ({{ item.area || 0 }})亩
               <span class="tools">
                 <i
                   class="header-icon el-icon-place"