住建-车辆绑定设备

data-ui/src/api/data/housingconstruction/car.js

@@ -69,3 +69,12 @@ export function getCarList(query) {
     params: query
   })
 }
+
+//设备列表
+export function getEquipmentList(query) {
+  return request({
+    url: '/sooka-sponest-center-monitor/gps/devices/getGasTankListByDeptId',
+    method: 'get',
+    params: query
+  })
+}

data-ui/src/views/data/housingconstruction/car/index.vue

@@ -86,7 +86,7 @@
       <el-table-column label="押运员名称" align="center" prop="escortName"/>
       <el-table-column label="应急装备" align="center" prop="emergencyEquipment"/>
       <el-table-column label="安全防护措施" align="center" prop="protection"/>
-      <el-table-column label="时速" align="center" prop="speed"/>
+<!--      <el-table-column label="时速" align="center" prop="speed"/>-->
       <el-table-column label="所属部门" align="center" prop="deptName"/>
       <el-table-column label="创建人" align="center" prop="createName"/>
       <el-table-column label="创建时间" align="center" prop="createTime"/>
@@ -196,8 +196,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="时速" prop="speed">
-              <el-input v-model="form.speed" placeholder="请输入时速" maxlength="8"/>
+            <el-form-item label="绑定设备" prop="speed">
+              <el-select v-model="form.speed" filterable placeholder="请选择设备">
+                <el-option
+                  v-for="dict in equipmentList"
+                  :key="dict.deviceid"
+                  :label="dict.devicename"
+                  :value="dict.deviceid"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -220,7 +227,7 @@
 </template>
 
 <script>
-import {listCar, getCar, delCar, addCar, updateCar,listPractitioner,listPersonnel} from "@/api/data/housingconstruction/car";
+import {listCar, getCar, delCar, addCar, updateCar,listPractitioner,listPersonnel,getEquipmentList} from "@/api/data/housingconstruction/car";
 import {getEnterpriseList} from "@/api/data/housingconstruction/steelcylinder";
 import {treeselect} from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
@@ -256,6 +263,8 @@ export default {
       sjList:[],
       //配送员列表
       psyList:[],
+      //设备列表
+      equipmentList:[],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -298,10 +307,6 @@ export default {
         driverId: [
           {required: true, message: "司机不能为空", trigger: "blur"},
         ],
-        speed: [
-          {required: true, message: "时速不能为空", trigger: "blur"},
-          {validator: checkPositiveDecimal, trigger: 'blur'}
-        ],
         deptId: [
           {required: true, message: "所属部门不能为空", trigger: "change"},
         ],
@@ -315,6 +320,7 @@ export default {
     this.getPractitioner();
     this.getSjList();
     this.getPsyList();
+    this.getEquipmentList();
   },
   methods: {
     //获取企业列表
@@ -341,6 +347,12 @@ export default {
         this.psyList = response.data;
       });
     },
+    //获取设备列表
+    getEquipmentList() {
+      getEquipmentList().then(response => {
+        this.equipmentList = response.data;
+      });
+    },
     /** 查询部门下拉树结构 */
     getTreeselect() {
       treeselect().then(response => {