运维管理

ems-ui-cloud/src/views/alarm/index.vue

@@ -103,6 +103,11 @@
     <!-- 添加或修改能源设施告警策略对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="归属区域" prop="areaCode">
+          <el-select v-model="form.areaCode" placeholder="请选择归属区域" >
+            <el-option v-for="item in sourceAreaOptions" :label="item.label" :value="item.id" :key="item.id" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="策略代码" prop="policyCode">
           <el-input v-model="form.policyCode" placeholder="请输入策略代码" />
         </el-form-item>
@@ -188,6 +193,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        areaCode: [
+          {required: true, message: "区域不能为空", trigger: "blur"}
+        ],
         policyCode: [
           {required: true, message: "策略代码不能为空", trigger: "blur"}
         ],
@@ -203,6 +211,7 @@ export default {
       },
       areaName: undefined,
       areaOptions: [],
+      sourceAreaOptions: [],
     };
   },
   watch: {
@@ -233,6 +242,7 @@ export default {
            label: '全部',
            children: []
          }].concat(response.data)
+         this.sourceAreaOptions = response.data
          this.queryParams.areaCode = '-1'
        })
      },

ems-ui-cloud/src/views/task/ManualInspection.vue

@@ -110,6 +110,11 @@
         <el-form-item label="任务代码" prop="taskCode" v-if="form.taskCode">
           <el-input v-model="form.taskCode" placeholder="请输入任务代码" disabled />
         </el-form-item>
+        <el-form-item label="归属区域" prop="areaCode">
+          <el-select v-model="form.areaCode" placeholder="请选择归属区域" >
+            <el-option v-for="item in areaOptions" :label="item.label" :value="item.id" :key="item.id" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="任务名称" prop="taskName">
           <el-input v-model="form.taskName" placeholder="请输入任务名称" />
         </el-form-item>
@@ -176,7 +181,7 @@
 </template>
 
 <script>
-import { listArea } from '@/api/basecfg/area';
+import { areaTreeSelect, listArea } from '@/api/basecfg/area'
 import { listFacs } from '@/api/basecfg/emsfacs';
 import { addInspectionPlan, delInspectionPlan, getInspectionPlan, listInspectionPlan, updateInspectionPlan } from '@/api/task/inspectionPlan';
 import { OBJ_TYPE } from '@/enums/DeviceFac';
@@ -216,10 +221,12 @@ export default {
       open: false,
       openInspection: false,
       objOptions: [],
+      areaOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        areaCode: null,
         taskCode: null,
         taskName: null,
         taskType: TASK_TYPES.manual.value,
@@ -234,6 +241,13 @@ export default {
       },
       // 表单校验
       rules: {
+        areaCode: [
+          {
+            required: true,
+            message: '区域不能为空',
+            trigger: 'blur',
+          },
+        ],
         executor: [
           {
             required: true,
@@ -287,6 +301,7 @@ export default {
     };
   },
   created() {
+    this.getAreaTreeByTag('0', 1)
     this.getList();
   },
   methods: {
@@ -348,7 +363,12 @@ export default {
         [OBJ_TYPE.devc.value]: function () {},
       };
     },
-
+    /** 查询区域树结构 */
+    async getAreaTreeByTag(areaCode, layer) {
+      await areaTreeSelect(areaCode, layer).then(response => {
+        this.areaOptions = response.data
+      })
+    },
     remoteMethod(key) {
       this.objHandle()[this.form.objType]({ key });
     },

ems-ui-cloud/src/views/task/index.vue

@@ -1,26 +1,15 @@
 <template>
   <div class="task-container">
     <el-row :gutter="10">
-      <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input v-model="areaName" placeholder="请输入服务区名称" clearable size="small" prefix-icon="el-icon-search"
-            style="margin-bottom: 20px" />
-        </div>
-        <div class="head-container">
-          <el-tree ref="tree" :data="areaOptions" default-expand-all :expand-on-click-node="false" :filter-node-method="filterNode"
-            node-key="id" highlight-current @node-click="handleNodeClick" />
-        </div>
-      </el-col>
-      <el-col :span="20" :xs="24">
-        <el-tabs v-model="activeName" >
-          <el-tab-pane label="手动巡检" name="ManualInspection">
-            <manual-inspection></manual-inspection>
-          </el-tab-pane>
-          <el-tab-pane label="自动巡检" name="second">
-            <AutoInspection></AutoInspection>
-          </el-tab-pane>
-        </el-tabs>
-      </el-col></el-row>
+      <el-tabs v-model="activeName" >
+        <el-tab-pane label="手动巡检" name="ManualInspection">
+          <manual-inspection></manual-inspection>
+        </el-tab-pane>
+        <el-tab-pane label="自动巡检" name="second">
+          <AutoInspection></AutoInspection>
+        </el-tab-pane>
+      </el-tabs>
+    </el-row>
 
   </div>
 </template>
@@ -71,7 +60,7 @@ export default {
     },
     handleNodeClick (data, node) {
       this.areaCode = data.id
-      // this.getList()
+      //this.getList()
     },
   },
 };

ems-ui-cloud/src/views/task/report/index.vue

@@ -1,17 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="10">
-      <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input v-model="areaName" placeholder="请输入服务区名称" clearable size="small" prefix-icon="el-icon-search"
-            style="margin-bottom: 20px" />
-        </div>
-        <div class="head-container">
-          <el-tree ref="tree" :data="areaOptions" default-expand-all :expand-on-click-node="false" :filter-node-method="filterNode"
-            node-key="id" highlight-current @node-click="handleNodeClick" />
-        </div>
-      </el-col>
-      <el-col :span="20" :xs="24">
+
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
           label-width="68px">
           <el-form-item label="任务代码" prop="taskCode">
@@ -94,7 +84,6 @@
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
           @pagination="getList" />
 
-      </el-col>
     </el-row>
 
     <!-- 添加或修改巡检报告对话框 -->