chenminghua 3 роки тому
батько
коміт
e10bf85e5f

+ 14 - 14
src/components/arcgis/arcgis.vue

@@ -75,37 +75,37 @@
             return {
                 fanStateImgMapping: [{
                         name: "待机",
-                        code: "dj",
+                        code: "0",
                         img: require("@assets/map/fan/green.png")
                     },
                     {
                         name: "运行",
-                        code: "yx",
+                        code: "1",
                         img: require("@assets/map/fan/blue.png")
                     },
                     {
-                        name: "限电",
-                        code: "xd",
-                        img: require("@assets/map/fan/purple.png")
-                    },
-                    {
                         name: "故障",
-                        code: "gz",
+                        code: "2",
                         img: require("@assets/map/fan/red.png")
                     },
                     {
+                        name: "离线",
+                        code: "3",
+                        img: require("@assets/map/fan/black.png")
+                    },               
+                    {
                         name: "检修",
-                        code: "jx",
+                        code: "4",
                         img: require("@assets/map/fan/orange.png")
                     },
                     {
-                        name: "离线",
-                        code: "lx",
-                        img: require("@assets/map/fan/black.png")
+                        name: "限电",
+                        code: "5",
+                        img: require("@assets/map/fan/purple.png")
                     },
                     {
-                        name: "受累",
-                        code: "sl",
+                        name: "限停",
+                        code: "6",
                         img: require("@assets/map/fan/white.png")
                     },
                 ],

+ 8 - 3
src/router/index.js

@@ -553,9 +553,14 @@ const routes = [{
 },
 // 等级评估(单机等级评估管理-量化评级)
 {
-	path: '/djpg',
-	name: 'djpg',
-	component: () => import('../views/HealthControl/gradeassessment.vue')
+	path: '/assess/index',
+	name: 'assessindex',
+	component: () => import('../views/HealthControl/assess/assessindex.vue')
+},
+{
+	path: '/assess/config',
+	name: 'assessconfig',
+	component: () => import('../views/HealthControl/assess/assessconfig.vue')
 },
 {
 	path: "/new/powerforecast2",

+ 125 - 0
src/views/HealthControl/assess/assessconfig.vue

@@ -0,0 +1,125 @@
+<template>
+  <div class="assess-config">
+    <div class="assess-header">
+      <div class="query mg-b-8">
+        <div class="query-items">
+          <div class="query-item">
+            <div class="lable">模型:</div>
+            <div class="search-input">
+              <el-input v-model="content"></el-input>
+            </div>
+          </div>
+        </div>
+        <div class="query-actions">
+          <button class="btn green mg-l-30" @click="onClickAdd">新增</button>
+        </div>
+      </div>
+    </div>
+
+    <div class="assess-bottom">
+      <ComTable :data="tableData" height="85vh"></ComTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import ComTable from "@/components/coms/table/table-unpage.vue";
+
+export default {
+  components: { ComTable },
+  data() {
+    const that = this;
+    return {
+      content: "",
+      tableData: {
+        column: [
+          {
+            name: "名称",
+            field: "targetname",
+            is_light: false,
+          },
+          {
+            name: "时间",
+            field: "safecontent",
+            is_light: false,
+          },
+          {
+            name: "场站",
+            field: "describe",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "是否启用",
+            field: "principal",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "操作",
+            field: "addtime",
+            is_num: false,
+            is_light: false,
+            width: 10,
+            template: () => {
+              return (
+                "<el-button type='text' style='cursor: pointer;' value='xq'>编辑</el-button>&nbsp" +
+                "<el-button type='text' style='cursor: pointer;' value='ls'>删除</el-button>&nbsp" +
+                "<el-button type='text' style='cursor: pointer;' value='ls'>配置</el-button>&nbsp"
+              );
+            },
+            click(e, row) {
+              that.onClickOption(e, row);
+            },
+          },
+        ],
+        data: [],
+      },
+    };
+  },
+  created() {
+    this.requestList();
+  },
+  methods: {
+    // 新增按钮
+    onClickAdd() {},
+    // 获取按错内容
+    requestList() {
+      let that = this;
+      this.API.requestData({
+        method: "GET",
+        baseURL: "http://10.155.32.4:8034/",
+        subUrl: "/evaluation/modelMainList",
+        data: {
+          name: "sdf",
+        },
+        success(res) {},
+      });
+    },
+  },
+};
+</script>
+
+<style lang="less" scope>
+.assess-config {
+  display: flex;
+  flex-direction: column;
+
+  .el-select {
+    width: 200px;
+  }
+  .el-input {
+    width: 200px;
+  }
+
+  .mg-l-30 {
+    margin-left: 30px;
+  }
+
+  .assess-header {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+  }
+}
+</style>

+ 2 - 2
src/views/HealthControl/gradeassessment.vue

@@ -91,8 +91,8 @@
 </template>
 <script>
 import ComTable from "@/components/coms/table/table-unpage.vue";
-import Dayinfo from "./dayinfo.vue";
-import GradeHistory from "./gradeHistory.vue";
+import Dayinfo from "../dayinfo.vue";
+import GradeHistory from "../gradeHistory.vue";
 
 export default {
   name: "gradeassessment",

+ 4 - 0
src/views/WindSite/WindSite.vue

@@ -89,6 +89,10 @@ export default {
           icon: "svg-matrix",
           path: "/monitor/windsite/boosterstation",
         },
+        {
+          icon: "svg-matrix",
+          path: "/monitor/windsite/map",
+        },
       ],
     };
   },

+ 37 - 45
src/views/WindSite/pages/Map.vue

@@ -294,6 +294,7 @@ export default {
       wpId: undefined,
       wpnumMap: {}, //风机监视数量
       wpInfoMap: {}, //风机详情
+      fjmap: [],   // 风机名
       selectIndex: 0,
       rowIndex: 0,
       btnGroups: [
@@ -321,15 +322,13 @@ export default {
       mapToolIndex: 0,
       fans: [],
       colors: {
-        dj: ["#05bb4c", "#4ad476", "#9fedb2"],
-        yx: ["#4b55ae", "#959dc7", "#d3d6e0"],
-        xd: ["#c531c7", "#e080dc", "#fadef7"],
-        xdStop: ["#c531c7", "#e080dc", "#fadef7"],
-        gz: ["#BA3237", "#d4807d", "#eddad8"],
-
-        jx: ["#e17e23", "#fabf78", "#ffebcc"],
-        lx: ["#606769", "#757575", "#AFAFAF"],
-        sl: ["#ffffff", "#D8D8D8", "#D8D8D8"],
+        "0": ["#05bb4c", "#4ad476", "#9fedb2"],
+        "1": ["#4b55ae", "#959dc7", "#d3d6e0"],
+        "2": ["#BA3237", "#d4807d", "#eddad8"],
+        "3": ["#606769", "#757575", "#AFAFAF"],
+        "4": ["#e17e23", "#fabf78", "#ffebcc"],
+        "5": ["#c531c7", "#e080dc", "#fadef7"],
+        "6": ["#c531c7", "#e080dc", "#fadef7"],
       },
       syzImg: require("@assets/png/booster-station.png"),
     };
@@ -340,7 +339,6 @@ export default {
     that.$nextTick(() => {
       that.getWp();
       that.requestData();
-      that.requestInfo();
     });
   },
   // 函数
@@ -399,24 +397,11 @@ export default {
           if (res.code == 200) {
             that.wpnumMap = res.data.fczbmap.jczbmap;
             that.wpInfoMap = res.data.wxssmap;
+            that.fjmap = res.data.fjmap[0];
           }
         },
       });
     },
-    // 风机详情
-    requestInfo() {
-      let that = this;
-      that.API.requestData({
-        method: "POST",
-        subUrl: "monitor/findGeneralAppearance",
-        data: {
-          wpId: that.wpId,
-        },
-        success(res) {
-          if (res.code == 200) that.wpnumMap = res.data.fczbmap.jczbmap;
-        },
-      });
-    },
     renderBtnActiveIndex() {
       this.btnGroups.forEach((pEle, pIndex) => {
         pEle.btns.forEach((cEle, cIndex) => {
@@ -429,39 +414,46 @@ export default {
     },
     when: function () {
       let jsonObj = dataService.get("arcgis-nx-fc1");
-      let data = [
-        { id: "MG13", state: "yx" },
-        { id: "MG12", state: "xd" },
-        { id: "MG20", state: "xdStop" },
-        { id: "MG34", state: "gz" },
-        { id: "MG39", state: "jx" },
-        { id: "MG02", state: "lx" },
-        { id: "MG19", state: "sl" },
-      ];
       this.fans = jsonObj;
       jsonObj.forEach((item) => {
-        let obj = data.find((t) => t.id == item.attributes.code);
+        let obj = this.fjmap.find((t) => {
+          let wtid = t.wtId.replace("01_","");
+          if (wtid == item.attributes.code) return t
+        });
         if (obj) {
-          item.attributes.state = obj.state;
+          item.attributes.state = String(obj.fjzt);
         } else {
-          item.attributes.state = "dj";
+          item.attributes.state = "4";
         }
         switch (item.attributes.state) {
-          case "yx":
+          case "0":  //待机
+            item.attributes.rotate = false; // 转
+            item.attributes.dur = 8; // 转一圈时间
+            break;
+          case "1":  //运行
             item.attributes.rotate = true; // 转
-            item.attributes.dur = 4; // 转一圈时间
+            item.attributes.dur = 2; // 转一圈时间
             break;
-
-          case "xd":
-            item.attributes.rotate = true;
+          case "2":  //故障
+            item.attributes.rotate = false; // 不转
             item.attributes.dur = 8;
             break;
-
-          case "xdStop":
+          case "3":  //中断
             item.attributes.rotate = false; // 不转
             item.attributes.dur = 8;
-            break;
-
+            break;  
+          case "4":  //维护
+            item.attributes.rotate = false; // 不转
+            item.attributes.dur = 8;
+            break;  
+          case "5":  //限电
+            item.attributes.rotate = true; // 转
+            item.attributes.dur = 6;
+            break; 
+          case "6":  //停机
+            item.attributes.rotate = false; // 不转
+            item.attributes.dur = 8;
+            break;      
           default:
             item.attributes.rotate = false;
             item.attributes.dur = 8;