Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/views/component/device/deviceDialog.vue

@@ -884,7 +884,7 @@
                           </el-col>
                         </el-row>
                         <el-row
-                          v-if="form.shiFouXiaoZhun === '是' && !isSheKou"
+                          v-if="form.shiFouXiaoZhun === '是'"
                         >
                           <el-col>
                             <el-form-item
@@ -903,7 +903,7 @@
                           </el-col>
                         </el-row>
                         <el-row
-                          v-if="form.shiFouXiaoZhun === '是' && !isSheKou"
+                          v-if="form.shiFouXiaoZhun === '是'"
                         >
                           <el-col>
                             <el-form-item
@@ -922,7 +922,7 @@
                           </el-col>
                         </el-row>
                         <el-row
-                          v-if="form.shiFouXiaoZhun === '是' && !isSheKou"
+                          v-if="form.shiFouXiaoZhun === '是'"
                         >
                           <el-col>
                             <el-form-item
@@ -942,7 +942,7 @@
                           </el-col>
                         </el-row>
                         <el-row
-                          v-if="form.shiFouXiaoZhun === '是' && !isSheKou"
+                          v-if="form.shiFouXiaoZhun === '是'"
                         >
                           <el-col>
                             <el-form-item label="修正值：" label-width="140px">