yusheng преди 4 дни
родител
ревизия
290c251bf8

+ 46 - 97
src/views/warning/warningMessage/components/message-search.vue

@@ -1,113 +1,62 @@
-<!-- 搜索表单 -->
 <template>
-  <el-form
-    label-width="100px"
-    class="ele-form-search"
-    @keyup.enter.native="search"
-    @submit.native.prevent
-  >
-    <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
-        <el-form-item label="告警级别:" prop="level">
-          <el-select filterable v-model="where.level" size="small">
-            <el-option label="轻微" :value="1"></el-option>
-            <el-option label="中等" :value="2"></el-option>
-            <el-option label="严重" :value="3"></el-option>
-            <el-option label="紧急" :value="4"></el-option>
-            <el-option label="致命" :value="5"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-
-      <!-- <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
-        <el-form-item label="告警时间:" label-width="80px">
-          <el-date-picker
-            v-model="time"
-            style="width: 100%"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="['00:00:00', '23:59:59']"
-          >
-          </el-date-picker>
-        </el-form-item>
-      </el-col> -->
-      <!-- <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 5 }">
-        <el-form-item label="组织机构:">
-          <auth-selection v-model="where.deptIds" style="width: 100%"></auth-selection>
-        </el-form-item>
-      </el-col> -->
-      <el-col v-bind="styleResponsive ? { lg: 4, md: 12 } : { span: 5 }">
-        <div class="ele-form-actions">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-            size="small"
-          >
-            查询
-          </el-button>
-          <el-button
-            @click="reset"
-            icon="el-icon-refresh-left"
-            size="small"
-            type="primary"
-            >重置
-          </el-button>
-        </div>
-      </el-col>
-    </el-row>
-  </el-form>
+  <seek-page
+    :seekList="seekList"
+    :formLength="4"
+    @search="search"
+    @reset="reset"
+  />
 </template>
 
 <script>
-  import equipmentSelect from '@/components/CommomSelect/equipment-select.vue';
-
   export default {
-    components: { equipmentSelect },
     data() {
-      // 默认表单数据
-      const defaultWhere = {
-        level: ''
-      };
       return {
-        // 表单数据
-        where: { ...defaultWhere },
-        time: []
+        seekList: [
+          {
+            label: '告警级别',
+            value: 'level',
+            type: 'select',
+            placeholder: '请选择',
+            selectList: [
+              { label: '轻微', value: 1 },
+              { label: '中等', value: 2 },
+              { label: '严重', value: 3 },
+              { label: '紧急', value: 4 },
+              { label: '致命', value: 5 }
+            ]
+          },
+          // {
+          //   label: '告警名称',
+          //   value: 'keyWord',
+          //   type: 'input',
+          //   placeholder: '请输入'
+          // },
+          {
+            label: '设备名称',
+            value: 'deviceName',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '状态',
+            value: 'handleStatus',
+            type: 'select',
+            placeholder: '请选择',
+            selectList: [
+              { label: '未处理', value: '0' },
+              { label: '已处理', value: '2' }
+            ]
+          }
+        ]
       };
     },
-    computed: {
-      // 是否开启响应式布局
-      styleResponsive() {
-        return this.$store.state.theme.styleResponsive;
-      }
-    },
-    created() {},
     methods: {
-      /* 搜索 */
-      search() {
-        if (this.time.length) {
-          this.where.startTime = this.time[0];
-          this.where.endTime = this.time[1];
-        }
-        this.$emit('search', this.where);
+      search(where) {
+        this.$emit('search', where);
       },
-      /*  重置 */
       reset() {
-        this.time = [];
-        this.where = { ...this.defaultWhere };
-        this.search();
+        this.$emit('search', {});
       }
     }
   };
 </script>
-<style lang="scss" scoped>
-  .ele-form-actions {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-  }
-</style>

+ 46 - 87
src/views/warning/warningSetting/components/setting-search.vue

@@ -1,103 +1,62 @@
-<!-- 搜索表单 -->
 <template>
-  <el-form
-    label-width="100px"
-    class="ele-form-search"
-    @keyup.enter.native="search"
-    @submit.native.prevent
-  >
-    <el-row :gutter="15">
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="告警级别:" prop="level">
-          <el-select filterable v-model="where.level" size="small">
-            <el-option label="轻微" :value="1"></el-option>
-            <el-option label="中等" :value="2"></el-option>
-            <el-option label="严重" :value="3"></el-option>
-            <el-option label="紧急" :value="4"></el-option>
-            <el-option label="致命" :value="5"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="告警名称:" prop="name">
-          <el-input filterable v-model="where.name" size="small"> </el-input>
-        </el-form-item>
-      </el-col> -->
-      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="组织机构:">
-          <auth-selection
-            v-model="where.deptIds"
-            style="width: 100%"
-          ></auth-selection>
-        </el-form-item>
-      </el-col> -->
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <div class="ele-form-actions">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-            size="small"
-          >
-            查询
-          </el-button>
-          <el-button
-            @click="reset"
-            icon="el-icon-refresh-left"
-            size="small"
-            type="primary"
-            >重置</el-button
-          >
-        </div>
-      </el-col>
-    </el-row>
-  </el-form>
+  <seek-page
+    :seekList="seekList"
+    :formLength="4"
+    @search="search"
+    @reset="reset"
+  />
 </template>
 
 <script>
-  import equipmentSelect from '@/components/CommomSelect/equipment-select.vue';
   export default {
-    components: { equipmentSelect },
     data() {
-      // 默认表单数据
-      const defaultWhere = {
-        name: '',
-        ruleName: '',
-        code: '',
-        groupId: '',
-        status: '',
-        categoryLevelId: ''
-      };
       return {
-        // 表单数据
-        where: { ...defaultWhere }
+        seekList: [
+          {
+            label: '告警级别',
+            value: 'level',
+            type: 'select',
+            placeholder: '请选择',
+            selectList: [
+              { label: '轻微', value: 1 },
+              { label: '中等', value: 2 },
+              { label: '严重', value: 3 },
+              { label: '紧急', value: 4 },
+              { label: '致命', value: 5 }
+            ]
+          },
+          {
+            label: '告警名称',
+            value: 'keyWord',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '设备名称',
+            value: 'deviceName',
+            type: 'input',
+            placeholder: '请输入'
+          },
+          {
+            label: '状态',
+            value: 'status',
+            type: 'select',
+            placeholder: '请选择',
+            selectList: [
+              { label: '启用', value: 1 },
+              { label: '停用', value: '0' }
+            ]
+          }
+        ]
       };
     },
-    computed: {
-      // 是否开启响应式布局
-      styleResponsive() {
-        return this.$store.state.theme.styleResponsive;
-      }
-    },
-    created() {},
     methods: {
-      /* 搜索 */
-      search() {
-        this.$emit('search', this.where);
+      search(where) {
+        this.$emit('search', where);
       },
-      /*  重置 */
       reset() {
-        this.where = { ...this.defaultWhere };
-        this.search();
+        this.$emit('search', {});
       }
     }
   };
 </script>
-<style lang="scss" scoped>
-  .ele-form-actions {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-  }
-</style>

+ 8 - 0
src/views/warning/warningSetting/index.vue

@@ -141,6 +141,14 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'deviceName',
+            label: '设备名称',
+            slot: 'deviceName',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 200
+          },
           {
             prop: 'level',
             label: '告警级别',