m

src/views/dashboard-screen/jxdxqk/index.vue

@@ -154,7 +154,7 @@ export default {
             return offsetX + Math.cos(u) * (1 + Math.cos(v) * k) * hoverRate
           },
 
-          y: function(u, v) {
+          y: function (u, v) {
             if (u < startRadian) {
               return offsetY + Math.sin(startRadian) * (1 + Math.cos(v) * k) * hoverRate
             }
@@ -164,7 +164,7 @@ export default {
             return offsetY + Math.sin(u) * (1 + Math.cos(v) * k) * hoverRate
           },
 
-          z: function(u, v) {
+          z: function (u, v) {
             if (u < -Math.PI * 0.5) {
               return Math.sin(u)
             }
@@ -253,13 +253,13 @@ export default {
               max: Math.PI,
               step: Math.PI / 1.4
             },
-            x: function(u, v) {
+            x: function (u, v) {
               return Math.sin(v) * Math.sin(u) + Math.sin(u)
             },
-            y: function(u, v) {
+            y: function (u, v) {
               return Math.sin(v) * Math.cos(u) + Math.cos(u)
             },
-            z: function(u, v) {
+            z: function (u, v) {
               return Math.cos(v) > 0 ? 0.1 : -0.1
             }
           }
@@ -389,22 +389,29 @@ export default {
           },
           label: {
             position: 'outside',
-            padding: [0, -this.EchartfontSize(50)],
+            padding: [0, -this.EchartfontSize(40)],
             formatter: (params) => {
-              const arr = [
+              let arr = [
                 `{a|${params.name}}`,
                 `{b|${params.value}\n\n}`
               ]
+              if (params.dataIndex === 0) {
+                arr = [
+                  `\n\n\n{a|${params.name}}`,
+                  `{b|${params.value}}`
+                ]
+              }
+
               return arr.join(' ')
             },
             rich: {
               a: {
                 color: '#ffffff',
-                fontSize: this.EchartfontSize(18)
+                fontSize: this.EchartfontSize(16)
               },
               b: {
                 color: 'rgba(33,229,248)',
-                fontSize: this.EchartfontSize(18),
+                fontSize: this.EchartfontSize(16),
                 verticalAlign: 'top',
                 align: 'center'
 

src/views/dashboard-screen/screen/sjdr/dlydts/tab1.vue

@@ -19,7 +19,8 @@
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <a-input
+          <j-dict-select-tag
+            ref="xbEl"
             v-model="queryParam.lineName"
             style="width: 150px"
             placeholder="线别"
@@ -86,6 +87,17 @@ export default {
   created() {
     this.loadTree()
   },
+  mounted() {
+    getAction('/show/ydts/listLine').then(res => {
+      console.log('res', res)
+      this.$refs.xbEl.dictOptions = res.data.map(item => {
+        return {
+          dictLabel: item,
+          dictValue: item
+        }
+      })
+    })
+  },
   methods: {
     loadTree() {
       this.treeData = []

src/views/dashboard-screen/screen/sjdr/qb-dl/tab2.vue

@@ -20,38 +20,11 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <a-input
-            v-model="queryParam.lineName"
+            v-model="queryParam.teamName"
             style="width: 150px"
-            placeholder="线别"
+            placeholder="班组"
           />
         </a-form-item>
-        <a-form-item>
-          <a-input
-            v-model="queryParam.substationName"
-            style="width: 150px"
-            placeholder="所亭名称"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-input
-            v-model="queryParam.sbmc"
-            style="width: 150px"
-            placeholder="设备名称"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-date-picker :showToday="true" :locale="localeZH"   valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateStart" placeholder="计划时间（起始）"/>
-        </a-form-item>
-        <a-form-item>
-          <a-date-picker :showToday="true" :locale="localeZH"   valueFormat="YYYY-MM-DD" v-model="queryParam.testPlanDateEnd" placeholder="计划时间（结束）"/>
-        </a-form-item>
-
-        <a-form-item>
-          <a-date-picker :showToday="true" :locale="localeZH"   valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateStart" placeholder="实际时间（起始）"/>
-        </a-form-item>
-        <a-form-item>
-          <a-date-picker :showToday="true" :locale="localeZH"   valueFormat="YYYY-MM-DD" v-model="queryParam.completionDateEnd" placeholder="实际时间（结束）"/>
-        </a-form-item>
 
         <a-form-item>
           <a-button type="primary" @click="searchQuery">查询</a-button>

src/views/dashboard-screen/screen/sjdr/tab3.vue

@@ -28,7 +28,8 @@
       </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <a-input
+          <j-dict-select-tag
+            ref="xbEl"
             v-model="queryParam.lineName"
             style="width: 150px"
             placeholder="线别"
@@ -104,6 +105,17 @@ export default {
   created() {
     this.loadTree()
   },
+  mounted() {
+    getAction('/show/bdyc/listLineSelf').then(res => {
+      console.log('res', res)
+      this.$refs.xbEl.dictOptions = res.data.map(item => {
+        return {
+          dictLabel: item,
+          dictValue: item
+        }
+      })
+    })
+  },
   methods: {
     loadTree() {
       this.treeData = []