Merge branch 'master' of http://39.104.94.153:3000/yf_zy/MingGao_vue

minggao/src/page/commandCenter/realTime.vue

@@ -60,7 +60,7 @@
                 <span>{{ (page - 1) * 20 + scope.row.ind }}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="real_name" label="组织成员" width="330">
+            <el-table-column prop="real_name" label="成员" width="330">
             </el-table-column>
             <el-table-column prop="mobile" label="手机号" width="250">
               <template slot-scope="scope">

minggao/src/page/commandCenter/superviseDetails.vue

@@ -418,11 +418,12 @@ export default {
   .insect_ul {
     .insect_list {
       display: flex;
-      margin: 0 0 20px 0;
+      // margin: 0 0 20px 0;
+      margin-bottom: 20px;
       div {
-        font-size: 18px;
-        width: 20%;
-        text-align: right;
+        font-size: 16px;
+        width: 30%;
+        text-align: left;
       }
     }
   }

minggao/src/page/commandCenter/taskRegulatorDetails.vue

@@ -363,12 +363,12 @@ export default {
   .insect_ul {
     .insect_list {
       display: flex;
-      margin: 0 0 20px 0;
+      // margin: 0 0 20px 0;
+      margin-bottom: 20px;
       div {
-        font-size: 18px;
-        width: 20%;
-        text-align: right;
-        margin: 0px 0 0 -35px;
+        font-size: 16px;
+        width: 30%;
+        text-align: left;
       }
     }
   }

minggao/src/page/forecasting/trap/fillinrecord.vue

@@ -85,7 +85,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="trap_number" label="编号"></el-table-column>
-          <el-table-column prop="org_name" label="组织">
+          <el-table-column prop="org_name" label="隶属海关">
             <template slot-scope="scope">
               <span v-if="scope.row.org_name.split(',').length == 1">{{
                 scope.row.org_name

minggao/src/page/forecasting/trap/trap.vue

@@ -100,7 +100,7 @@
               <span>{{ ToDegrees(scope.row.lat, "lat") }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="org_list" label="组织">
+          <el-table-column prop="org_list" label="隶属海关">
             <template slot-scope="scope">
               <span v-if="scope.row.org_list.length == 1">{{
                 scope.row.org_list[0].org_name

minggao/src/page/monitor/Monitor.vue

@@ -2671,14 +2671,14 @@ export default {
 .haiguan {
   display: flex;
   flex-wrap: wrap;
-  margin-top: 10px;
+  margin-top: 5px;
   .haiguan_item {
-    width: 70px;
+    // width: 70px;
     height: 20px;
     border: 1px solid #d4d2d2;
     line-height: 20px;
     margin-right: 10px;
-    padding: 0 0 0 10px;
+    padding: 2px 10px;
     border-radius: 5px;
   }
   .haiguan_itemnone {

minggao/src/page/superviseModule/superviseModuleDetails.vue

@@ -412,12 +412,12 @@ export default {
   .insect_ul {
     .insect_list {
       display: flex;
-      margin: 0 0 20px 0;
+      // margin: 0 0 20px 0;
+      margin-bottom: 20px;
       div {
-        font-size: 18px;
-        width: 20%;
-        text-align: right;
-        margin: 0px 0 0 -35px;
+        font-size: 16px;
+        width: 30%;
+        text-align: left;
       }
     }
   }

minggao/src/page/systemmanger/userManger.vue

@@ -76,7 +76,7 @@
             <el-table-column
               :show-overflow-tooltip="true"
               prop="org_list"
-              label="所属组织"
+              label="隶属海关"
               width="280"
             >
               <template slot-scope="scope">

minggao/src/util/http.js

@@ -65,7 +65,10 @@ axios.interceptors.response.use(res => {
         router.push("/Login");
       },3000)
     }
-    Message.warning(res.data.message);
+    if (document.getElementsByClassName("el-message").length == 0) {
+      Message.warning(res.data.message);
+    }
+    
   }
   return res
 }, error => {