设备分类

src/api/maintenance/patrol_maintenance.js

@@ -2,9 +2,9 @@ import request from '@/utils/request';
 
 // 更新或保存
 export async function getPage (data) {
-  const res = await request.get('/eam/planmaintenance/page', data);
+  const res = await request.get('/eam/planmaintenance/page', { params: data });
   if (res.data.code == 0) {
-    return res.data;
+    return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }

src/components/CommomSelect/dept-select.vue

@@ -2,6 +2,7 @@
 <template>
   <ele-tree-select
     clearable
+    filterable
     :value="value || ''"
     :data="treeData"
     label-key="name"
@@ -24,16 +25,16 @@
         default: '请选择'
       }
     },
-    data() {
+    data () {
       return {
         treeData: []
       };
     },
-    created() {
+    created () {
       this.getData();
     },
     methods: {
-      async getData(parmas = {}) {
+      async getData (parmas = {}) {
         const data = await listOrganizations(parmas);
         this.treeData = this.$util.toTreeData({
           data: data || [],
@@ -42,7 +43,7 @@
         });
       },
       /* 更新选中数据 */
-      updateValue(value) {
+      updateValue (value) {
         this.$emit('input', value);
       }
     }

src/components/CommomSelect/equipment-select.vue

@@ -0,0 +1,52 @@
+<!-- 设备分类树形选择下拉框 -->
+<template>
+  <ele-tree-select
+    clearable
+    filterable
+    :value="value || ''"
+    :data="treeData"
+    label-key="name"
+    value-key="id"
+    default-expand-all
+    :placeholder="placeholder"
+    @input="updateValue"
+  />
+</template>
+
+<script>
+  import { getTreeByType } from '@/api/classifyManage';
+  export default {
+    props: {
+      // 选中的数据(v-model)
+      value: [Number, String],
+      // 提示信息
+      placeholder: {
+        type: String,
+        default: '请选择'
+      }
+    },
+    data () {
+      return {
+        treeData: []
+      };
+    },
+    created () {
+      this.getData();
+    },
+    methods: {
+      async getData () {
+        const res = await getTreeByType(1);
+        this.treeData = res.data;
+        // this.treeData = this.$util.toTreeData({
+        //   data: data || [],
+        //   idField: 'id',
+        //   parentIdField: 'parentId'
+        // });
+      },
+      /* 更新选中数据 */
+      updateValue (value) {
+        this.$emit('input', value);
+      }
+    }
+  };
+</script>

src/components/Dict/DictSelection.vue

@@ -1,7 +1,6 @@
 <template>
   <el-select
     v-model="selectVal"
-    size="small"
     filterable
     style="width: 100%"
     v-bind="$attrs"

src/enum/dict.js

@@ -12,5 +12,6 @@ export default {
   规则类型: 'rule_type',
   规则状态: 'rule_status',
   规则周期: 'rule_cycle',
+  运维计划状态: 'plan_status',
   紧急程度: 'urgent_type'
 };

src/views/maintenance/patrol/plan/components/plan-search.vue

@@ -12,7 +12,12 @@
           <el-input clearable v-model="where.planCode" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="计划性质:">
-          <el-select clearable filterable v-model="where.cycleType">
+          <el-select
+            clearable
+            filterable
+            v-model="where.cycleType"
+            class="w100"
+          >
             <el-option label="自动" :value="1"></el-option>
             <el-option label="手动" :value="2"></el-option>
           </el-select>
@@ -23,13 +28,12 @@
           <el-input clearable v-model="where.planName" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="设备分类:">
-          <DictSelection dictName="规则状态" clearable v-model="where.staus">
-          </DictSelection>
+          <equipmentSelect v-model="where.categoryLevelId" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="规则名称:">
-          <el-input clearable v-model="where.dep" placeholder="请输入" />
+          <el-input clearable v-model="where.ruleName" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="生成时间:">
           <el-date-picker
@@ -46,7 +50,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="状态:">
-          <el-input clearable v-model="where.texture" placeholder="请输入" />
+          <DictSelection dictName="运维计划状态"></DictSelection>
         </el-form-item>
         <div class="ele-form-actions">
           <el-button
@@ -72,15 +76,18 @@
 </template>
 
 <script>
-  import { login } from '@/api/login';
+  import equipmentSelect from '@/components/CommomSelect/equipment-select.vue';
   export default {
+    components: { equipmentSelect },
     data () {
       // 默认表单数据
       const defaultWhere = {
         planName: '',
         planCode: '',
         fixCode: '',
-        ownershipGroupId: ''
+        time: [],
+        ruleName: '',
+        categoryLevelId: ''
       };
       return {
         // 表单数据
@@ -98,8 +105,13 @@
     methods: {
       /* 搜索 */
       search () {
-        console.log(this.where);
-        this.$emit('search', this.where);
+        const parmas = this.where;
+        if (parmas.time?.length) {
+          parmas.startTime = parmas.time[0];
+          parmas.endTime = parmas.time[1];
+        }
+        delete parmas.time;
+        this.$emit('search', parmas);
       },
       /*  重置 */
       reset () {