Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/config/route.js

@@ -1859,7 +1859,7 @@ const routes = [
             "name": "equipmentj",
             "path": "/em/equipmentj",
             "meta": {
-              "title": "监控设备",
+              "title": "监测设备",
               "icon": "el-icon-cellphone",
               "perms": ["equipmentjk"]
             },
@@ -1875,6 +1875,16 @@ const routes = [
             },
             "component": "em/equipmentjc"
           },
+          {
+            "name": "equipmentjk",
+            "path": "/em/equipmentjk",
+            "meta": {
+              "title": "监控设备",
+              "icon": "el-icon-cellphone",
+              "perms": ["equipmentj"]
+            },
+            "component": "em/equipmentjk"
+          },
           {
             "name": "xjRecord",
             "path": "/em/xjRecord",

src/views/em/equipment.vue

@@ -195,7 +195,7 @@ import checkDialog from "./equipment_check.vue";
 import saveDialog from "./equipment_form.vue";
 import { genTree } from "@/utils/verificate";
 export default {
-  name: "rparty",
+  name: "生产设备",
   components: {
     saveDialog,
     checkDialog

src/views/em/equipmentjc.vue

@@ -167,7 +167,7 @@
 import saveDialog from "./equipment_form.vue";
 import { genTree } from "@/utils/verificate";
 export default {
-  name: "rparty",
+  name: "治理设备",
   components: {
     saveDialog,
   },

src/views/em/equipmentjk.vue

@@ -144,7 +144,7 @@
 <script>
 import saveDialog from "./equipment_form.vue";
 export default {
-  name: "rparty",
+  name: "监控设备-摄像头",
   components: {
     saveDialog,
   },
@@ -158,7 +158,7 @@ export default {
       query: {
         page: 1,
         page_size: 20,
-        type: 20,
+        type: 50,
       },
       apiObj2: this.$API.em.echeckrecord.list,
       query2: {

src/views/em/equipmentjl.vue

@@ -144,7 +144,7 @@
 <script>
 import saveDialog from "./equipment_form.vue";
 export default {
-  name: "rparty",
+  name: "监测设备-cems/tsp/小微站",
   components: {
     saveDialog,
   },
@@ -158,7 +158,7 @@ export default {
       query: {
         page: 1,
         page_size: 20,
-        type: 20,
+        type: 40,
       },
       apiObj2: this.$API.em.echeckrecord.list,
       query2: {