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

src/router/index.js

@@ -257,9 +257,18 @@ const routes = [
     path: '/knowledge5',   //特征参数
     name: 'knowledge5',
     component: () => import('../views/Knowledge/Knowledge5.vue'),
+  },
+  {
+    path: '/knowledge6',   //排查检修方案
+    name: 'knowledge6',
+    component: () => import('../views/Knowledge/Knowledge6.vue'),
+  },
+  {
+    path: '/knowledge7',   //预警知识
+    name: 'knowledge7',
+    component: () => import('../views/Knowledge/Knowledge7.vue'),
   }
 ]
-
 const router = createRouter({
   history: createWebHashHistory(),
   base: '/zhfx/',

src/views/Knowledge/Knowledge2.vue

@@ -14,7 +14,7 @@
       </div>
     </div>
     <div>
-      <ComTable :data="tableData"></ComTable>
+      <ComTable :data="tableData" height="85vh"></ComTable>
     </div>
   </div>
 </template>

src/views/Knowledge/Knowledge3.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="knowledge-2">
+  <div class="knowledge-3">
     <div class="query mg-b-8">
       <div class="query-items">
         <div class="query-item">
@@ -14,7 +14,7 @@
       </div>
     </div>
     <div>
-      <ComTable :data="tableData"></ComTable>
+      <ComTable :data="tableData" height="85vh"></ComTable>
     </div>
   </div>
 </template>
@@ -124,7 +124,7 @@ export default {
 @titleGray: #9ca5a8;
 @rowGray: #606769;
 @darkBack: #536268;
-.knowledge-2 {
+.knowledge-3 {
   .el-select {
     width: 200px;
   }

src/views/Knowledge/Knowledge4.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="knowledge-2">
+  <div class="knowledge-4">
     <div class="query mg-b-8">
       <div class="query-items">
         <div class="query-item">
@@ -14,7 +14,7 @@
       </div>
     </div>
     <div>
-      <ComTable :data="tableData"></ComTable>
+      <ComTable :data="tableData" height="85vh"></ComTable>
     </div>
   </div>
 </template>
@@ -78,7 +78,6 @@ export default {
     onClickSearch() {
       this.requestSafeList();
     },
-    // 获取按错内容
     requestSafeList() {
       let that = this;
       this.API.requestData({
@@ -97,7 +96,6 @@ export default {
               item.addtime = new Date(item.addtime).formatDate("yyyy-MM-dd hh:mm:ss")
               that.tableData.data.push(item);
             });
-            that.tableData.data = res.data;
           }
         },
       });
@@ -110,7 +108,7 @@ export default {
 @titleGray: #9ca5a8;
 @rowGray: #606769;
 @darkBack: #536268;
-.knowledge-2 {
+.knowledge-4 {
   .el-select {
     width: 200px;
   }

src/views/Knowledge/Knowledge5.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="knowledge-2">
+  <div class="knowledge-5">
     <div class="query mg-b-8">
       <div class="query-items">
         <div class="query-item">
@@ -14,7 +14,7 @@
       </div>
     </div>
     <div>
-      <ComTable :data="tableData"></ComTable>
+      <ComTable :data="tableData" height="85vh"></ComTable>
     </div>
   </div>
 </template>
@@ -120,7 +120,6 @@ export default {
     onClickSearch() {
       this.requestSafeList();
     },
-    // 获取按错内容
     requestSafeList() {
       let that = this;
       this.API.requestData({
@@ -151,7 +150,7 @@ export default {
 @titleGray: #9ca5a8;
 @rowGray: #606769;
 @darkBack: #536268;
-.knowledge-2 {
+.knowledge-5 {
   .el-select {
     width: 200px;
   }

src/views/Knowledge/Knowledge6.vue

@@ -0,0 +1,135 @@
+<template>
+  <div class="knowledge-6">
+    <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="model"
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in models"
+                :key="item"
+                :label="item"
+                :value="item"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </div>
+      <div class="query-actions" style="margin-right: 1500px">
+        <button class="btn green" @click="onClickSearch">搜索</button>
+      </div>
+    </div>
+    <div>
+      <ComTable :data="tableData" height="85vh"></ComTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import ComTable from "@com/coms/table/table.vue";
+
+export default {
+  components: { ComTable },
+  data() {
+    return {
+      model: "",
+      models: ["UP82","UP77","UP97","UP105-2000-S","SG500KTL","NTE-N500KTL","CCWE-1500","AE-500-50-PV-X-HV"],
+      tableData: {
+        column: [
+          {
+            name: "预警编号",
+            field: "tid",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "名称",
+            field: "name",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "风机型号",
+            field: "model",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "故障排查方法",
+            field: "gzpc",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "故障处理",
+            field: "gzyy",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "工器具",
+            field: "gqj",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "故障处理时长",
+            field: "xqsc",
+            is_num: false,
+            is_light: false,
+          }
+        ],
+        data: [],
+      },
+    };
+  },
+  created() {
+    this.model = this.models[0];   
+    this.requestSafeList();
+  },
+  methods: {
+    // 搜索按钮
+    onClickSearch() {
+      this.requestSafeList();
+    },
+    requestSafeList() {
+      let that = this;
+      this.API.requestData({
+        method: "GET",
+        baseURL: "http://10.155.32.4:8034/",
+        subUrl: "/experienceBase/pcjxfa",
+        data: {
+          model: that.model,
+          pageNum: 1,
+          pageSize: 1000,
+        }, // 请求所携带参数，默认为空，可缺省
+        success(res) {
+          if (res.code == 200) {
+            that.tableData.data = res.data
+          }
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="less" scope>
+@titleGray: #9ca5a8;
+@rowGray: #606769;
+@darkBack: #536268;
+.knowledge-6 {
+  .el-select {
+    width: 200px;
+  }
+  .el-input {
+    width: 200px;
+  }
+}
+</style>

src/views/Knowledge/Knowledge7.vue

@@ -0,0 +1,179 @@
+<template>
+  <div class="knowledge-7">
+    <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="level"
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in levels"
+                :key="item"
+                :label="item"
+                :value="item"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="query-item">
+          <div class="lable">报警类型：</div>
+          <div class="search-input">
+            <el-select
+              v-model="warning"
+              placeholder="请选择"
+              popper-class="select"
+            >
+              <el-option
+                v-for="item in warnings"
+                :key="item"
+                :label="item"
+                :value="item"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="query-item">
+          <div class="lable">查询内容：</div>
+          <div class="search-input">
+            <el-input v-model="content" placeholder="请输入查询内容"></el-input>
+          </div>
+        </div>
+      </div>
+      <div class="query-actions" style="margin-right: 1000px">
+        <button class="btn green" @click="onClickSearch">搜索</button>
+      </div>
+    </div>
+    <div>
+      <ComTable :data="tableData" height="85vh"></ComTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import ComTable from "@com/coms/table/table.vue";
+
+export default {
+  components: { ComTable },
+  data() {
+    const that = this
+    return {
+      level: "",
+      levels: ["5级","4级","3级","2级","1级"],
+      warning: "",
+      warnings: ["1类","2类","3类","4类","5类"],
+      content: '',
+      tableData: {
+        column: [
+          {
+            name: "编码",
+            field: "id",
+            is_num: true,
+            is_light: false,
+          },
+          {
+            name: "名称",
+            field: "name",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "表达式",
+            field: "expression",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "级别",
+            field: "rank",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "报警类型",
+            field: "category",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "描述",
+            field: "description",
+            is_num: false,
+            is_light: false,
+          },
+          {
+            name: "范围",
+            field: "modelid",
+            is_num: false,
+            is_light: false,
+          },
+          // {
+          //   name: "操作",
+          //   field: "",
+          //   is_num: false,
+          //   is_light: false,
+          //   template() {
+          //     return "<el-button type='text' style='cursor: pointer;'>查看</el-button>";
+          //   },
+          //   click(e, row) {
+          //     that.getInformation(row);
+          //   },
+          // },
+        ],
+        data: [],
+      },
+    };
+  },
+  created() {
+    this.level = this.levels[0];
+    this.warning = this.warnings[0];
+    this.requestWarnList();
+  },
+  methods: {
+    // 搜索按钮
+    onClickSearch() {
+      this.requestWarnList();
+    },
+    // 查看详情
+    getInformation(item){
+
+    },
+    requestWarnList() {
+      let that = this;
+      this.API.requestData({
+        method: "GET",
+        baseURL: "http://10.155.32.4:8034/",
+        subUrl: "/experienceBase/yjzs",
+        data: {
+          gzjb: that.level.substring(0,1),
+          bjlx: that.warning.substring(0,1),
+          cxnr: that.content,
+          pageNum: 1,
+          pageSize: 1000,
+        }, // 请求所携带参数，默认为空，可缺省
+        success(res) {
+          if (res.code == 200) {
+            that.tableData.data = res.data;
+          }
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="less" scope>
+@titleGray: #9ca5a8;
+@rowGray: #606769;
+@darkBack: #536268;
+.knowledge-7 {
+  .query-item {
+    width: 250px;
+  }
+}
+</style>

src/views/layout/Menu.vue

@@ -278,20 +278,30 @@ export default {
               path: "/knowledge2",
             },
             {
-              text: "风险辨识知识",
+              text: "排查检修方案",
               icon: "svg-matrix",
-              path: "/knowledge3",
+              path: "/knowledge6",
             },
             {
-              text: "作业指导知识",
+              text: "预警知识",
               icon: "svg-matrix",
-              path: "/knowledge4",
+              path: "/knowledge7",
             },
             {
               text: "特征参数",
               icon: "svg-matrix",
               path: "/knowledge5",
             },
+            {
+              text: "风险辨识知识",
+              icon: "svg-matrix",
+              path: "/knowledge3",
+            },
+            {
+              text: "作业指导知识",
+              icon: "svg-matrix",
+              path: "/knowledge4",
+            }
           ],
         },
         {