Merge remote-tracking branch 'origin/master'

src/views/sbxxgl/sbxx/index.vue

@@ -180,7 +180,6 @@
     },
     methods: {
       getRow(row){
-        this.$refs.sbbg.$refs.basePage.queryParams.mid = row.id
         this.$refs.sbbg.$refs.basePage.queryParams.sbxxcode = row.code
         this.$refs.sbbg.$refs.basePage.refresh()
       },

src/views/sbxxgl/sbxx/sbbg/index.vue

@@ -41,7 +41,13 @@
           url: 'sbgl/usbbg',
           tableTitle: [{
               title: "设备信息编码",
-              field: "sbxxcode",
+              field: "sbxxCode",
+              fieldType: "upper",
+              width: 140
+            },
+            {
+              title: "节点编码",
+              field: "jdCode",
               fieldType: "upper",
               width: 140
             },
@@ -65,6 +71,11 @@
               field: "z",
               width: 140
             },
+            {
+              title: "材质",
+              field: "cz",
+              width: 200
+            },
             {
               title: "备注",
               field: "bz",