Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

zouyu

2023-11-15 d9a840cdf9da27c95298b0f822748ae199a0cc51

 src/views/equipment/metering/metering-form.vue

@@ -40,7 +40,7 @@
    </el-date-picker>
  </el-form-item>
  </el-col>
       

          <el-col :span="12">
            <el-form-item label="责任人" prop="createUser">
              <el-input
@@ -58,7 +58,7 @@
              ></el-input>
            </el-form-item>
          </el-col>
         

          <el-col :span="12">
            <el-form-item label="责任部门" prop="responsibleDepartment">
              <el-input
@@ -90,7 +90,7 @@
                placeholder="检定/校准"
              ></el-input>
            </el-form-item>
          </el-col> 
          </el-col>
          <el-col :span="12">
            <el-form-item label="分类" prop="classification">
              <el-input
@@ -98,7 +98,7 @@
                placeholder="分类"
              ></el-input>
            </el-form-item>
          </el-col> 
          </el-col>
          <el-col :span="12">
            <el-form-item label="定点位置" prop="fixedPointPosition">
              <el-input
@@ -106,8 +106,8 @@
                placeholder="定点位置"
              ></el-input>
            </el-form-item>
          </el-col> 
          
          </el-col>



          <!-- <el-col :span="12">
@@ -250,7 +250,7 @@
          }
        })
      },
  

      initFactorySelect() {
        loadFactoryList().then((res) => {
          this.factoryOptions = res.data
@@ -260,11 +260,11 @@
        })
      }
    },
  

    created() {
      this.initFactorySelect()
      this.getEquipmentState()
  

    //   remote('work_shop').then((response) => {
    //     if (response.data.code === 0) {
    //       this.workshopList = response.data.data
@@ -275,4 +275,3 @@
    }
  }
  </script>