Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into wangjunjun

public/static/config/modeConfig.js

@@ -1,4 +1,3 @@
-
 // 本地联调开关
 const localTest = 0;
 
@@ -9,15 +8,15 @@ let baseURL = null;
 let websocketUrl = null;
 
 if (localTest) {
-  baseURL = "http://192.168.10.23:8082/" // 联机调试 - 石林
-  // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
+    baseURL = "http://192.168.10.12:8082/" // 联机调试 - 石林
+        // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
 } else {
-  baseURL = "http://10.155.32.4:8082/" // 正式环境
+    baseURL = "http://10.155.32.4:8082/" // 正式环境
 }
 
 websocketUrl = (baseURL.replace(/http:\/\/|https:\/\//g, "")) + "gyee-websocket";
 
 window.__MODE__ = {
-  baseURL,
-  websocketUrl
+    baseURL,
+    websocketUrl
 };

src/router/index.js

@@ -399,10 +399,14 @@ const routes = [{
             import ( /* webpackChunkName: "fs" */ "../views/NewPages/forecast-system.vue"),
     },
     {
-        path: '/new/ztfx',
-        name: 'ztfx',
-        component: () =>
-            import ( /* webpackChunkName: "ztfx" */ '../views/NewPages/ztfx.vue'),
+      path: '/new/ztfx',
+      name: 'ztfx',
+      component: () => import( /* webpackChunkName: "ztfx" */ '../views/NewPages/ztfx.vue'),
+    },
+    {
+      path: '/new/fdlyl',
+      name: 'fdlyl',
+      component: () => import( /* webpackChunkName: "ztfx" */ '../views/NewPages/fdlyl.vue'),
     },
     {
       path: '/new/fdlyl',
@@ -422,7 +426,7 @@ const routes = [{
             import ( /* webpackChunkName: "personnel" */ '../views/NewPages/personnel.vue'),
     },
     {
-        path: '/new/znzhfx',
+        path: '/new/znzhfx/:wtId/:year/:month',
         name: 'znzhfx',
         component: () =>
             import ( /* webpackChunkName: "ztfx" */ '../views/NewPages/znzhfx.vue'),

src/views/HealthControl/HealthTab4.vue

@@ -88,6 +88,7 @@
 import InfoHistory from "./infotrack2.vue";
 import ComTable from "@com/coms/table/table.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
+import { warn } from '@vue/runtime-core';
 
 export default {
   components: { InfoHistory, ComTable, SvgIcon },
@@ -162,8 +163,9 @@ export default {
     },
     // 消缺跟踪
     onClickTrack(row){
-      this.dialogVisible = true
+      console.warn('onClickTrack');
       this.requestTrack(row);
+      
     },
     // 历史查询
     onClickHistory(row){
@@ -239,6 +241,8 @@ export default {
         success(res) {
           if (res.code == 200) {
             that.trackDate = res.data
+            console.warn(that.trackDate);
+            that.dialogVisible = true
           }
         },
       });

src/views/HealthControl/defect-elimination-tracking.vue

@@ -13,11 +13,11 @@
         <div class="info-form-box">
           <div class="info-form">
             <div class="info-form-label">检修人员：</div>
-            <div class="info-form-value">王义波</div>
+            <div class="info-form-value">{{formdata.workleader}}</div>
           </div>
           <div class="info-form">
             <div class="info-form-label">收缩血压：</div>
-            <div class="info-form-value">0</div>
+            <div class="info-form-value">{{infoss.SSXY}}</div>
           </div>
         </div>
       </div>
@@ -25,11 +25,11 @@
         <div class="info-form-box">
           <div class="info-form">
             <div class="info-form-label">工作时长：</div>
-            <div class="info-form-value">76.0分钟</div>
+            <div class="info-form-value">{{formdata.qxclsc}}</div>
           </div>
           <div class="info-form">
             <div class="info-form-label">舒张血压：</div>
-            <div class="info-form-value">0</div>
+            <div class="info-form-value">{{infoss.SZXY}}</div>
           </div>
         </div>
       </div>
@@ -41,7 +41,7 @@
           </div>
           <div class="info-form">
             <div class="info-form-label">心跳频率：</div>
-            <div class="info-form-value">0</div>
+            <div class="info-form-value">{{infoss.XTPL}}</div>
           </div>
         </div>
       </div>
@@ -49,18 +49,18 @@
         <div class="info-form-box">
           <div class="info-form">
             <div class="info-form-label">疲劳度：</div>
-            <div class="info-form-value">0</div>
+            <div class="info-form-value">正常</div>
           </div>
           <div class="info-form">
             <div class="info-form-label">血压：</div>
-            <div class="info-form-value">0</div>
+            <div class="info-form-value">{{infoss.SZXY}}</div>
           </div>
         </div>
       </div>
     </div>
     <div class="det-chart-title">检修人员健康情况</div>
     <div class="det-chart-sub-title">工作期间检测值</div>
-    <normal-line-chart class="det-chart" height="21.296vh" :showLegend="true" />
+    <normal-line-chart :list='infols' class="det-chart" height="21.296vh" :showLegend="true" />
     <div class="det-chart-sub-title-big">专业技能:</div>
     <div class="det-chart-sub-title">电力类，机电类</div>
   </div>
@@ -79,6 +79,8 @@ export default {
     return {
       showMe: false,
       header: require("@assets/logo.png"),
+      infoss:'',    //msg
+      infols:'',    //chart
     };
   },
   created(){
@@ -88,8 +90,8 @@ export default {
   // 函数
   methods: {
     async search() {
-      const { data } = await this.API.requestData({
-        subUrl: "/recommen/findShbraceletList",
+      const {data} = await this.API.requestData({
+        subUrl: "recommen/findShbraceletList",
         method: "POST", 
         data:{
           name : this.formdata.workleader,
@@ -97,7 +99,33 @@ export default {
           endDate : this.formdata.checktime,
         }
       });
-      console.warn(data);
+      console.warn(data.data);
+      this.infoss = data.data.ss
+      let ls = data.data.ls
+      this.infols=[];
+      for(let i in ls){
+        let obj ={
+          title: i,
+          yAxisIndex: 0,
+          value:[]
+        }
+        for(let k in ls[i]){
+          let obj1 = {
+            text: new Date(ls[i][k].pointTime * 1000).formatDate("yyyy-MM-dd hh:mm:ss"),
+            value:ls[i][k].pointValue
+          }
+          obj.value.push(obj1)
+        }
+        this.infols.push(obj)
+      }
+      // let obj = {
+      //   title: "日发电量",
+      //   yAxisIndex: 0,
+      //   value:[
+
+      //   ]
+      // }
+      // this.infols = data.data.ls
     },
     show: function () {
       this.showMe = true;

src/views/HealthControl/infotrack.vue

@@ -292,6 +292,24 @@ export default {
      this.form = this.formdata;
      console.warn(this.form);
      console.warn(this.statu(this.form));
+     this.form.tjss = this.form.tjss
+        ? new Date(this.form.tjss).formatDate("yyyy-MM-dd hh:mm:ss")
+        : null;
+      this.form.prodtdepttime = this.form.prodtdepttime
+        ? new Date(this.form.prodtdepttime).formatDate("yyyy-MM-dd hh:mm:ss")
+        : null;
+      this.form.departuretime = this.form.departuretime
+        ? new Date(this.form.departuretime).formatDate("yyyy-MM-dd hh:mm:ss")
+        : null;
+      this.form.arrivaltime = this.form.arrivaltime
+        ? new Date(this.form.arrivaltime).formatDate("yyyy-MM-dd hh:mm:ss")
+        : null;
+      this.form.repairedtime = this.form.repairedtime
+        ? new Date(this.form.repairedtime).formatDate("yyyy-MM-dd hh:mm:ss")
+        : null;
+      this.form.checktime = this.form.checktime
+        ? new Date(this.form.checktime).formatDate("yyyy-MM-dd hh:mm:ss")
+        : null;
   },
   // 函数
   methods: {
@@ -328,31 +346,6 @@ export default {
       }
     },
   },
-  watch: {
-    data(value) {
-      // this.form = value;
-      // console.warn(this.statu(value));
-      // console.warn(this.form);
-      this.form.tjss = value.tjss
-        ? new Date(value.tjss).formatDate("yyyy-MM-dd hh:mm:ss")
-        : "";
-      this.form.prodtdepttime = value.prodtdepttime
-        ? new Date(value.prodtdepttime).formatDate("yyyy-MM-dd hh:mm:ss")
-        : "";
-      this.form.departuretime = value.departuretime
-        ? new Date(value.departuretime).formatDate("yyyy-MM-dd hh:mm:ss")
-        : "";
-      this.form.arrivaltime = value.arrivaltime
-        ? new Date(value.arrivaltime).formatDate("yyyy-MM-dd hh:mm:ss")
-        : "";
-      this.form.repairedtime = value.repairedtime
-        ? new Date(value.repairedtime).formatDate("yyyy-MM-dd hh:mm:ss")
-        : "";
-      this.form.checktime = value.checktime
-        ? new Date(value.checktime).formatDate("yyyy-MM-dd hh:mm:ss")
-        : "";
-    },
-  },
 };
 </script>
 

src/views/HealthControl/infotrack2.vue

@@ -1,9 +1,13 @@
 <template>
   <div class="track-info">
     <div class="form-info">
-       <div class="work-flow">
+      <div class="work-flow">
         <div class="work-flow-line"></div>
-        <div :class="['work-flow-item', item.name == statu(form) ? 'active' : '']" v-for="(item, i) in svgarr" :key="i">
+        <div
+          :class="['work-flow-item', item.name == statu(form) ? 'active' : '']"
+          v-for="(item, i) in svgarr"
+          :key="i"
+        >
           <div class="work-flow-icon-item">
             <div class="work-flow-icon-o"></div>
             <div class="work-flow-icon-i"></div>
@@ -14,7 +18,7 @@
           <div class="work-flow-text">{{ item.name }}</div>
         </div>
       </div>
-       <div class="form-body">
+      <div class="form-body">
         <el-form ref="form" :model="form" label-width="120px">
           <el-row>
             <el-col :span="12">
@@ -27,10 +31,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="风机：">
-                <el-input
-                  v-model="form.wtId"
-                  placeholder="风机名称"
-                ></el-input>
+                <el-input v-model="form.wtId" placeholder="风机名称"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -180,71 +181,244 @@
       <div class="white">评价</div>
       <div class="evaluate-item">
         <div class="evaluate-label">任务分配时长</div>
-        <el-input-number class="input-number" v-model="form.rwfpsc" :controls="false" controls-position="right" :min="0" :max="1000"></el-input-number>
+        <el-input-number
+          class="input-number"
+          v-model="form.rwfpsc"
+          :controls="false"
+          controls-position="right"
+          :min="0"
+          :max="1000"
+        ></el-input-number>
         <div class="evaluate-unit">min</div>
       </div>
       <div class="evaluate-item">
         <div class="evaluate-label">任务分配平均时长</div>
-        <el-input-number class="input-number" v-model="form.rwfppjsc" :controls="false" controls-position="right" :min="0" :max="1000"></el-input-number>
+        <el-input-number
+          class="input-number"
+          v-model="form.rwfppjsc"
+          :controls="false"
+          controls-position="right"
+          :min="0"
+          :max="1000"
+        ></el-input-number>
         <div class="evaluate-unit">min</div>
       </div>
       <div class="evaluate-item">
         <div class="evaluate-label">到达现场时长</div>
-        <el-input-number class="input-number" v-model="form.ddxcsc" :controls="false" controls-position="right" :min="0" :max="1000"></el-input-number>
+        <el-input-number
+          class="input-number"
+          v-model="form.ddxcsc"
+          :controls="false"
+          controls-position="right"
+          :min="0"
+          :max="1000"
+        ></el-input-number>
         <div class="evaluate-unit">min</div>
       </div>
       <div class="evaluate-item">
         <div class="evaluate-label">到达现场平均时长</div>
-        <el-input-number class="input-number" v-model="form.ddxcpjsc" :controls="false" controls-position="right" :min="0" :max="1000"></el-input-number>
+        <el-input-number
+          class="input-number"
+          v-model="form.ddxcpjsc"
+          :controls="false"
+          controls-position="right"
+          :min="0"
+          :max="1000"
+        ></el-input-number>
         <div class="evaluate-unit">min</div>
       </div>
       <div class="evaluate-item">
         <div class="evaluate-label">缺陷处理时长</div>
-        <el-input-number class="input-number" v-model="form.qxclsc" :controls="false" controls-position="right" :min="0" :max="1000"></el-input-number>
+        <el-input-number
+          class="input-number"
+          v-model="form.qxclsc"
+          :controls="false"
+          controls-position="right"
+          :min="0"
+          :max="1000"
+        ></el-input-number>
         <div class="evaluate-unit">min</div>
       </div>
       <div class="evaluate-item">
         <div class="evaluate-label">缺陷处理平均时长</div>
-        <el-input-number class="input-number" v-model="form.qxclpjsc" :controls="false" controls-position="right" :min="0" :max="1000"></el-input-number>
+        <el-input-number
+          class="input-number"
+          v-model="form.qxclpjsc"
+          :controls="false"
+          controls-position="right"
+          :min="0"
+          :max="1000"
+        ></el-input-number>
         <div class="evaluate-unit">min</div>
       </div>
       <div class="evaluate-item">
         <div class="evaluate-label">验收时长</div>
-        <el-input-number class="input-number" v-model="form.yssc" :controls="false" controls-position="right" :min="0" :max="1000"></el-input-number>
+        <el-input-number
+          class="input-number"
+          v-model="form.yssc"
+          :controls="false"
+          controls-position="right"
+          :min="0"
+          :max="1000"
+        ></el-input-number>
         <div class="evaluate-unit">min</div>
       </div>
       <div class="evaluate-item">
         <div class="evaluate-label">验收平均时长</div>
-        <el-input-number class="input-number" v-model="form.yspjsc" :controls="false" controls-position="right" :min="0" :max="1000"></el-input-number>
+        <el-input-number
+          class="input-number"
+          v-model="form.yspjsc"
+          :controls="false"
+          controls-position="right"
+          :min="0"
+          :max="1000"
+        ></el-input-number>
         <div class="evaluate-unit">min</div>
       </div>
     </div>
     <div class="tabs">
       <div class="tab-box">
-        <div class="tab-item" v-for="(tab, index) of tabs" :key="index" :class="{ active: activeTab == index }" @click="selectTab(index)">
-          <span class="svg-icon svg-icon-md" :class="activeTab == index ? 'svg-icon-green' : 'svg-icon-write'">
+        <div
+          class="tab-item"
+          v-for="(tab, index) of tabs"
+          :key="index"
+          :class="{ active: activeTab == index }"
+          @click="selectTab(tab,index)"
+        >
+          <span
+            class="svg-icon svg-icon-md"
+            :class="activeTab == index ? 'svg-icon-green' : 'svg-icon-write'"
+          >
             <SvgIcon :svgid="tab.icon"></SvgIcon>
           </span>
           <span>{{ tab.text }}</span>
         </div>
       </div>
     </div>
-    <defect-elimination-tracking ref="det" :show="false" :formdata='formdata'></defect-elimination-tracking>
+    <defect-elimination-tracking
+      ref="det"
+      :show="false"
+      :formdata="formdata"
+    ></defect-elimination-tracking>
+  <div class="dialog-box">  
+    <el-dialog
+      title="消缺历史"
+      v-model="dialogVisible"
+       width="1200px" height='800px' custom-class="modal" :close-on-click-modal="false"
+      :before-close="handleClose"
+    >
+    <div class="diamain">
+      <div class="left">
+        <el-tree
+        :data="data"
+        :props="defaultProps"
+        node-key="id"
+        :default-expand-all="true"
+        custom-class="modal" 
+        @node-click="handleNodeClick"
+      ></el-tree>
+      </div>
+      <div class="right">
+        <div class="table-box">
+        <ComTable :data="tableData" height="700px"></ComTable>
+      </div>
+      </div>
+    </div>
+    </el-dialog>
+     </div> 
   </div>
 </template>
 
 <script>
+import ComTable from "@com/coms/table/table.vue";
 import SvgIcon from "@com/coms/icon/svg-icon.vue";
-import DefectEliminationTracking from "../HealthControl/defect-elimination-tracking.vue";  //手环监控
+import DefectEliminationTracking from "../HealthControl/defect-elimination-tracking.vue"; //手环监控
 export default {
   components: {
-    SvgIcon,DefectEliminationTracking
+    SvgIcon,ComTable,
+    DefectEliminationTracking,
   },
-   props: {
-    data: Object,
+  props: {
+    formdata: Object,
   },
   data() {
     return {
+      location:'',
+      tableData:{
+          column: [
+          { 
+            name: "消缺描述",
+            field: "xqms",
+            is_light: false
+          },
+          { 
+            name: "消缺人员",
+            field: "xqry",
+            is_light: false
+          },
+          { 
+            name: "消缺时间",
+            field: "xqsj",
+            is_light: false
+          },
+          { 
+            name: "更换部件",
+            field: "ghbj",
+            is_light: false
+          },
+          { 
+            name: "更换原因",
+            field: "ghyy",
+            is_light: false
+          },
+          { 
+            name: "更换数量",
+            field: "ghsl",
+            is_light: false
+          },
+        ],
+        data: [],
+      },
+       data: [{
+          label: '一级 1',
+          children: [{
+            label: '二级 1-1',
+            children: [{
+              label: '三级 1-1-1'
+            }]
+          }]
+        }, {
+          label: '一级 2',
+          children: [{
+            label: '二级 2-1',
+            children: [{
+              label: '三级 2-1-1'
+            }]
+          }, {
+            label: '二级 2-2',
+            children: [{
+              label: '三级 2-2-1'
+            }]
+          }]
+        }, {
+          label: '一级 3',
+          children: [{
+            label: '二级 3-1',
+            children: [{
+              label: '三级 3-1-1'
+            }]
+          }, {
+            label: '二级 3-2',
+            children: [{
+              label: '三级 3-2-1'
+            }]
+          }]
+        }],
+        defaultProps: {
+          children: 'children',
+          label: 'label'
+        },
+      dialogVisible:false,
       tabs: [
         {
           icon: "svg-gis",
@@ -258,6 +432,10 @@ export default {
           icon: "svg-jk",
           text: "监控视频",
         },
+        {
+          icon: "svg-jk",
+          text: "消缺历史",
+        },
       ],
       activeTab: 0,
       svgarr: [
@@ -327,22 +505,44 @@ export default {
         qxclpjsc: 0,
         yssc: 0,
         yspjsc: 0,
-        workHours: 0
+        workHours: 0,
       },
     };
   },
   created() {
-     this.form = this.formdata;
-     console.warn(this.form);
-     console.warn(this.statu(this.form));
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.form = this.data;
-    });
+    this.form = this.formdata;
+    console.warn(this.form);
+    console.warn(this.statu(this.form));
+    this.form.tjss = this.form.tjss
+      ? new Date(this.form.tjss).formatDate("yyyy-MM-dd hh:mm:ss")
+      : null;
+    this.form.prodtdepttime = this.form.prodtdepttime
+      ? new Date(this.form.prodtdepttime).formatDate("yyyy-MM-dd hh:mm:ss")
+      : null;
+    this.form.departuretime = this.form.departuretime
+      ? new Date(this.form.departuretime).formatDate("yyyy-MM-dd hh:mm:ss")
+      : null;
+    this.form.arrivaltime = this.form.arrivaltime
+      ? new Date(this.form.arrivaltime).formatDate("yyyy-MM-dd hh:mm:ss")
+      : null;
+    this.form.repairedtime = this.form.repairedtime
+      ? new Date(this.form.repairedtime).formatDate("yyyy-MM-dd hh:mm:ss")
+      : null;
+    this.form.checktime = this.form.checktime
+      ? new Date(this.form.checktime).formatDate("yyyy-MM-dd hh:mm:ss")
+      : null;
   },
+
   // 函数
   methods: {
+    handleNodeClick(data) {
+      this.location = data.id
+        console.log(data);
+        this.searchTab(data.id)
+      },
+    DateformatDate(val) {
+      return new Date(val).formatDate("yyyy-MM-dd hh:mm:ss");
+    },
     showDet() {
       this.$refs.det.show();
     },
@@ -362,34 +562,74 @@ export default {
         data.status == "开风机工作票"
       ) {
         return "消缺单已下达";
-      } else if (null == data.status || data.status == "流程未启动" || data.status == "流程未启用") {
+      } else if (
+        null == data.status ||
+        data.status == "流程未启动" ||
+        data.status == "流程未启用"
+      ) {
         return "流程未启动";
-      }
-      else{
+      } else {
         return "流程未启动";
       }
     },
-    selectTab: function (index) {
+    async searchH(){
+      const {data} = await this.API.requestData({
+        method: "POST",
+        subUrl: "/recommen/findLocationTreeByWtId",
+        data: {
+          wtId: this.form.wtId ,
+        },
+      })
+      this.dialogVisible =true
+      this.data = data.data
+      this.location = data.data[0].id
+      console.warn(data);
+      this.searchTab()
+    },
+    async searchTab(){
+      const {data} = await this.API.requestData({
+        method: "POST",
+        subUrl: "/recommen/findWobugeqByLocation",
+        data: {
+          tablepar: {
+            pageNum:1,
+            pageSize:10,
+          },
+          location:this.location
+        },
+      })
+      console.warn(data);
+      this.tableData.data= data.data
+    },
+    selectTab: function (tab,index) {
       this.activeTab = index;
-      if(index == 1){
-        this.showDet()
+      if (index == 1) {
+        this.showDet();
+      }
+      if(tab.text == '消缺历史'){
+        this.searchH()
       }
-    },
-  },
-  watch: {
-    data(value) {
-      this.form.tjss = value.tjss?new Date(value.tjss).formatDate("yyyy-MM-dd hh:mm:ss"):""
-      this.form.prodtdepttime = value.prodtdepttime?new Date(value.prodtdepttime).formatDate("yyyy-MM-dd hh:mm:ss"):""
-      this.form.departuretime = value.departuretime?new Date(value.departuretime).formatDate("yyyy-MM-dd hh:mm:ss"):""
-      this.form.arrivaltime = value.arrivaltime?new Date(value.arrivaltime).formatDate("yyyy-MM-dd hh:mm:ss"):""
-      this.form.repairedtime = value.repairedtime?new Date(value.repairedtime).formatDate("yyyy-MM-dd hh:mm:ss"):""
-      this.form.checktime = value.checktime?new Date(value.checktime).formatDate("yyyy-MM-dd hh:mm:ss"):"" 
     },
   },
 };
 </script>
 
 <style lang="less">
+.diamain{
+  width: 100%;
+  height: 700px;
+  overflow:hidden;
+  display: flex;
+  justify-content: space-between;
+  .left{
+    width: 30%;
+    overflow-y: auto;
+  }
+  .right{
+    width: 68%;
+  }
+}
+
 .track-info {
   display: flex;
   .form-info {
@@ -422,28 +662,32 @@ export default {
         &.active {
           .work-flow-icon-item {
             .work-flow-icon-o {
-                border: 1px solid @green;
-                opacity: 0.4;
-              }
+              border: 1px solid @green;
+              opacity: 0.4;
+            }
 
-              .work-flow-icon-i {
-                border: 2px solid @green;
-                background: linear-gradient(to bottom, #1F2B2B 0%,#1F2B2B 20%,@green 100%);
-              }
+            .work-flow-icon-i {
+              border: 2px solid @green;
+              background: linear-gradient(
+                to bottom,
+                #1f2b2b 0%,
+                #1f2b2b 20%,
+                @green 100%
+              );
+            }
 
-              .svg-icon {
-                svg {
-                  use {
-                    fill: @green;
-                  }
+            .svg-icon {
+              svg {
+                use {
+                  fill: @green;
                 }
               }
+            }
           }
 
           .work-flow-text {
             color: @green;
           }
-          
         }
 
         .work-flow-icon-item {
@@ -458,7 +702,7 @@ export default {
             width: 60px;
             height: 60px;
             border-radius: 50%;
-            border: 1px solid #B3BDC0;
+            border: 1px solid #b3bdc0;
             opacity: 0.4;
           }
 
@@ -480,7 +724,12 @@ export default {
             height: 50px;
             border-radius: 50%;
             border: 2px solid #606769;
-            background: linear-gradient(to bottom, #1F2B2B 0%,#1F2B2B 20%,#606769 100%);
+            background: linear-gradient(
+              to bottom,
+              #1f2b2b 0%,
+              #1f2b2b 20%,
+              #606769 100%
+            );
           }
 
           .svg-icon {
@@ -490,21 +739,20 @@ export default {
             top: calc(50% - 10px);
             left: calc(50% - 13px);
             svg {
-               width: 26px;
+              width: 26px;
               height: 26px;
               use {
                 fill: @gray-l;
               }
             }
           }
-          
         }
 
         .work-flow-text {
-            color: @gray-l;
-            margin-top: 8px;
-            font-size: @fontsize-s;
-          }
+          color: @gray-l;
+          margin-top: 8px;
+          font-size: @fontsize-s;
+        }
       }
     }
   }
@@ -535,8 +783,6 @@ export default {
         margin: 0 16px;
       }
     }
-
-    
   }
 
   .tabs {
@@ -546,45 +792,45 @@ export default {
     border-left: 1px solid #53626833;
 
     .tab-box {
-    margin: 1.852vh 2.778vh;
-    display: inline-block;
-    z-index: 2;
-    position: relative;
-    margin: 26px 0 0 20px;
+      margin: 1.852vh 2.778vh;
+      display: inline-block;
+      z-index: 2;
+      position: relative;
+      margin: 26px 0 0 20px;
 
-    .tab-item {
-      display: flex;
-      align-items: center;
-      // justify-content: center;
-      font-size: @fontsize-l;
-      cursor: pointer;
-      // width: 120px;
-      padding: 8px;
-      margin-bottom: 16px;
+      .tab-item {
+        display: flex;
+        align-items: center;
+        // justify-content: center;
+        font-size: @fontsize-l;
+        cursor: pointer;
+        // width: 120px;
+        padding: 8px;
+        margin-bottom: 16px;
 
-      &.active {
-        color: @green;
-        position: relative;
-        background-image: @greenLinearTop;
+        &.active {
+          color: @green;
+          position: relative;
+          background-image: @greenLinearTop;
 
-        &::after {
-          content: "";
-          position: absolute;
-          width: 100%;
-          height: 5px;
-          border: 1px solid @green;
-          border-top: 0;
-          left: 0;
-          bottom: 0;
-          box-sizing: border-box;
+          &::after {
+            content: "";
+            position: absolute;
+            width: 100%;
+            height: 5px;
+            border: 1px solid @green;
+            border-top: 0;
+            left: 0;
+            bottom: 0;
+            box-sizing: border-box;
+          }
         }
-      }
 
-      .svg-icon {
-        margin-right: 16px;
+        .svg-icon {
+          margin-right: 16px;
+        }
       }
     }
   }
-  }
 }
 </style>

src/views/NewPages/znzhfx.vue

@@ -1,86 +1,61 @@
 <template>
   <div class="znzhfx">
     <el-scrollbar height="1022px">
-      <el-row>
-        <el-col :span="12">
-          <el-row>
-            <el-col :span="24">
-              <div class="query mg-b-8">
-                <div class="query-items">
-                  <div class="query-item">
-                    <div class="lable">风场：</div>
-                    <div class="search-input">
-                      <el-select
-                        v-model="value1"
-                        clearable
-                        placeholder="请选择风场"
-                        popper-class="select"
-                      >
-                        <el-option
-                          v-for="item in options"
-                          :key="item.value"
-                          :label="item.label"
-                          :value="item.value"
-                        >
-                        </el-option>
-                      </el-select>
-                    </div>
-                  </div>
-                  <div class="query-item">
-                    <div class="lable">日期：</div>
-                    <div class="search-input">
-                      <el-date-picker
-                        v-model="value4"
-                        type="date"
-                        placeholder="选择日期"
-                        popper-class="date-select"
-                      >
-                      </el-date-picker>
-                    </div>
-                  </div>
-                  <div class="query-item">
-                    <button class="btn" type="button">
-                      <span>计算</span>
-                    </button>
-                    <button class="btn" type="button">
-                      <span>导出</span>
-                    </button>
-                  </div>
-                </div>
-              </div>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
       <el-row :gutter="20" class="table-panel">
         <el-col :span="24">
-          <div class="table-title">
-            麻黄山风电场年05月单台机组运行指标性能分析
-          </div>
-          <Table :data="tableData1" :canScroll="false" />
           <div class="back">
             <button class="btn" type="button">
               <span>返回</span>
             </button>
           </div>
-        </el-col>
-      </el-row>
-      <el-row :gutter="20" class="table-panel">
-        <el-col :span="24">
           <div class="table-title">
-            麻黄山01号风机2021年05月运行指标性能分析
+            {{ wtId }}号风机{{ year }}年{{ month }}月运行指标性能分析
           </div>
           <Table :data="tableData2" :canScroll="false" />
         </el-col>
       </el-row>
       <div class="mg-b-16 anliz-des">
         <div>
-          麻黄山01号风机2021年05月运行指标性能分析内容内容内容内容内容内容，麻黄山01号风机2021年05月运行指标性能分析内容内容内容内容内容内容。
-        </div>
-        <div>
-          麻黄山01号风机2021年05月运行指标性能分析内容内容内容内容内容内容，麻黄山01号风机2021年05月运行指标性能分析内容内容内容内容内容内容麻黄山01号风机2021年05月运行指标性能分析内容内容内容内容内容内容，麻黄山01号风机2021年05
-          月运行指标性能分析内容内容内容内容内容内容麻黄山01号风机2021年05月运行指标性能分析内容内容内容内容内容内容，麻黄山01号风机2021年05月运行指标性能分析内容内容内容内容内容内容麻黄山01号风机2021年05月运行指标性能分析内容内
-          容内容内容内容内容，麻黄山01号风机2021年05月运行指标性能分析内容内容内容内容内容内容。
+          本月{{ wtId }}号风机风机设备利用小时数{{
+            tableVal.byzb && tableVal.byzb.lyxs
+          }}小时、同比{{
+            tableVal.tpzb && tableVal.tpzb.lyxs
+          }}小时，设备可利用率{{
+            tableVal.byzb && tableVal.byzb.sbklyl
+          }}%、同比{{ tableVal.tpzb && tableVal.tpzb.sbklyl }}}%，
+          等效可用系数{{ tableVal.byzb && tableVal.byzb.dxklyxs }}%、同比{{
+            tableVal.tpzb && tableVal.tpzb.dxklyxs
+          }}}%，静风频率达到{{ tableVal.byzb && tableVal.byzb.jfpl }}%、同比{{
+            tableVal.tpzb && tableVal.tpzb.jfpl
+          }}}%， 机组功率特性一致性系数达到{{
+            tableVal.byzb && tableVal.byzb.glyzxxs
+          }}%、同比{{ tableVal.tpzb && tableVal.tpzb.glyzxxs }}}%。
+          <br />
+          {{ wtId }}风机{{ year }}年{{ month }}月平均风速{{
+            tableVal.byzb && tableVal.byzb.fs
+          }}m/s、同比{{ tableVal.tpzb && tableVal.tpzb.fs }}m/s，
+          小风平均切入风速{{ tableVal.byzb && tableVal.byzb.xfqr }}m/s、同比{{
+            tableVal.tpzb && tableVal.tpzb.xfqr
+          }}m/s， 有效风时数{{
+            tableVal.byzb && tableVal.byzb.yxfss
+          }}小时、同比{{ tableVal.tpzb && tableVal.tpzb.yxfss }}小时，
+          实际发电电量{{ tableVal.byzb && tableVal.byzb.fdl }}万kwh、同比{{
+            tableVal.tpzb && tableVal.tpzb.fdl
+          }}万kwh，同比增长率{{ tableVal.tbzb && tableVal.tbzb.fdl }}%，
+          各项损失电量累计{{
+            tableVal.byzb && tableVal.byzb.llfdl - tableVal.byzb.fdl
+          }}万kwh、同比{{
+            tableVal.tpzb && tableVal.tpzb.llfdl - tableVal.tpzb.fdl
+          }}万kwh，同比增长率{{
+            tableVal.tbzb && tableVal.byzb.llfdl - tableVal.tbzb.fdl
+          }}%， 理论发电量{{
+            tableVal.byzb && tableVal.byzb.llfdl
+          }}万kwh，实际发电量与理论发电量相差{{
+            tableVal.tbzb && tableVal.tbzb.llfdl
+          }}万kwh。
+          <br />
+          本月静风频率
+          %，月累计静风时长0.00小时，月累计待机小时116.44小时，待机占比48.51%。
         </div>
       </div>
       <div class="mg-b-16">
@@ -120,146 +95,32 @@ export default {
   },
   data() {
     return {
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕",
-        },
-        {
-          value: "选项2",
-          label: "双皮奶",
-        },
-        {
-          value: "选项3",
-          label: "蚵仔煎",
-        },
-        {
-          value: "选项4",
-          label: "龙须面",
-        },
-        {
-          value: "选项5",
-          label: "北京烤鸭",
-        },
-      ],
-      tableData1: {
-        column: [
-          {
-            name: " ",
-            field: "name",
-            width: "3%",
-          },
-          {
-            name: "实际发电量（万kWh）",
-            field: "v1",
-          },
-          {
-            name: "理论发电量（万kWh）",
-            field: "v2",
-          },
-          {
-            name: "设备利用小时数（h）",
-            field: "v3",
-          },
-          {
-            name: "设备科利用率（%）",
-            field: "v4",
-          },
-          {
-            name: "等效可用系数（%）",
-            field: "v5",
-          },
-          {
-            name: "平均风速（m/s）",
-            field: "v6",
-          },
-          {
-            name: "小风切入风速（m/s）",
-            field: "v7",
-          },
-        ],
-        data: [
-          {
-            name: "1",
-            v1: "麻黄山01号风机",
-            v2: "174785",
-            v3: "174789.01",
-            v4: "100",
-            v5: "100",
-            v6: "3.46",
-            v7: "3.78",
-          },
-          {
-            name: "2",
-            v1: "麻黄山01号风机",
-            v2: "174785",
-            v3: "174789.01",
-            v4: "100",
-            v5: "100",
-            v6: "3.46",
-            v7: "3.78",
-          },
-          {
-            name: "3",
-            v1: "麻黄山01号风机",
-            v2: "174785",
-            v3: "174789.01",
-            v4: "100",
-            v5: "100",
-            v6: "3.46",
-            v7: "3.78",
-          },
-          {
-            name: "4",
-            v1: "麻黄山01号风机",
-            v2: "174785",
-            v3: "174789.01",
-            v4: "100",
-            v5: "100",
-            v6: "3.46",
-            v7: "3.78",
-          },
-          {
-            name: "5",
-            v1: "麻黄山01号风机",
-            v2: "174785",
-            v3: "174789.01",
-            v4: "100",
-            v5: "100",
-            v6: "3.46",
-            v7: "3.78",
-          },
-          {
-            name: "6",
-            v1: "麻黄山01号风机",
-            v2: "174785",
-            v3: "174789.01",
-            v4: "100",
-            v5: "100",
-            v6: "3.46",
-            v7: "3.78",
-          },
-          {
-            name: "7",
-            v1: "麻黄山01号风机",
-            v2: "174785",
-            v3: "174789.01",
-            v4: "100",
-            v5: "100",
-            v6: "3.46",
-            v7: "3.78",
-          },
-          {
-            name: "8",
-            v1: "麻黄山01号风机",
-            v2: "174785",
-            v3: "174789.01",
-            v4: "100",
-            v5: "100",
-            v6: "3.46",
-            v7: "3.78",
-          },
-        ],
+      wtId:'',
+      year:'',
+      month:'',
+      tableVal:'',
+      tabrow:{
+         "fdl":'实际发电量（万千瓦时）',
+         "fs":'平均风速（m/s）',
+         "gzss":'故障损失电量（万千瓦时）',
+         "jxss":'计划检修损失电量（万千瓦时）',
+         "xdss":'调度限电损失电量（万千瓦时）',
+         "xnss":'性能未达标损失电量（万千瓦时）',
+         "slss":'受累损失电量（万千瓦时）',
+         "llfdl":'理论发电量（万千瓦时）',
+         "gzxs":'故障停运时间（小时）',
+         "jxxs":'检修停运时间（小时）',
+         "tjxs":'待机时间（小时）',
+         "zdxs":'通讯中断时间（小时）',
+         "yxxs":'并网时间（小时）',
+         "lyxs":'设备利用小时（小时）',
+         "sbklyl":'设备利用率（%）',
+         "dxklyxs":'等效可用系数（%）',
+         "xfqr":'小风切入风速（m/s）',
+         "glyzxxs":'功率特性一致性系数（%）',
+         "yxfss":'有效风时数（小时）',
+         "xfqrhgl":'小风切入合格率（%）',
+         "jfpl":'静风频率（%）',
       },
       tableData2: {
         column: [
@@ -269,23 +130,23 @@ export default {
           },
           {
             name: "本月值",
-            field: "v1",
+            field: "byzb",
           },
           {
             name: "去年同期",
-            field: "v2",
+            field: "hqzb",
           },
           {
             name: "同比增长率（%）",
-            field: "v3",
+            field: "hbzb",
           },
           {
             name: "环比",
-            field: "v4",
+            field: "tqzb",
           },
           {
             name: "环比端值（%）",
-            field: "v5",
+            field: "tbzb",
           },
         ],
         data: [
@@ -297,62 +158,6 @@ export default {
             v4: "22322",
             v5: "-36",
           },
-          {
-            name: "实际发电量（万kWh）",
-            v1: "174785",
-            v2: "317885",
-            v3: "-45",
-            v4: "22322",
-            v5: "-36",
-          },
-          {
-            name: "实际发电量（万kWh）",
-            v1: "174785",
-            v2: "317885",
-            v3: "-45",
-            v4: "22322",
-            v5: "-36",
-          },
-          {
-            name: "实际发电量（万kWh）",
-            v1: "174785",
-            v2: "317885",
-            v3: "-45",
-            v4: "22322",
-            v5: "-36",
-          },
-          {
-            name: "实际发电量（万kWh）",
-            v1: "174785",
-            v2: "317885",
-            v3: "-45",
-            v4: "22322",
-            v5: "-36",
-          },
-          {
-            name: "实际发电量（万kWh）",
-            v1: "174785",
-            v2: "317885",
-            v3: "-45",
-            v4: "22322",
-            v5: "-36",
-          },
-          {
-            name: "实际发电量（万kWh）",
-            v1: "174785",
-            v2: "317885",
-            v3: "-45",
-            v4: "22322",
-            v5: "-36",
-          },
-          {
-            name: "实际发电量（万kWh）",
-            v1: "174785",
-            v2: "317885",
-            v3: "-45",
-            v4: "22322",
-            v5: "-36",
-          },
         ],
       },
       bar1Data: [
@@ -509,7 +314,139 @@ export default {
       ],
     };
   },
-  created() {},
+  created() {
+    this.wtId = this.$route.params.wtId;
+    this.year = this.$route.params.year;
+    this.month = this.$route.params.month;
+    this.search()
+    this.searchChart()
+  },
+  filters:{
+    tabrowfil(val){
+      return this.tabrow[val]
+    }
+  },
+  methods:{
+    async search() {
+      const { data } = await this.API.requestData({
+        subUrl: "/singleanalysis/singleanalysisSub",
+        method:'POST',
+        data:{
+             wtId : this.wtId,
+             year : this.year,
+             month : this.month,
+        }
+      });
+      console.warn(data.data);
+      const res = data.data
+      this.tableVal = data.data
+      console.warn(this.tableVal);
+      let arr=[];
+      let keyarr = Object.keys(res.byzb)
+      console.warn(keyarr);
+      let jarr = Object.keys(res)
+      for(let k of keyarr){
+        let obj={
+          'name' : k,
+          'byzb' : null,
+          'hbzb' : null,
+          'hqzb' : null,
+          'tbzb' : null,
+          'tqzb' : null,
+        }
+        for(let i in res){
+          for(let j of jarr){
+            if(i == j){
+            obj[j] = res[i][k]
+          }
+          }
+        }
+        arr.push(obj)
+      }
+      arr= arr.filter((e)=>{
+        return e.name != 'id' &&  e.name != 'windturbineid' && e.name != 'windturbineName' 
+        && e.name != 'windPowerStationId' && e.name != 'windPowerStationName' 
+        && e.name != 'recorddate' && e.name != 'swdl'&& e.name != 'gwdl' 
+        && e.name != 'rlxs' && e.name != 'fjrl'
+      })
+      arr.forEach(e=>{
+        e.name = this.tabrow[e.name]
+      })
+      this.tableData2.data = arr
+      console.warn(arr);
+    },
+     async searchChart() {
+      const { data } = await this.API.requestData({
+        subUrl: "/singleanalysis/singleanalysisChart",
+        method:'POST',
+        data:{
+             wtId : this.wtId,
+             year : this.year,
+             month : this.month,
+        }
+      });
+      console.warn(data.data);
+      const res = data.data
+      let arrff=[];
+      res.ff.forEach(e => {
+        let obj={
+          text: new Date(e.recorddate ).formatDate("MM-dd"),
+          value:e.fdl,
+        }
+        arrff.push(obj)
+      });
+      this.bar1Data[0].value = arrff
+      ////
+      let arrjdjf=[];
+      let arrjddj=[];
+      res.jd.forEach(e => {
+        let obj={
+          text: new Date(e.recorddate ).formatDate("MM-dd"),
+          value:e.jfpl,
+        }
+        let obj1={
+          text: new Date(e.recorddate ).formatDate("MM-dd"),
+          value:e.tjxs,
+        }
+        arrjdjf.push(obj)
+        arrjddj.push(obj1)
+      });
+      let obj={
+        title: "静风时长(小时)",
+        smooth: false,
+        value:arrjdjf
+      }
+      let obj1={
+        title: "待机时长(小时)",
+        smooth: false,
+        value:arrjddj
+      }
+      this.list =[]
+      this.list.push(obj)
+      this.list.push(obj1)
+      console.warn(this.list);
+      /////
+      let arrwsarea=[];
+      let arrwslegend=["限电损失电量",
+          "性能未达标损失电量",
+          "检修损失电量",
+          "故障损失电量",
+          "受累损失电量" ];
+      let arrwsdata=[];
+      res.ws.forEach(e => {
+        let arr=[]
+        for(let k of ['xdss','xnss','jxss','gzss','slss']){
+          arr.push(e[k])
+        }
+        arrwsdata.push(arr)
+        arrwsarea.push(new Date(e.recorddate ).formatDate("MM-dd"))
+      });
+      this.bar2data.area = arrwsarea
+      this.bar2data.legend = arrwslegend
+      this.bar2data.data = arrwsdata
+      console.warn(this.bar2data);
+    },
+  }
 };
 </script>
 
@@ -526,7 +463,7 @@ export default {
     .table-title {
       font-size: 16px;
       text-align: center;
-      color: #FEFEFE;
+      color: #fefefe;
       height: 4.6972vh;
       line-height: 4.6972vh;
     }

src/views/singleAnalysis/index.vue

@@ -61,7 +61,10 @@ export default {
             field: "windturbineName",
             is_num: false,
             is_light: false,
-            sortable: true
+            sortable: true,
+            click(e, row){
+              that.goznzhfx(row)
+            }
           },
           {
             name: "实际发电量(万千瓦时)",
@@ -195,6 +198,10 @@ export default {
 
   // 函数
   methods: {
+    goznzhfx(row){
+      console.warn(row);
+      this.$router.push({path:`/new/znzhfx/${row.windturbineid}/${new Date(this.recorddate).formatDate("yyyy")}/${new Date(this.recorddate).formatDate("MM")}`})
+    },
     // 请求服务
     requestData() {
       let that = this;