Merge branch 'master' of gitlab.gavelinfo.com:lisu/zghywpc-vue

src/views/sbjxgl/sbjxxx/index.vue

@@ -125,7 +125,14 @@
                 span: 6,
                 type: 'input',
                 value: ''
-              }
+              },
+              {
+                  label: '设备编码',
+                  prop: 'sbxxCode',
+                  span: 6,
+                  type: 'input',
+                  value: ''
+                }
 
             ]
           ],

src/views/yhlywsytst/yhlywsytst/index.vue

@@ -61,7 +61,7 @@
       </div> -->
     </div>
 
-  <!-- <div class="toolButton2">
+    <!-- <div class="toolButton2">
       <div class="flex1 text-center">
         <el-checkbox v-model="xzjj">选中时近景</el-checkbox>
       </div>
@@ -486,12 +486,17 @@
         this.showDialog = true
       },
       apiGetYwxx() {
-        this.$post('ywxxgl/uywxx/query', this.queryParams).then(res => {
+        this.$post('ywxxgl/uywxx/query', {
+          sbxxCode: this.selectedModel.name,
+          }
+        ).then(res => {
           this.ywlistData = res.data.records || []
         })
       },
       apiGetJxxx() {
-        this.$post('jxgl/usbjx/query', this.queryParams).then(res => {
+        this.$post('jxgl/usbjx/query', {
+          sbxxCode: this.selectedModel.name
+        }).then(res => {
           this.jxlistData = res.data.records || []
         })
       },

src/views/ywxxgl/ywxxgl/index.vue

@@ -123,7 +123,14 @@
                 span: 6,
                 type: 'input',
                 value: ''
-              }
+              },
+              {
+                  label: '设备编码',
+                  prop: 'sbxxCode',
+                  span: 6,
+                  type: 'input',
+                  value: ''
+                }
 
             ]
           ],