From 3606bc534442079a702cce008d52126fcdec352e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Tue, 9 Aug 2022 16:53:23 +0800
Subject: [PATCH] up

---
 src/utils/request.js                    | 13 ++++++---
 src/views/daily/index.vue               | 35 +++++++++++++------------
 src/views/lawsfile/index/regulation.vue |  5 ++--
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index ddf9373..dbe135b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,7 +1,8 @@
 import axios from 'axios'
-import { MessageBox, Message } from 'element-ui'
+import { MessageBox, Message ,Loading} from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
+let loading;
 
 // create an axios instance
 const service = axios.create({
@@ -13,8 +14,12 @@ const service = axios.create({
 // request interceptor
 service.interceptors.request.use(
   config => {
-    // do something before request is sent
-
+   // do something before request is sent
+   loading = Loading.service({
+     lock:true,
+     background:"rgba(0,0,0,0.4)",
+     text:"正在加载中..."
+   })
     if (store.getters.token) {
       // let each request carry token
       // ['X-Token'] is a custom headers key
@@ -45,6 +50,7 @@ service.interceptors.response.use(
    * You can also judge the status by HTTP Status Code
    */
   response => {
+    loading.close()
     const res = response.data
 
     // if the custom code is not 20000, it is judged as an error.
@@ -74,6 +80,7 @@ service.interceptors.response.use(
     }
   },
   error => {
+    loading.close()
     console.log('err' + error) // for debug
     Message({
       message: error.message,
diff --git a/src/views/daily/index.vue b/src/views/daily/index.vue
index eee1e4a..3e200be 100644
--- a/src/views/daily/index.vue
+++ b/src/views/daily/index.vue
@@ -15,7 +15,7 @@
         </LxHeader>
       </div>
       <div ref="lxTable">
-        <el-table :data="tableData" class="v-table"  :height="tableHeight" style="width: 100%">
+        <el-table :data="tableData" class="v-table" :height="tableHeight" style="width: 100%">
           <el-table-column type="index" width="50" align="center" fixed="left"> </el-table-column>
           <el-table-column :prop="column.field" :align="column.align" v-for="(column,index) in columns"
             :label="column.title" :width="column.width" :fixed="column.fixed">
@@ -31,10 +31,11 @@
                   </el-link>
                 </div>
                 <div v-if="column.field=='task_departments'">
-                  <el-tag v-for="(tag, tIndex) in scope.row['task_name']"
-                    style="margin-right: 5px;margin-bottom: 5px;">
-                    {{tag.name}}
-                  </el-tag>
+                  <block v-for="(tag, tIndex) in scope.row['task_name']">
+                    <el-tag style="margin-right: 5px;margin-bottom: 5px;" v-if="tag.id">
+                      {{tag.name}}
+                    </el-tag>
+                  </block>
                 </div>
                 <div v-if="column.field=='admin'">
                   {{scope.row[column.field]?scope.row[column.field].name:""}}
@@ -298,18 +299,18 @@
         listtask({
           page: this.paginations.page,
           page_size: this.paginations.page_size,
-          keyword:this.searchFields.KeyWord
-        }).then(response => {
-          var that = this
-          for(var m of response.data){
-            if(m.safety_task_departments){
-              let task_list = []
-              for(var k of m.safety_task_departments){
-                let dep = Object.assign({}, k.departments)
-                task_list.push(dep)
-              }
-              m.task_name = task_list
-            }
+          keyword: this.searchFields.KeyWord
+        }).then(response => {
+          var that = this
+          for (var m of response.data) {
+            if (m.safety_task_departments) {
+              let task_list = []
+              for (var k of m.safety_task_departments) {
+                let dep = Object.assign({}, k.departments)
+                task_list.push(dep)
+              }
+              m.task_name = task_list
+            }
           }
           this.tableData = response.data;
           this.paginations.page_size = response.total;
diff --git a/src/views/lawsfile/index/regulation.vue b/src/views/lawsfile/index/regulation.vue
index 753f9f7..62fa477 100644
--- a/src/views/lawsfile/index/regulation.vue
+++ b/src/views/lawsfile/index/regulation.vue
@@ -127,7 +127,7 @@
 
       },
       edit(obj) {
-        this.form = this.$options.data().form
+        this.form = this.$options.data().form;
         this.form.type = parseInt(this.$route.path.split("_")[1]);
         if (obj) {
           var result = Object.assign(this.form, obj);
@@ -138,7 +138,8 @@
         this.dialogFormVisible = true;
       },
       addchildren(obj) {
-        this.form = this.$options.data().form
+        this.form = this.$options.data().form;
+        this.form.type = parseInt(this.$route.path.split("_")[1]);
         if (obj) {
           this.form.pname = obj.name;
           this.form.pid = obj.id;