瀏覽代碼

修改登录界面,账套选择框的宽度,首检检查等数据接口添加

xiaost 2 年之前
父節點
當前提交
dab59d68d9
共有 3 個文件被更改,包括 103 次插入131 次删除
  1. 92 121
      src/views/center.vue
  2. 10 9
      src/views/centerRight1.vue
  3. 1 1
      src/views/login.vue

+ 92 - 121
src/views/center.vue

@@ -20,8 +20,8 @@
         <span>
           <icon name="chart-pie" class="text-icon"></icon>
         </span>
-        <span class="fs-xl text mx-2 mb-1 pl-3">年度负责人组件达标榜</span>
-        <dv-scroll-ranking-board class="dv-scr-rank-board mt-1" :config="ranking" />
+        <span class="fs-xl text mx-2 mb-1 pl-3">关键工序直通率</span>
+        <dv-scroll-ranking-board class="dv-scr-rank-board mt-1" :config="ranking" ref="scroll-ranking-board"/>
       </div>
       <div class="percent">
         <div class="item bg-color-black">
@@ -54,131 +54,18 @@ import CenterChart from '@/components/echart/center/centerChartRate'
 export default {
   data() {
     return {
-      titleItem: [
-        {
-          title: '首检任务数',
-          number: {
-            number: [120],
-            toFixed: 1,
-            textAlign: 'left',
-            content: '{nt}',
-            style: {
-              fontSize: 26
-            }
-          }
-        },
-        {
-          title: '首检完成数',
-          number: {
-            number: [18],
-            toFixed: 1,
-            textAlign: 'left',
-            content: '{nt}',
-            style: {
-              fontSize: 26
-            }
-          }
-        },
-        {
-          title: '首检合格数' ,
-          number: {
-            number: [2],
-            toFixed: 1,
-            textAlign: 'left',
-            content: '{nt}',
-            style: {
-              fontSize: 26
-            }
-          }
-        },
-        {
-          title: '巡检任务数',
-          number: {
-            number: [14],
-            toFixed: 1,
-            textAlign: 'left',
-            content: '{nt}',
-            style: {
-              fontSize: 26
-            }
-          }
-        },
-        {
-          title: '巡检完成数',
-          number: {
-            number: [106],
-            toFixed: 1,
-            textAlign: 'left',
-            content: '{nt}',
-            style: {
-              fontSize: 26
-            }
-          }
-        },
-        {
-          title: '巡检合格数',
-          number: {
-            number: [100],
-            toFixed: 1,
-            textAlign: 'left',
-            content: '{nt}',
-            style: {
-              fontSize: 26
-            }
-          }
-        }
-      ],
+      titleItem:[],
       ranking: {
-        data: [
-          {
-            name: '周口',
-            value: 55
-          },
-          {
-            name: '南阳',
-            value: 120
-          },
-          {
-            name: '西峡',
-            value: 78
-          },
-          {
-            name: '驻马店',
-            value: 66
-          },
-          {
-            name: '新乡',
-            value: 80
-          },
-          {
-            name: '新乡2',
-            value: 80
-          },
-          {
-            name: '新乡3',
-            value: 80
-          },
-          {
-            name: '新乡4',
-            value: 80
-          },
-          {
-            name: '新乡5',
-            value: 80
-          },
-          {
-            name: '新乡6',
-            value: 80
-          }
-        ],
+        data: [],
         carousel: 'single',
-        unit: '人'
+        //unit: '人'
       },
       water: {
-        data: [24, 45],
+        data: [],//[24, 66],
         shape: 'roundRect',
         formatter: '{value}%',
-        waveNum: 3
+        waveNum: 3,
+        waveHeight:20
       },
       // 通过率和达标率的组件复用数据
       rate: [
@@ -215,6 +102,90 @@ export default {
   },
   components: {
     CenterChart
+  },
+  mounted () {
+    this.drawTimingFn();
+  },
+
+  methods: {
+    drawTimingFn () {
+      this.setData();
+      setInterval(() => {
+        this.setData(); //获取-数据
+      }, 30000);
+    },
+    async setData () {
+      // 首检任务数,完成数,合格数,巡检任务数,完成数,巡检合格数  name value
+      await this.$http.get("kanban/datalist.action?caller=CheckData&_noc=1&page=1&pageSize=100&condition=1=1")
+              .then((result)=>{
+                        let dataList = JSON.parse(result.data.data);
+                        let titleitems = new Array();
+                        for (let index = 0; index < dataList.length; index++) {
+                          const element = dataList[index];
+                          titleitems.push({
+                            title: element.name,
+                            number: {
+                              number: [element.value],
+                              toFixed: 1,
+                              textAlign: 'left',
+                              content: '{nt}',
+                              style: {
+                                fontSize: 26
+                              }
+                            }
+                          });
+                        }
+                        this.titleItem = titleitems;
+                      },(result)=>{
+                        console.error(result)
+                      }
+              );
+      //关键工序直通率
+      await this.$http.get("kanban/datalist.action?caller=KeyStepRate&_noc=1&page=1&pageSize=100&condition=1=1")
+              .then((result)=>{
+                        let dataList = JSON.parse(result.data.data);
+                        let datas = new Array();
+                        for (let index = 0; index < dataList.length; index++) {
+                          const element = dataList[index];
+                          datas.push({
+                            name:element.name ,
+                            value:element.value,
+                          });
+                        }
+                        this.ranking.data = datas;
+                        this.ranking = { ...this.ranking };
+                        /*两种刷新方式
+                         const scrollBoard = this.$refs['scroll-ranking-board'];
+                         scrollBoard.updateRows(datas);
+                         this.ranking = { data: datas }
+                         */
+                      },(result)=>{
+                        console.error(result)
+                      }
+              );
+      //饼图pie,首检合格率,巡检合格率
+      await this.$http.get("kanban/datalist.action?caller=PieCheckRate&_noc=1&page=1&pageSize=100&condition=1=1")
+              .then((result)=>{
+                        let dataList = JSON.parse(result.data.data);
+                        this.rate[0].tips = dataList[0].firstcheckrate;
+                        this.rate[0].tips = dataList[0].xcheckrate;
+                      },(result)=>{
+                        console.error(result)
+                      }
+              );
+      //水波图,首检合格率,巡检合格率
+      await this.$http.get("kanban/datalist.action?caller=WaterCheckRate&_noc=1&page=1&pageSize=100&condition=1=1")
+              .then((result)=>{
+                        let dataList = JSON.parse(result.data.data);
+                        let waterdatas = new Array();
+                        waterdatas.push(dataList[0].firstcheckrate);
+                        waterdatas.push(dataList[0].xcheckrate);
+                         this.water = { data: waterdatas }
+                      },(result)=>{
+                        console.error(result)
+                      }
+              );
+    }
   }
 }
 </script>

+ 10 - 9
src/views/centerRight1.vue

@@ -6,7 +6,7 @@
           <icon name="chart-line" class="text-icon"></icon>
         </span>
         <div class="d-flex">
-          <span class="fs-xl text mx-2">关键工序直通率</span>
+          <span class="fs-xl text mx-2">线别过数统计</span>
         </div>
       </div>
       <div class="d-flex jc-center body-box">
@@ -22,7 +22,7 @@ export default {
     return {
       config: {
         //header: ['组件', '分支', '覆盖率'],
-        header: ['线别',  '不良数'],
+        header: ['线别',  '数'],
         data: [/*
           ['组件1', 'dev-1', "<span  class='colorGrass'>↑75%</span>"],
           ['组件2', 'dev-2', "<span  class='colorRed'>↓33%</span>"],
@@ -33,7 +33,7 @@ export default {
           ['组件7', 'fix-4', "<span  class='colorGrass'>↑84%</span>"],
           ['组件8', 'fix-7', "<span  class='colorRed'>↓46%</span>"],
           ['组件9', 'dev-2', "<span  class='colorRed'>↓13%</span>"],
-          ['组件10', 'dev-9', "<span  class='colorGrass'>↑76%</span>"]*/
+          ['组件10', 'dev-9', "<span  class='colorGrass'>↑76%</span>"]
           ['组件1',  "<span  class='colorGrass'>↑75%</span>"],
           ['组件2',  "<span  class='colorGrass'>↑75%</span>"],
           ['组件3',  "<span  class='colorGrass'>↑75%</span>"],
@@ -41,7 +41,7 @@ export default {
           ['组件5',  "<span  class='colorGrass'>↑75%</span>"],
           ['组件6',  "<span  class='colorGrass'>↑75%</span>"],
           ['组件7',  "<span  class='colorGrass'>↑75%</span>"],
-          ['组件8',  "<span  class='colorGrass'>↑75%</span>"]
+          ['组件8',  "<span  class='colorGrass'>↑75%</span>"]*/
         ],
         rowNum: 7, //表格行数
         headerHeight: 35,
@@ -49,7 +49,7 @@ export default {
         oddRowBGC: '#0f1325', //奇数行
         evenRowBGC: '#171c33', //偶数行
         index: true,
-        columnWidth: [50],
+        columnWidth: [50,130],
         align: ['center']
       }
     }
@@ -59,6 +59,7 @@ export default {
   },
   methods: {
     refreshdata() {
+      this.getdata(); //获取-数据
      /* this.$http.get("kanban/login.action?username=zhongyl&password=asd&sob=N_MES_TEST").then(
            (result)=>{
               console.info(result.data);
@@ -70,20 +71,20 @@ export default {
          });*/
 
       setInterval(() => {
-        this.getdata(); //获取-主题词
+        this.getdata(); //获取--数据
       }, 30000);
     },
     async getdata() {
     //  const {data} = await this.$http.get("kanban/panelView/parseData/2B247DC439B3?index=0&kanbanCode=2B23AC00BCFB");
-      await this.$http.get("kanban/datalist.action?caller=PLANTOUTPUT&_noc=1&page=1&pageSize=100&condition=1=1")
+      await this.$http.get("kanban/datalist.action?caller=DPLANTOUTPUT&_noc=1&page=1&pageSize=100&condition=1=1")
           .then((result)=>{
                     let dataList = JSON.parse(result.data.data);
                     let resultList = new Array();
                     for (let index = 0; index < dataList.length; index++) {
                       const element = dataList[index];
                       let item = new Array();
-                      item.push(element.po_linecode);
-                      item.push(element.po_fpyrate);
+                      item.push(element.linecode);
+                      item.push("<span  class='colorGrass'>"+element.value+"</span>");
                       resultList.push(item);
                     }
                     const scrollBoard = this.$refs['scroll-board'];

+ 1 - 1
src/views/login.vue

@@ -5,7 +5,7 @@
                 UAS-MES可视化平台
             </h3>
             <el-form-item prop="sob">
-                <el-select v-model="loginForm.sob"  placeholder="请选择账套">
+                <el-select v-model="loginForm.sob"  placeholder="请选择账套" style="width:100%">
                     <el-option
                             v-for="item in options"
                             :key="item.value"