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

# Conflicts:
#	src/router/index.js

public/static/config/modeConfig.js

@@ -9,10 +9,10 @@ let baseURL = null;
 let websocketUrl = null;
 
 if (localTest) {
-  baseURL = "http://192.168.10.23:8082/" // 联机调试 - 石林
+  baseURL = "http://192.168.10.12:8082/" // 联机调试 - 石林
   // baseURL = "http://10.155.32.33:9001/" // 联机调试 - 谢生杰
 } else {
-  baseURL = "http://10.155.32.4:8082/" // 正式环境
+  baseURL = "http://192.168.10.12:8082/" // 正式环境
 }
 
 websocketUrl = (baseURL.replace(/http:\/\/|https:\/\//g, "")) + "gyee-websocket";

src/components/arcgis/arcgis.vue

@@ -22,8 +22,8 @@
     import SimpleMarkerSymbol from "@arcgis/core/symbols/SimpleMarkerSymbol";
     import "@arcgis/core/assets/esri/themes/light/main.css";
 
-    const mapUrl = "http://61.161.152.110:12345/arcgis/rest/services/NX_MAP_15/MapServer"; // ArcMap地址
-    // const mapUrl = "http://172.16.6.30:12345/arcgis/rest/services/NX_MAP_15/MapServer"; // ArcMap地址
+    const mapUrl = "http://10.155.32.4:9080/arcgis/rest/services/nxmap/MapServer"; // ArcMap地址
+    // const mapUrl = "http://10.155.32.4:9080/arcgis/rest/services/NX_MAP_15/MapServer"; // ArcMap地址
     let basemap = null;
     let map = null;
     let view = null;

src/components/coms/table/table.vue

@@ -13,7 +13,7 @@
           <td
             v-for="(col, i) of data.column"
             :key="i"
-            :style="{ width: col.width }"
+            :style="{ width: col.width, color: row.color }"
             :class="{ light: hoverRow == row || hoverCol == col, num: col.is_num, 'always-light': col.is_light || row.is_light }"
             @mouseenter="hover(row, col)"
             @mouseleave="leave()"

src/views/NewPages/alarm-center.vue

@@ -2,38 +2,49 @@
   <div class="alarm-center">
     <div class="action-bar">
       <div class="selections mg-b-16">
-        <div class="item" @click="tabSelect(0)" :class="{ active: tabIndex == 0 }">发电机</div>
+        <div v-for="(tabItem, tabIndex) in tabLists" :key="tabItem.type" class="item" :class="{ active: tabIndex == cureent }" @click="tabSelect(tabItem.type, tabIndex)" >
+          {{ tabItem.name }}
+        </div>
+        <!-- <div class="item" @click="tabSelect(0)" :class="{ active: tabIndex == 0 }">发电机</div>
         <div class="item" @click="tabSelect(1)" :class="{ active: tabIndex == 1 }">齿轮箱</div>
         <div class="item" @click="tabSelect(2)" :class="{ active: tabIndex == 2 }">变桨系统</div>
         <div class="item" @click="tabSelect(3)" :class="{ active: tabIndex == 3 }">液压站</div>
         <div class="item" @click="tabSelect(3)" :class="{ active: tabIndex == 4 }">风机震动</div>
-        <div class="item" @click="tabSelect(3)" :class="{ active: tabIndex == 5 }">其他参数</div>
+        <div class="item" @click="tabSelect(3)" :class="{ active: tabIndex == 5 }">其他参数</div> -->
       </div>
       <div class="query mg-b-16">
         <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 v-model="optSelectValue" clearable placeholder="请选择" popper-class="select" @change="handelSelectChange">
+                <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"> </el-option>
               </el-select>
             </div>
           </div>
         </div>
         <div class="query-actions">
-          <button class="btn green">搜索</button>
+          <button class="btn green" @click="handelSelectChange">搜索</button>
         </div>
       </div>
     </div>
     <el-scrollbar>
       <div class="fj">
+        <div class="fj-item" v-for="(item, index) in tableLists" :key="index">
+          <div class="fj-title">风机编号:{{item[0].wtId}}</div>
+          <div class="fj-info">
+            <Table :data="handleTable(item)"></Table>
+          </div>
+        </div>
+      </div>
+      <!-- <div class="fj">
         <div class="fj-item" v-for="index in 25" :key="index">
           <div class="fj-title">风机编号:000</div>
           <div class="fj-info">
             <Table :data="tableData"></Table>
           </div>
         </div>
-      </div>
+      </div> -->
     </el-scrollbar>
   </div>
 </template>
@@ -44,7 +55,70 @@ export default {
   components: { Table },
   data() {
     return {
-      tableData: {
+      cureent: 0,
+      optSelectValue: '',
+      tabLists: [
+        {
+          type: 'fdj',
+          name: '发电机'
+        },
+        {
+          type: 'clx',
+          name: '齿轮箱'
+        },
+        {
+          type: 'bj',
+          name: '变桨系统'
+        },
+        {
+          type: 'yyz',
+          name: '液压站'
+        },
+        {
+          type: 'zd',
+          name: '风机震动'
+        },
+        {
+          type: 'qt',
+          name: '其他参数'
+        }
+      ],
+      // tableData: {
+      //   column: [
+      //     {
+      //       name: "",
+      //       field: "name",
+      //       is_num: false,
+      //       is_light: false,
+      //     },
+      //     {
+      //       name: "",
+      //       field: "value",
+      //       is_num: false,
+      //       is_light: false,
+      //     },
+      //   ],
+      //   data: [
+      //     // {
+      //     //   name: "发电机绕组U1温度",
+      //     //   desc: "1234.56",
+      //     // },
+      //   ],
+      // },
+      tableLists: [],
+      options: [],
+      type: '',
+      timmer: null, // 遮罩开关
+    };
+  },
+  methods: {
+    tabSelect(type, index) {
+      this.cureent = index
+      this.type = type
+      this.getList(true)
+    },
+    handleTable(item) {
+      let tableData = {
         column: [
           {
             name: "",
@@ -54,27 +128,70 @@ export default {
           },
           {
             name: "",
-            field: "desc",
+            field: "value",
             is_num: false,
             is_light: false,
           },
         ],
-        data: [
-          {
-            name: "发电机绕组U1温度",
-            desc: "1234.56",
+        data: item
+      }
+      return tableData
+    },
+    handelSelectChange() {
+      this.getList(true)
+    },
+    getList(showLoading) {
+      let _this = this
+      _this.API.requestData({
+          showLoading,
+          method: "POST",
+          subUrl: "/temperature/getTemperatureList",
+          data:{
+            type: this.type,
+            wpId: this.optSelectValue
           },
-        ],
-      },
-    };
-  },
-  methods: {
-    tabSelect(tab) {},
+          success(res) {
+            _this.tableLists = res.data
+            // this.tableData.data = res.data
+            // debugger
+            console.log(res)
+          }
+      })
+    },
+
+    getSelectLists(showLoading) {
+      let _this = this
+      _this.API.requestData({
+          showLoading,
+          method: "GET",
+          subUrl: "/powercompare/windfarmAjax",
+          success(res) {
+            _this.options = res.data
+            _this.optSelectValue = res.data[0].id
+            // _this.getList(false);
+            _this.$nextTick(() => {
+              _this.getList(false);
+              _this.timmer = setInterval(() => {
+                _this.getList(false)
+              }, _this.$store.state.websocketTimeSec);
+            });
+          }
+      })
+    }
   },
   created() {
-    for (let i = 1; i < 7; i++) {
-      this.tableData.data.push(JSON.parse(JSON.stringify(this.tableData.data[0])));
-    }
+    // for (let i = 1; i < 7; i++) {
+    //   this.tableData.data.push(JSON.parse(JSON.stringify(this.tableData.data[0])));
+    // }
+    this.type = this.tabLists[0].type
+    this.getSelectLists(false);
+
+    // this.getList()
+  },
+
+  unmounted() {
+    clearInterval(this.timmer);
+    this.timmer = null;
   },
 };
 </script>

src/views/NewPages/ztfx.vue

@@ -43,42 +43,45 @@
             <table style="width:100%;" border="0" cellspacing="0">
               <thead>
                 <tr>
-                  <th rowspan="2" class="type1" style="width:5vh;"></th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1" style="width:6vh;"></th>
+                  <th rowspan="2" class="type1">
+                    理论发电量
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    实际发电量
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    风能利用率
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    维护损失电量
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    维护损失率
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
+                  <th rowspan="2" class="type1">
                     故障损失电量
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    故障损失率
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    限电损失电量
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    限电损失率
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    性能损失电量
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    性能损失率
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    受累损失电量
+                  </th>
+                  <th rowspan="2" class="type1">
+                    受累损失率
                   </th>
                 </tr>
               </thead>
@@ -96,87 +99,219 @@
                         本期
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.yllfdl }}
+                        
+                        <template v-if="compares.yllfdl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.yllfdl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
-                        <span class="svg-icon svg-icon-green">
-                          <svg-icon svgid="svg-arrow-up-1" />
-                        </span>
+                        {{ nowCurrents.ysjfdl }}
+                        <template v-if="compares.ysjfdl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.ysjfdl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.yfnlyl}}
+                        <template v-if="compares.yfnlyl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.yfnlyl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.ywhssdl }}
+                        <template v-if="compares.ywhssdl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.ywhssdl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.ywhssl }}
+                        <template v-if="compares.ywhssl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.ywhssl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.ygzssdl }}
+                        <template v-if="compares.ygzssdl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.ygzssdl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.ygzssl }}
+                        <template v-if="compares.ygzssl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.ygzssl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.yxdssdl }}
+                        <template v-if="compares.yxdssdl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.yxdssdl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.yxdssl }}
+                        <template v-if="compares.yxdssl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.yxdssl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.yxnssdl }}
+                        <template v-if="compares.yxnssdl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.yxnssdl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.yxnssl}}
+                        <template v-if="compares.yxnssl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.yxnssl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.yslssdl }}
+                        <template v-if="compares.yslssdl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.yslssdl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
+                      </td>
+                      <td class="td-item">
+                        {{ nowCurrents.yslssl }}
+                        <template v-if="compares.yslssl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.yslssl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                     </tr>
                     <tr>
                       <td style="width:5vh;">
-                        当期
+                        同期
+                      </td>
+                      <td class="td-item">
+                        {{ sameList.yllfdl }}
+                        
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ sameList.ysjfdl }}
                       </td>
                       <td class="td-item">
-                        0.59
-                        <span class="svg-icon svg-icon-yellow">
-                          <svg-icon svgid="svg-arrow-dpwn-1" />
-                        </span>
+                        {{ sameList.yfnlyl}}
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ sameList.ywhssdl }}
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ sameList.ywhssl }}
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ sameList.ygzssdl }}
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ sameList.ygzssl }}
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ sameList.yxdssdl }}
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ sameList.yxdssl }}
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ sameList.yxnssdl }}
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ sameList.yxnssl}}
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ sameList.yslssdl }}
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ sameList.yslssl }}
                       </td>
                     </tr>
                   </tbody>
@@ -192,44 +327,44 @@
             <table style="width:100%;" border="0" cellspacing="0">
               <thead>
                 <tr>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                <th rowspan="2" class="type1">
+                    理论发电量
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    实际电量
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    风能利用率
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    维护损失电量
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    维护损失率
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
+                  <th rowspan="2" class="type1">
                     故障损失电量
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    故障损失率
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    限电损失电量
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    限电损失率
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    性能损失电量
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    性能损失率
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    受累损失电量
                   </th>
-                  <th rowspan="2" class="type1" style="width:6vh;">
-                    故障损失电量
+                  <th rowspan="2" class="type1">
+                    受累损失率
                   </th>
                 </tr>
               </thead>
@@ -242,48 +377,217 @@
                   cellspacing="0"
                 >
                   <tbody>
-                    <tr v-for="index of 2" :key="index">
+                    <tr>
+                       <td class="td-item">
+                        {{ nowCurrents.nllfdl }}
+                        
+                        <template v-if="compares.nllfdl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.nllfdl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
+                      </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.nsjfdl }}
+                        <template v-if="compares.nsjfdl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.nsjfdl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
-                        <span class="svg-icon svg-icon-yellow">
-                          <svg-icon svgid="svg-arrow-dpwn-1" />
-                        </span>
+                        {{ nowCurrents.nfnlyl}}
+                        <template v-if="compares.nfnlyl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.nfnlyl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.nwhssdl }}
+                        <template v-if="compares.nwhssdl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.nwhssdl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.nwhssl }}
+                        <template v-if="compares.nwhssl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.nwhssl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.ngzssdl }}
+                        <template v-if="compares.ngzssdl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.ngzssdl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.ngzssl }}
+                        <template v-if="compares.ngzssl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.ngzssl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.nxdssdl }}
+                        <template v-if="compares.nxdssdl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.nxdssdl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.nxdssl }}
+                        <template v-if="compares.nxdssl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.nxdssl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.nxnssdl }}
+                        <template v-if="compares.nxnssdl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.nxnssdl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.nxnssl}}
+                        <template v-if="compares.nxnssl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.nxnssl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.nslssdl }}
+                        <template v-if="compares.nslssdl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.nslssdl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
                       <td class="td-item">
-                        0.59
+                        {{ nowCurrents.nslssl }}
+                        <template v-if="compares.nslssl === 2">
+                          <span class="svg-icon svg-icon-green">
+                            <svg-icon svgid="svg-arrow-up-1" />
+                          </span>
+                        </template>
+                        <template v-if="compares.nslssl === 1">
+                          <span class="svg-icon svg-icon-yellow">
+                            <svg-icon svgid="svg-arrow-dpwn-1" />
+                          </span>
+                        </template>
                       </td>
+                    </tr>
+                    <tr>
                       <td class="td-item">
-                        0.59
+                        {{ sameList.nllfdl }}
+                      </td>
+                      <td class="td-item">
+                        {{ sameList.nsjfdl }}
+                      </td>
+                      <td class="td-item">
+                        {{ sameList.nfnlyl}}
+                      </td>
+                      <td class="td-item">
+                        {{ sameList.nwhssdl }}
+                      </td>
+                      <td class="td-item">
+                        {{ sameList.nwhssl }}
+                      </td>
+                      <td class="td-item">
+                        {{ sameList.ngzssdl }}
+                      </td>
+                      <td class="td-item">
+                        {{ sameList.ngzssl }}
+                      </td>
+                      <td class="td-item">
+                        {{ sameList.nxdssdl }}
+                      </td>
+                      <td class="td-item">
+                        {{ sameList.nxdssl }}
+                      </td>
+                      <td class="td-item">
+                        {{ sameList.nxnssdl }}
+                      </td>
+                      <td class="td-item">
+                        {{ sameList.nxnssl}}
+                      </td>
+                      <td class="td-item">
+                        {{ sameList.nslssdl }}
+                      </td>
+                      <td class="td-item">
+                        {{ sameList.nslssl }}
                       </td>
                     </tr>
                   </tbody>
@@ -514,6 +818,9 @@ export default {
   },
   data() {
     return {
+      nowCurrents: {},
+      compares: {},
+      sameList: {},
       tableData2: {
         column: [
           {
@@ -604,11 +911,46 @@ export default {
             v11: "0.59",
             v12: "0.59",
           },
-        ],
+        ]
       },
     };
   },
-  created() {},
+  created() {
+    this.getMonthList()
+  },
+  mounted() {
+    // this.getMonthList()
+  },
+  methods: {
+    getMonthList() {
+      let _this = this
+      _this.API.requestData({
+          // showLoading,
+          method: "GET",
+          baseURL: 'http://10.155.32.4:8034',
+          subUrl: "/specific/maintoplist",
+          data:{
+            month: '2021-07'
+          },
+          success(res) {
+            res.data.map(item => {
+              for (let key in item) {
+                if (key !== 'type' && item.type !== '比较') {
+                  item[key] = item[key].toFixed(2)
+                }
+              }
+              if (item.type === '当前') {
+                _this.nowCurrents = item
+              } else if (item.type === '比较') {
+                _this.compares = item
+              } else {
+                _this.sameList = item
+              }
+            })
+          }
+      })
+    }
+  }
 };
 </script>
 

src/views/layout/Menu.vue

@@ -107,6 +107,18 @@ export default {
                   path: "/historySearch"
                 }
               ]
+            },
+            {
+              text: "预警记录",
+              icon: "svg-wind-site",
+              path: "/new",
+              children: [
+                {
+                  text: "预警管理",
+                  icon: "svg-wind-site",
+                  path: "/new/alarmcenter"
+                }
+              ]
             }
           ],
         },