Browse Source

* 修改施工单元bug

chen.cheng 5 months ago
parent
commit
a252412073

+ 1 - 1
src/views/cons/consUnit/index.vue

@@ -230,7 +230,7 @@
                 <el-option
                     v-for="machine in machineList"
                     :key="machine.id"
-                    :label="`${machine.machineNum}(${machine.equipment})`"
+                    :label="`${machine.machineNum}(${machine.name})`"
                     :value="machine.id"
                 ></el-option>
               </el-select>

+ 8 - 8
src/views/cons/pileHoleInfo/index.vue

@@ -146,14 +146,14 @@
           <el-input v-model="form.lat" placeholder="请输入纬度"/>
         </el-form-item>
         <el-form-item label="施工状态" prop="consStatus">
-          <el-radio-group v-model="form.consStatus">
-            <el-radio
-                v-for="dict in dict.type.pile_hole_status"
-                :key="dict.value"
-                :label="dict.value"
-            >{{ dict.label }}
-            </el-radio>
-          </el-radio-group>
+          <el-select v-model="form.consStatus" placeholder="请选择施工状态" clearable>
+            <el-option
+              v-for="dict in dict.type.pile_hole_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="开始时间" prop="startTime">
           <el-date-picker clearable

+ 8 - 8
src/views/cons/pileMachineInfo/index.vue

@@ -9,9 +9,9 @@
             @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="设备信息" prop="equipment">
+      <el-form-item label="设备信息" prop="name">
         <el-input
-            v-model="queryParams.equipment"
+            v-model="queryParams.name"
             placeholder="请输入设备信息"
             clearable
             @keyup.enter.native="handleQuery"
@@ -77,7 +77,7 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="编号" align="center" prop="id"/>
       <el-table-column label="桩机编号" align="center" prop="machineNum"/>
-      <el-table-column label="设备信息" align="center" prop="equipment"/>
+      <el-table-column label="设备信息" align="center" prop="name"/>
       <el-table-column label="车牌号" align="center" prop="no"/>
       <el-table-column label="SN" align="center" prop="sn"/>
       <el-table-column label="创建时间" align="center" prop="updateTime" width="180">
@@ -129,8 +129,8 @@
         <el-form-item label="车牌号" prop="no">
           <el-input v-model="form.no" placeholder="请输入车牌号"/>
         </el-form-item>
-        <el-form-item label="设备信息" prop="equipment">
-          <el-input v-model="form.equipment" placeholder="请输入设备信息"/>
+        <el-form-item label="设备信息" prop="name">
+          <el-input v-model="form.name" placeholder="请输入设备信息"/>
         </el-form-item>
         <el-form-item label="SN" prop="sn">
           <el-input v-model="form.sn" placeholder="请输入SN"/>
@@ -201,7 +201,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         machineNum: null,
-        equipment: null,
+        name: null,
       },
       // 表单参数
       form: {},
@@ -210,7 +210,7 @@ export default {
         machineNum: [
           {required: true, message: "桩机编号不能为空", trigger: "blur"}
         ],
-        equipment: [
+        name: [
           {required: true, message: "设备信息不能为空", trigger: "blur"}
         ],
       }
@@ -239,7 +239,7 @@ export default {
       this.form = {
         id: null,
         machineNum: null,
-        equipment: null,
+        name: null,
         updateTime: null,
         createTime: null,
         createBy: null,