上线bug

src/apiConfig/api.js

@@ -6,4 +6,4 @@ export const mockUrl = 'http://10.179.24.176:8980' // 线下
 
 export const qualityUrl = 'http://10.179.209.19:8898' // 质量度量
 
-export const HMvehicleUrl = 'http://172.23.162.169:9999' // 电单车
+export const HMvehicleUrl = 'http://172.23.163.15:9999' // 电单车

src/layout/components/AppMain.vue

@@ -1,7 +1,9 @@
 <template>
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
-      <router-view :key="key" />
+      <keep-alive>
+        <router-view :key="key" />
+      </keep-alive>
     </transition>
   </section>
 </template>

src/views/Platform/defectManagement.vue

@@ -129,7 +129,7 @@
             >
               <el-table-column
                 prop="totalBug"
-                label="总数"
+                label="有效Bug总数"
                 align="center"
               />
               <el-table-column

src/views/virtualDevices/HMvehicle.vue

@@ -1,126 +1,126 @@
 <template>
-  <div id="init-window" style="position:relative">
-    <router-view />
-    <div style="position: absolute;width: 100%;">
-      <div class="set-background">
-        <div class="block">
-          <el-form :model="queryCode">
-            <div class="set-between">
-              <div class="special-input">
-                <el-input v-model="queryCode.vehicleId" placeholder="车辆ID" clearable />
-                <el-input v-model="queryCode.ecuId" placeholder="ECUID" clearable />
-                <el-input v-model="queryCode.vehicleVersion" placeholder="车辆类型" clearable />
-              </div>
-              <div class="special-input-chose">
-                <el-select v-model="queryCode.lockStatus" placeholder="锁状态" clearable>
-                  <el-option v-for="item in lockOptions" :key="item.lockStatus" :label="item.name" :value="item.lockStatus" />
-                </el-select>
-                <el-select v-model="queryCode.isActive" placeholder="链接状态" clearable>
-                  <el-option v-for="item in linkOptions" :key="item.isActive" :label="item.name" :value="item.isActive" />
-                </el-select>
-                <el-select v-model="queryCode.cityName" filterable placeholder="城市" clearable>
-                  <el-option
-                    v-for="item in city"
-                    :key="item.CityID"
-                    :label="item.name"
-                    :value="item.name"
-                  />
-                </el-select>
-              </div>
+  <div style="width: 100%;position: relative;">
+    <div class="set-background">
+      <div class="block">
+        <el-form :model="queryCode">
+          <div class="set-between">
+            <div class="special-input">
+              <el-input v-model="queryCode.vehicleId" placeholder="车辆ID" clearable />
+              <el-input v-model="queryCode.ecuId" placeholder="ECUID" clearable />
+              <el-input v-model="queryCode.vehicleVersion" placeholder="车辆类型" clearable />
             </div>
-            <div class="set-between">
-              <el-button type="primary" plain @click="dataQuery(queryCode)">搜索</el-button>
-              <el-button type="primary" plain @click="createdCode()">新增</el-button>
+            <div class="special-input-chose">
+              <el-select v-model="queryCode.lockStatus" placeholder="锁状态" clearable>
+                <el-option v-for="item in lockOptions" :key="item.lockStatus" :label="item.name" :value="item.lockStatus" />
+              </el-select>
+              <el-select v-model="queryCode.isActive" placeholder="链接状态" clearable>
+                <el-option v-for="item in linkOptions" :key="item.isActive" :label="item.name" :value="item.isActive" />
+              </el-select>
+              <el-select v-model="queryCode.cityName" filterable placeholder="城市" clearable>
+                <el-option
+                  v-for="item in city"
+                  :key="item.CityID"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </el-select>
             </div>
-          </el-form>
-          <div class="set-locate">
-            <el-table
-              v-loading="loading"
-              :data="tableData"
-              border
-              style="width: 100%"
-              size="mini"
+          </div>
+          <div class="set-between">
+            <el-button type="primary" plain @click="dataQuery(queryCode)">搜索</el-button>
+            <el-button type="primary" plain @click="createdCode()">新增</el-button>
+          </div>
+        </el-form>
+        <div class="set-locate">
+          <el-table
+            v-loading="loading"
+            :data="tableData"
+            border
+            style="width: 100%"
+            size="mini"
+          >
+            <el-table-column
+              prop="vehicleId"
+              label="车辆ID"
+              align="center"
+              width="95"
+            />
+            <el-table-column
+              prop="vehicleVersion"
+              label="车辆类型"
+              align="center"
+              width="70"
+            />
+            <el-table-column
+              prop="ecuId"
+              label="ECUID"
+              align="center"
+            />
+            <el-table-column
+              label="锁状态"
+              align="center"
+              width="80"
+            >
+              <template slot-scope="scope">
+                <el-tag
+                  :type="scope.row.lockStatus === 1 ? 'success' : 'danger'"
+                  disable-transitions
+                >{{ scope.row.lockStatus | toLockStatus }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="链接状态"
+              align="center"
+              width="80"
             >
-              <el-table-column
-                prop="vehicleId"
-                label="车辆ID"
-                align="center"
-                width="95"
-              />
-              <el-table-column
-                prop="vehicleVersion"
-                label="车辆类型"
-                align="center"
-                width="70"
-              />
-              <el-table-column
-                prop="ecuId"
-                label="ECUID"
-                align="center"
-              />
-              <el-table-column
-                label="锁状态"
-                align="center"
-                width="80"
-              >
-                <template slot-scope="scope">
-                  <el-tag
-                    :type="scope.row.lockStatus === 1 ? 'success' : 'danger'"
-                    disable-transitions
-                  >{{ scope.row.lockStatus | toLockStatus }}</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="链接状态"
-                align="center"
-                width="80"
-              >
-                <template slot-scope="scope">
-                  <el-tag
-                    :type="scope.row.isActive === 1 ? 'success' : 'danger'"
-                    disable-transitions
-                  >{{ scope.row.isActive | toActiveStatus }}</el-tag>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="激活时间"
-                align="center"
-              >
-                <template slot-scope="scope">{{ scope.row.gmtActive | toData }}</template>
-              </el-table-column>
-              <el-table-column
-                label="操作"
-                align="center"
-                width="300"
-              >
-                <template slot-scope="scope">
-                  <div class="specail-lock">
-                    <div :class="{ 'el-icon-lock': scope.row.lockStatus === 0 ,'el-icon-unlock': scope.row.lockStatus === 1}" @click="updateLock(scope.row.ecuId, scope.row.lockStatus)" />
-                    <div>
-                      <el-button size="mini" type="success" plain @click="activate(scope.row.ecuId, scope.row.vehicleId, 'BAT0118022210043', scope.row.imsi, scope.row.imei, scope.row.vehicleVersion, scope.row.cityName)">激活</el-button>
-                      <el-button size="mini" type="info" plain @click="offHmvirtual(scope.row.ecuId)">下线</el-button>
-                      <el-button size="mini" type="danger" @click="dialogBug(scope.row.ecuId)">删除</el-button>
-                      <el-dialog
-                        :visible.sync="dialogVisible"
-                        width="30%"
-                      >
-                        <span>确定要删除这条车辆信息吗</span>
-                        <span slot="footer" class="dialog-footer">
-                          <el-button type="primary" size="mini" @click="delHmVirtual()">确 定</el-button>
-                          <el-button type="danger" size="mini" @click="dialogVisible = false">取 消</el-button>
-                        </span>
-                      </el-dialog>
-                      <el-button size="mini" type="primary">...</el-button>
-                    </div>
+              <template slot-scope="scope">
+                <el-tag
+                  :type="scope.row.isActive === 1 ? 'success' : 'danger'"
+                  disable-transitions
+                >{{ scope.row.isActive | toActiveStatus }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="激活时间"
+              align="center"
+            >
+              <template slot-scope="scope">{{ scope.row.gmtActive | toData }}</template>
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              align="center"
+              width="300"
+            >
+              <template slot-scope="scope">
+                <div class="specail-lock">
+                  <div :class="{ 'el-icon-lock': scope.row.lockStatus === 0 ,'el-icon-unlock': scope.row.lockStatus === 1}" @click="updateLock(scope.row.ecuId, scope.row.lockStatus)" />
+                  <div>
+                    <el-button size="mini" type="success" plain @click="activate(scope.row.ecuId, scope.row.vehicleId, 'BAT0118022210043', scope.row.imsi, scope.row.imei, scope.row.vehicleVersion, scope.row.cityName)">激活</el-button>
+                    <el-button size="mini" type="info" plain @click="offHmvirtual(scope.row.ecuId)">下线</el-button>
+                    <el-button size="mini" type="danger" @click="dialogBug(scope.row.ecuId)">删除</el-button>
+                    <el-dialog
+                      :visible.sync="dialogVisible"
+                      width="30%"
+                    >
+                      <span>确定要删除这条车辆信息吗</span>
+                      <span slot="footer" class="dialog-footer">
+                        <el-button type="primary" size="mini" @click="delHmVirtual()">确 定</el-button>
+                        <el-button type="danger" size="mini" @click="dialogVisible = false">取 消</el-button>
+                      </span>
+                    </el-dialog>
+                    <el-button size="mini" type="primary">...</el-button>
                   </div>
-                </template>
-              </el-table-column>
-            </el-table>
-            <el-pagination background style="margin-top:30px;" align="center" :current-page="curIndex" :page-size="pageSize" layout="prev, pager, next" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-          </div>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination background style="margin-top:30px;" align="center" :current-page="curIndex" :page-size="pageSize" layout="prev, pager, next" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
       </div>
     </div>
+    <keep-alive>
+      <router-view />
+    </keep-alive>
   </div>
 </template>
 
@@ -290,7 +290,7 @@ export default {
       background-color rgba(255,255,255,1)
       box-shadow 0px 0px 11px 0px rgba(238,240,245,1)
       border-radius 7px
-      width 93%
+      width 96%
       margin 25px 0
       padding 20px
       min-height calc(100vh - 100px)

src/views/virtualDevices/HMvehicleCreate.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="window-judge" class="set-background">
+  <div class="set-background">
     <div class="block">
       <el-form ref="form" :model="form" :rules="serviceDataRules">
         <el-form-item label="Eculd" prop="ecuId" :label-width="formLabelWidth">
@@ -55,50 +55,6 @@ export default {
       formLabelWidth: '120px',
       city: cityJson,
       value: '',
-      hmVehicleBaseInfo: {
-        'batteryVoltage': 36511,
-        'controllerTemperature': 25,
-        'holzerVelocity': 2,
-        'rechargeNum': 1,
-        'ridingCurrent': 10,
-        'rscap': 26511,
-        'rsoc': 27,
-        'singleMileage': 10,
-        'soh': 0,
-        'totalMileage': 66,
-        'vehicleStatus': {
-          'vAccStatus': 1,
-          'vBatteryLockStatus': 1,
-          'vBluetoothConnectionStatus': 1,
-          'vBorrowOrReturnStatus': 1,
-          'vExternalBatteryExistStatus': 0,
-          'vHandlerStatus': 1,
-          'vMotorLockStatus': 0,
-          'vMovingStatus': 0,
-          'vRearWheelLockStatus': 0,
-          'vRidingStatus': 0,
-          'vSleepStatus': 0
-        }
-      },
-      hmVehicleBaseStationInfo: {
-        'cellId': 37299,
-        'lac': 8448,
-        'mcc': 1120,
-        'mnc': 0
-      },
-      hmVehicleGpsInfo: {
-        'azimuth': 4,
-        'gpsSignalInfo': {
-          'backupBattery': 9,
-          'gpsLocationStatus': 1,
-          'gpsSatelliteNum': 9,
-          'gpsSignalStrength': 9
-        },
-        'gpsSpeed': 0,
-        'high': 1.2,
-        'lat': 31.85659153128749,
-        'lng': 117.26081489617174
-      },
       serviceDataRules: {
         imei: [{ required: true, message: '终端IMEI码必须为十五位', trigger: 'change' }],
         ecuId: [{ required: true, message: '硬件中控ID不能为空', trigger: 'change' }],
@@ -115,9 +71,6 @@ export default {
     createFormData(form) {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          form.hmVehicleBaseInfo = this.hmVehicleBaseInfo
-          form.hmVehicleBaseStationInfo = this.hmVehicleBaseStationInfo
-          form.hmVehicleGpsInfo = this.hmVehicleGpsInfo
           createHmVirtualDevice(form).then(res => {
             if (res.code === 200) {
               this.successFun('create')
@@ -145,11 +98,17 @@ export default {
     display flex
     justify-content center
     min-width 700px
+    position: absolute
+    z-index: 999
+    left 0
+    right 0
+    bottom 0
+    top 0
     .block
       background-color rgba(255,255,255,1)
       box-shadow 0px 0px 11px 0px rgba(238,240,245,1)
       border-radius 7px
-      width 93%
+      width 96%
       margin 25px 0
       padding 60px
       min-height calc(100vh - 100px)