Selaa lähdekoodia

增加车辆轨迹间隔设置。

zhengqiang 4 vuotta sitten
vanhempi
commit
b47d9c3fdc
3 muutettua tiedostoa jossa 120 lisäystä ja 80 poistoa
  1. 2 2
      .env.development
  2. 113 78
      src/views/bus/vehicleInfo-detail.vue
  3. 5 0
      src/views/bus/vehicleInfo-list.vue

+ 2 - 2
.env.development

@@ -1,8 +1,8 @@
 OUT_PUT_DIR=dist/smart-bus-portal
 
-#VUE_APP_BACKEND_URL=http://127.0.0.1:8086/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://121.37.187.149/smart-bus-server
+#VUE_APP_BACKEND_URL=http://121.37.187.149/smart-bus-server
 
 #手机企业版
 VUE_APP_COMPANY_HEALTH_WECHAT_QY_URL=http://wisdomhousewechat.sudaonline.net/prevention/motemwall.html 

+ 113 - 78
src/views/bus/vehicleInfo-detail.vue

@@ -6,11 +6,12 @@
 </style>
 <template>
   <el-dialog
+    top="5vh"
     :visible.sync="showDialog"
     :title="title"
     :modal-append-to-body="false"
     style="text-align: left"
-    width="40%"
+    width="800px"
     @close="closeDialog"
     :close-on-click-modal="false"
   >
@@ -21,83 +22,117 @@
         :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="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="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-row>
+          <el-col :span="12">
+            <el-form-item label="所属公司" prop="companyId">
+              <el-select-tree
+                :props="props"
+                :options="companyResult"
+                v-model="formModel.companyId"
+                size="mediumn"
+                width="200px"
+              ></el-select-tree>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <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-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="车牌号" prop="licensePlateNumber">
+              <el-input
+                v-model="formModel.licensePlateNumber"
+                placeholder="请输入车牌号"
+                style="width: 200px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="gps设备编号" prop="gpsDeviceNo">
+              <el-input
+                v-model="formModel.gpsDeviceNo"
+                placeholder="请输入gps设备编号"
+                style="width: 200px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="打卡设备编号" prop="deviceNo">
+              <el-input
+                v-model="formModel.deviceNo"
+                placeholder="请输入打卡设备编号"
+                style="width: 200px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+          <el-form-item label="平板设备编号" prop="activationCode">
+            <el-input
+              v-model="formModel.activationCode"
+              placeholder="请输入激活码"
+              style="width: 200px"
+            ></el-input>
+          </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="荷载人数" prop="loadNumber">
+              <el-input
+                v-model="formModel.loadNumber"
+                type="number"
+                placeholder="请输入荷载人数"
+                style="width: 200px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="轨迹间隔(秒)" prop="trailInterval">
+              <el-input
+                v-model="formModel.trailInterval"
+                type="number"
+                placeholder="请输入轨迹间隔"
+                style="width: 200px"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <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-col>
+        </el-row>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">

+ 5 - 0
src/views/bus/vehicleInfo-list.vue

@@ -132,6 +132,11 @@
         label="荷载人数"
         width="100"
       ></el-table-column>
+      <el-table-column
+        prop="trailInterval"
+        label="轨迹间隔(秒)"
+        width="100"
+      ></el-table-column>
     <el-table-column prop="status"  label="车辆状态"  width="100">
           <template slot-scope="{ row }">
             <span v-if="row.status==1">正常</span>