测

src/views/maintenance/patrol/workOrder/index.vue

@@ -1,6 +1,12 @@
 <template>
   <div class="ele-body">
     <el-card shadow="never" v-loading="loading">
+      <el-tabs v-model="activeTab" @tab-click="handleTabClick" style="margin-bottom: 10px">
+        <el-tab-pane label="全部" name=""></el-tab-pane>
+        <el-tab-pane label="场站5" name="2008729845612720129"></el-tab-pane>
+        <el-tab-pane label="场站6" name="2008729929536548865"></el-tab-pane>
+        <el-tab-pane label="场站7" name="2008730320160468994"></el-tab-pane>
+      </el-tabs>
       <work-search @search="reload"> </work-search>
       <!-- 数据表格 -->
       <!-- :default-sort="{ prop: 'createTime', order: 'descending' }" -->
@@ -274,6 +280,7 @@
         ],
         // 加载状态
         loading: false,
+        activeTab: '',
         pageType: 'add',
         dialogTitle: '',
         isBindPlan: false
@@ -286,12 +293,16 @@
     methods: {
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
-        return getWorkOrderPage({
+        const params = {
           pageNum: page,
           size: limit,
           ...where,
           type: 1
-        });
+        };
+        if (this.activeTab) {
+          params.executeGroupId = this.activeTab;
+        }
+        return getWorkOrderPage(params);
       },
       async changeEnable(row) {
         const res = await putRoles(row);
@@ -306,7 +317,10 @@
       },
       /* 刷新表格 */
       reload(where) {
-        this.$refs.table.reload({ page: 1, where });
+        this.$refs.table.reload({ page: 1, where: { ...where, executeGroupId: this.activeTab || undefined } });
+      },
+      handleTabClick() {
+        this.$refs.table.reload({ page: 1, where: { executeGroupId: this.activeTab || undefined } });
       },
       startExecuting(row) {
         startExecuting({ id: row.id }).then((res) => {

src/views/warning/warningMessage/components/processDialog.vue

@@ -120,10 +120,10 @@
 </template>
 
 <script>
+  import dayjs from 'dayjs';
   import {
     getAlarmlogsheetById,
-    updateAlarmlogsheet,
-  
+    updateAlarmlogsheet
   } from '@/api/warning/index.js';
 
   const defForm = {
@@ -168,6 +168,9 @@
         this.type = type;
         if (row) {
           this.form = await getAlarmlogsheetById(row.id);
+          if (this.type !== 'view' && !this.form.handleTime) {
+            this.form.handleTime = dayjs().format('YYYY-MM-DD HH:mm:ss');
+          }
         }
       },
       getLevel(val) {

src/views/warning/warningSetting/components/addWarningDialog.vue

@@ -76,10 +76,10 @@
                   v-model="baseInfoForm.generateDocumentType"
                   @change="isCreateChange"
                 >
-                  <el-radio :label="4">维修</el-radio>
-                  <el-radio :label="1">巡点检</el-radio>
-                  <el-radio :label="2">保养</el-radio>
-                  <el-radio :label="5">量具送检</el-radio>
+                  <el-radio :label="4" @click.native.prevent="toggleDocumentType(4)">维修</el-radio>
+                  <el-radio :label="1" @click.native.prevent="toggleDocumentType(1)">巡点检</el-radio>
+                  <el-radio :label="2" @click.native.prevent="toggleDocumentType(2)">保养</el-radio>
+                  <el-radio :label="5" @click.native.prevent="toggleDocumentType(5)">量具送检</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -521,6 +521,15 @@
           this.alarmNotifierList = res.list;
         } catch (error) {}
       },
+      toggleDocumentType(val) {
+        if (this.baseInfoForm.generateDocumentType === val) {
+          this.baseInfoForm.generateDocumentType = null;
+        } else {
+          this.baseInfoForm.generateDocumentType = val;
+           this.isCreateChange(this.baseInfoForm.generateDocumentType);
+        }
+       
+      },
       async isCreateChange(val) {
         const res = await getRule({
           status: 1,

src/views/warning/warningSetting/components/setting-search.vue

@@ -18,7 +18,11 @@
           </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

vue.config.js

@@ -27,6 +27,10 @@ module.exports = {
     }
   },
   devServer: {
+    headers: {
+      // 允许跨域访问子应用页面
+      'Access-Control-Allow-Origin': '*'
+    },
     // 代理跨域的配置
     proxy: {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求