仪表盘修改

src/views/cockpit/hysy.vue

@@ -19,7 +19,9 @@
                         <span>66.23</span>公顷
                     </div>
                 </div>
+
                 <div id="dial_watch_hysy">
+
                     <div class="text">
                         <p>计划出让海域</p>
                         <span>66.23</span>公顷
@@ -230,17 +232,21 @@ export default {
             let option = {
                 backgroundColor: 'rgba(0,0,0,0)',
                 title: {
-                    text: '{num|' + demoData.value + '%}',
-                    x: '50%',
+                    text: `{num|${demoData.value}%} ` + '\n' + `{label|完成率}`,
+
+                    x: '49%',
                     y: '70%',
                     textAlign: 'center',
                     textStyle: {
                         rich: {
                             num: {
-                                fontWeight: '900',
+                                fontWeight: '600',
                                 color: 'rgba(249, 180, 71, 1)',
                                 fontFamily: '微软雅黑',
-                                fontSize: 18,
+                                fontSize: 14,
+                            }, label: {
+                                color: "#fff",
+                                fontSize: 12,
                             },
                         },
                     },
@@ -331,7 +337,7 @@ export default {
                         radius: ['65%', '50%'],
                         center: ['50%', '70%'],
                         startAngle: 220,
-                        endAngle: -44,
+                        endAngle: -10,
                         color: [
                             {
                                 type: 'linear',
@@ -556,7 +562,8 @@ export default {
     // margin-top: 10px;
     margin-left: 15px;
 
-    margin-top:3px;
+    margin-top: 3px;
+
     p {
         font-kerning: normal;
         font-family: "Arial Negreta", "Arial Normal", "Arial";

src/views/cockpit/stxf.vue

@@ -69,7 +69,6 @@ export default {
         { value: "ssxf", label: "山水工程" },
       ],
       tab: "tdzz",
-      model_switch: 'tdzz',
       paramdatas: {},
       sdlist: {
         tdzz: [
@@ -114,10 +113,6 @@ export default {
       this.jiDataInfo = res.data
     },
     changeCharts(e) {
-      this.model_switch = e
-      console.log('options[1].value: ', this.options[0].value);
-      console.log('model_switch: ', this.model_switch);
-      console.log(this.model_switch == this.options[0].value);
 
     },
     GetQueryOne(datas) {

src/views/cockpit/tdsc.vue

@@ -11,7 +11,11 @@
       </el-select>
     </div>
 
-    <div id="scje_echart"></div>
+    <div v-show="tab == options[0].value">
+      <div id="scje_echart"></div>
+    </div>
+    <div v-show="tab == options[1].value">
+    </div>
   </div>
 </template>
 
@@ -78,7 +82,7 @@ export default {
         itemWidth: 24,
         itemHeight: 15,
         itemGap: 15,
-        top: '-4%',
+        top: '5%',
         right: '2%',
         selectedMode: false
       }

src/views/cockpit/tdsy.vue

@@ -136,17 +136,21 @@ export default {
       let option = {
         backgroundColor: 'rgba(0,0,0,0)',
         title: {
-          text: '{num|' + demoData.value + '%}',
-          x: '50%',
+          text: `{num|${demoData.value}%} ` + '\n' + `{label|完成率}`,
+
+          x: '49%',
           y: '70%',
           textAlign: 'center',
           textStyle: {
             rich: {
               num: {
-                fontWeight: '900',
+                fontWeight: '600',
                 color: 'rgba(249, 180, 71, 1)',
                 fontFamily: '微软雅黑',
-                fontSize: 18,
+                fontSize: 14,
+              }, label: {
+                color: "#fff",
+                fontSize: 12,
               },
             },
           },