车辆 绑定线路，激活码

.env.development

@@ -1,7 +1,7 @@
 OUT_PUT_DIR=dist/smart-bus-portal
 
-#VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-bus-server
-VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/smart-bus-server
+VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-bus-server
+#VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/smart-bus-server
 #VUE_APP_BACKEND_URL=http://qylhhapi.xiaoxinda.com/enterprise-server
 
 #手机企业版

src/api/bus/routeInfo.js

@@ -50,6 +50,10 @@ function updateMapPath(formModel) {
   });
 }
 
+function list(formData) {
+  return request.post(constant.serverUrl + "/bus/routeInfo/list", formData);
+}
+
 export default {
-  create, edit, add, update, remove, batchRemove, pageList,updateMapPath
+  create, edit, add, update, remove, batchRemove, pageList,updateMapPath,list
 }

src/views/bus/vehicleInfo-detail.vue

@@ -21,61 +21,83 @@
         :rules="ruleValidate"
         :label-width="'130px'"
       >
-          <el-form-item label="所属公司" prop="companyId">
-            <el-select-tree
-              :props="props"
-              :options="companyResult"
-              v-model="formModel.companyId"
-              size="mediumn"
-              width="400px"
-            ></el-select-tree>
-          </el-form-item>
+        <el-form-item label="所属公司" prop="companyId">
+          <el-select-tree
+            :props="props"
+            :options="companyResult"
+            v-model="formModel.companyId"
+            size="mediumn"
+            width="400px"
+          ></el-select-tree>
+        </el-form-item>
+        <el-form-item label="线路" prop="routeId">
+          <el-select
+            v-model="formModel.routeId"
+            filterable
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in routeList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
 
-          <el-form-item label="车牌号" prop="licensePlateNumber">
-              <el-input
-                v-model="formModel.licensePlateNumber"
-                placeholder="请输入车牌号"
-                style="width: 400px"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="gps设备编号" prop="gpsDeviceNo">
-              <el-input
-                v-model="formModel.gpsDeviceNo"
-                placeholder="请输入gps设备编号"
-                style="width: 400px"
-              ></el-input>
-            </el-form-item>
-           <el-form-item label="设备编号" prop="deviceNo">
-              <el-input
-                v-model="formModel.deviceNo"
-                placeholder="请输入设备编号"
-                style="width: 400px"
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="荷载人数" prop="loadNumber">
-              <el-input
-                v-model="formModel.loadNumber"
-                type="number"
-                placeholder="请输入荷载人数"
-                style="width: 400px"
-              ></el-input>
-            </el-form-item>
+        <el-form-item label="车牌号" prop="licensePlateNumber">
+          <el-input
+            v-model="formModel.licensePlateNumber"
+            placeholder="请输入车牌号"
+            style="width: 400px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="gps设备编号" prop="gpsDeviceNo">
+          <el-input
+            v-model="formModel.gpsDeviceNo"
+            placeholder="请输入gps设备编号"
+            style="width: 400px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="设备编号" prop="deviceNo">
+          <el-input
+            v-model="formModel.deviceNo"
+            placeholder="请输入设备编号"
+            style="width: 400px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="激活码" prop="activationCode">
+          <el-input
+            v-model="formModel.activationCode"
+            placeholder="请输入激活码"
+            style="width: 400px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="荷载人数" prop="loadNumber">
+          <el-input
+            v-model="formModel.loadNumber"
+            type="number"
+            placeholder="请输入荷载人数"
+            style="width: 400px"
+          ></el-input>
+        </el-form-item>
 
-            <el-form-item label="车辆照片" prop="picture">
-              <el-upload
-                class="avatar-uploader"
-                name="photoFile"
-                :action="uploadUrl"
-                :show-file-list="false"
-                :headers="headers"
-                :data="uploadData"
-                :on-success="handleAvatarSuccess"
-                :before-upload="beforeAvatarUpload"
-              >
-                <img v-if="fileUrl" :src="fileUrl" class="avatar" />
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-              </el-upload>
-            </el-form-item>
+        <el-form-item label="车辆照片" prop="picture">
+          <el-upload
+            class="avatar-uploader"
+            name="photoFile"
+            :action="uploadUrl"
+            :show-file-list="false"
+            :headers="headers"
+            :data="uploadData"
+            :on-success="handleAvatarSuccess"
+            :before-upload="beforeAvatarUpload"
+          >
+            <img v-if="fileUrl" :src="fileUrl" class="avatar" />
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">
@@ -91,6 +113,7 @@ import Constant from "@/constant";
 import vehicleInfoApi from "@/api/bus/vehicleInfo";
 import SelectTree from "@/components/SelectTree";
 import companyInfoApi from "@/api/bus/companyInfo";
+import routeInfoApi from "@/api/bus/routeInfo";
 
 import { getToken } from "@/utils/auth"; // get token from cookie
 
@@ -99,7 +122,7 @@ export default {
   data() {
     return {
       formModel: {
-        enableChangeParent: false
+        enableChangeParent: false,
       },
       ruleValidate: {
         companyId: [
@@ -114,6 +137,12 @@ export default {
         deviceNo: [
           { required: true, message: "设备编号不能为空", trigger: "blur" },
         ],
+        activationCode: [
+          { required: true, message: "激活码不能为空", trigger: "blur" },
+        ],
+        routeId:[
+          { required: true, message: "线路不能为空", trigger: "blur" },
+        ],
       },
       showDialog: true,
       loading: false,
@@ -138,8 +167,19 @@ export default {
       },
       sceneData: [],
       regionData: [],
+      routeList: [],
     };
   },
+  watch: {
+    "formModel.companyId"(newVal, oldVal) {
+      var formData = new FormData();
+      formData.append("companyId", newVal);
+      routeInfoApi.list(formData).then((response) => {
+        var jsonData = response.data;
+        this.routeList = jsonData.data;
+      });
+    },
+  },
   created() {
     var self = this;
 
@@ -239,6 +279,13 @@ export default {
             self.fileUrl =
               picture + "?x-oss-process=image/resize,m_lfit,h_400,w_400";
           }
+
+          var formData = new FormData();
+          formData.append("companyId", self.formModel.companyId);
+          routeInfoApi.list(formData).then((response) => {
+            var jsonData = response.data;
+            this.routeList = jsonData.data;
+          });
         } else {
           self.$message.error(jsonData.message + "");
         }

src/views/bus/vehicleInfo-list.vue

@@ -96,6 +96,11 @@
         label="车牌号"
         width="150"
       ></el-table-column>
+      <el-table-column
+        prop="routeName"
+        label="线路"
+        width="150"
+      ></el-table-column>
       <el-table-column
         prop="gpsDeviceNo"
         label="gps设备编号"
@@ -104,7 +109,12 @@
       <el-table-column
         prop="deviceNo"
         label="门禁设备编号"
-        width="200"
+        width="220"
+      ></el-table-column>
+      <el-table-column
+        prop="activationCode"
+        label="激活码"
+        width="130"
       ></el-table-column>
       <el-table-column prop="picture" label="照片" width="150">
             <template slot-scope="{row}">