志鹏哥快回来我要死了

src/views/Platform/testPage.vue

@@ -408,8 +408,14 @@ export default {
     },
     pageIndex() {
       queryTestPlanCaseList({ pageSize: this.pageSize, curIndex: this.curIndex, testPlanId: this.startId }).then(res => {
-        this.gridData = res.data
-        this.total = res.total
+        this.gridData = res.data.list.map(item => ({
+          ...item.caseInfo,
+          thrr: this.startId,
+          ids: item.id,
+          status_case: item.status,
+          keys: item.status
+        }))
+        this.total = res.data.total
       })
     },
 
@@ -483,14 +489,14 @@ export default {
         this.createParticipation.curIndex = this.curIndex
         queryTestPlanCaseList(this.createParticipation).then(res => {
           this.gridData = []
-          res.data.map(item => {
+          res.data.list.map(item => {
             item.caseInfo.ids = item.id
             item.caseInfo.status_case = item.status
             item.caseInfo.keys = item.status
             item.caseInfo.thrr = this.startId
             this.gridData.push(item.caseInfo)
           })
-          this.total = res.data.length
+          this.total = res.data.total
         })
       }
     },
@@ -629,7 +635,7 @@ export default {
 
     // 点击节点
     clickFun(e) {
-      console.log(e)
+      // console.log(e)
       this.test_plan = {}
       this.pegs = ''
       e.codes === '1' ? this.Parentids = e.id : ''
@@ -639,14 +645,22 @@ export default {
         this.startId = e.id
         queryTestPlanCaseList({ pageSize: this.pageSize, curIndex: this.curIndex, testPlanId: e.id }).then(res => {
           this.gridData = []
-          res.data.map(item => {
-            item.caseInfo.thrr = e.id
-            item.caseInfo.ids = item.id
-            item.caseInfo.status_case = item.status
-            item.caseInfo.keys = item.status
-            this.gridData.push(item.caseInfo)
-          })
-          this.total = this.gridData.length
+          // res.data.list.map(item => {
+          //   item.caseInfo.thrr = e.id
+          //   item.caseInfo.ids = item.id
+          //   item.caseInfo.status_case = item.status
+          //   item.caseInfo.keys = item.status
+          //   this.gridData.push(item.caseInfo)
+          //   console.log(this.gridData)
+          // })
+          this.gridData = res.data.list.map(item => ({
+            ...item.caseInfo,
+            thrr: e.id,
+            ids: item.id,
+            status_case: item.status,
+            keys: item.status
+          }))
+          this.total = res.data.total
         })
         this.implement()
       }

src/views/virtualDevices/HMvehicle.vue

@@ -25,7 +25,7 @@
           <div class="set-between">
             <el-button type="primary" size="medium" @click="dataQuery(queryCode)">搜索</el-button>
             <el-button type="primary" size="medium" @click="createdCode()">新增</el-button>
-            <el-button type="primary" size="medium" @click="oneKeyCreate()">一键创建</el-button>
+            <!-- <el-button type="primary" size="medium" @click="oneKeyCreate()">一键创建</el-button> -->
           </div>
         </el-form>
         <div class="set-locate">
@@ -51,6 +51,11 @@
               label="ECUID"
               align="center"
             />
+            <el-table-column label="二维码" align="center" min-width="40px" class-name="small-padding fixed-width">
+              <template slot-scope="{row}">
+                <a href="javascript:void(0)" style="color:#20a0ff" @click="checkUrl(row)">查看</a>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="vehicleVersion"
               label="车辆类型"
@@ -121,6 +126,14 @@
               </template>
             </el-table-column>
           </el-table>
+
+          <el-dialog v-if="date2" :title="textMap[dialogStatus]" :visible.sync="dialogForUrl" width="400px" :center="true" :destroy-on-close="true" @close="dle_Data">
+            <div ref="qrcodeContainer" class="qrcode" style="margin-left:13%;margin-top:-3%" />
+            <div style="font-size:16px;margin-left:32%;margin-top:5%;height:25px">
+              车辆ID:{{ urlData.vehicleId }}
+            </div>
+
+          </el-dialog>
           <el-dialog
             title="设备详情"
             :visible.sync="dialogVisibleDetail"
@@ -184,7 +197,7 @@
 <script>
 import { cityJson } from '@/views/virtualDevices/city'
 import { createHmVirtualDevice, queryDeviceInfo, delHmVirtualDevice, offHmvirtualDevice, updateLockStatus, activeHmVirtualDevice } from '@/api/HMvehicle'
-
+import QRCode from 'qrcodejs2'
 export default {
   filters: {
     toLockStatus(e) {
@@ -202,7 +215,16 @@ export default {
   data() {
     return {
       dialogVisibleDetail: false,
+      date2: false,
+      dialogForUrl: false,
       tableData: [],
+      textMap: {
+        // update: '编辑',
+        // create: '新增',
+        // details: '设备详情',
+        url: '查看二维码'
+      },
+      urlData: '',
       vehicleSelect: [
         {
           code: 0,
@@ -357,6 +379,28 @@ export default {
         }
       })
     },
+    // 查看二维码
+    checkUrl(ele) {
+      this.date2 = true
+      this.dialogForUrl = true
+      this.dialogStatus = 'url'
+      this.urlData = ele
+      this.$nextTick(() => {
+        new QRCode(this.$refs.qrcodeContainer, {
+          text: this.urlData.qrCode,
+          with: 100,
+          height: 250,
+          colorDark: '#000000',
+          colorLight: '#ffffff',
+          correctLevel: QRCode.CorrectLevel.H
+        })
+        console.log(this.urlData.qrCode)
+      })
+    },
+
+    dle_Data() {
+      this.date2 = false
+    },
     createdCode() {
       this.$router.push({ name: '新增电单车', params: { formData: this.form }, query: { id: this.form.id }})
     },

src/views/virtualDevices/HMvehicleCreate.vue

@@ -1,31 +1,9 @@
 <template>
   <div class="set-background">
     <el-form ref="form" :model="form" hide-required-asterisk :rules="serviceDataRules">
-      <div class="block">
-        <el-form-item label="Eculd" prop="ecuId" :label-width="formLabelWidth">
-          <el-input v-model="form.ecuId" style="width: 35%;" autocomplete="off" placeholder="硬件中控ID" />
-          <div class="tip"><p>13位数字 , 示例 : ECA0419070800454</p></div>
-        </el-form-item>
-        <el-form-item label="BatteryId" prop="batteryId" :label-width="formLabelWidth">
-          <el-input v-model="form.batteryId" style="width: 35%;" autocomplete="off" placeholder="电池ID" />
-          <div class="tip"><p>13位数字 , 示例 : BAA3218101509005</p></div>
-        </el-form-item>
-        <el-form-item label="VehicleId" prop="vehicleId" :label-width="formLabelWidth">
-          <el-input v-model="form.vehicleId" style="width: 35%;" autocomplete="off" placeholder="车辆ID" />
-          <div class="tip"><p>8位数字 , 示例 : 92264605</p></div>
-        </el-form-item>
-        <el-form-item label="Imei" prop="imei" :label-width="formLabelWidth">
-          <el-input v-model="form.imei" style="width: 35%;" autocomplete="off" placeholder="终端IMEI码" />
-          <div class="tip"><p>15位数字 , 示例 : 967047046635466</p></div>
-        </el-form-item>
-        <el-form-item label="Imsi" prop="imsi" :label-width="formLabelWidth">
-          <el-input v-model="form.imsi" style="width: 35%;" autocomplete="off" placeholder="终端IMSI码" />
-          <div class="tip"><p>15位数字 , 示例 : 960046550508466</p></div>
-        </el-form-item>
-      </div>
       <div class="block">
         <el-form-item label="City" prop="cityName" :label-width="formLabelWidth">
-          <el-select v-model="form.cityName" style="width: 35%;" filterable clearable placeholder="请选择城市">
+          <el-select v-model="form.cityName" style="width: 35%;" filterable clearable placeholder="请选择城市(选填)">
             <el-option
               v-for="item in city"
               :key="item.CityID"
@@ -33,29 +11,30 @@
               :value="item.name"
             />
           </el-select>
+          <div class="tip"><p>默认 : 杭州市, 若选其他城市, 下面经纬度必填</p></div>
         </el-form-item>
         <el-form-item label="Lat" prop="lat" :label-width="formLabelWidth">
-          <el-input v-model="form.lat" style="width: 35%;" autocomplete="off" placeholder="纬度" />
-          <div class="tip"><p>保留15位小数 , 示例 : 30.290707717493753</p></div>
+          <el-input v-model="form.lat" style="width: 35%;" autocomplete="off" placeholder="纬度(选填)" />
+          <div class="tip"><p>默认 : 西溪谷纬度 30.290707717493753, 保留15位小数 </p></div>
         </el-form-item>
         <el-form-item label="Lng" prop="lng" :label-width="formLabelWidth">
-          <el-input v-model="form.lng" style="width: 35%;" autocomplete="off" placeholder="经度" />
-          <div class="tip"><p>保留15位小数 , 示例 : 120.07451533496764</p></div>
+          <el-input v-model="form.lng" style="width: 35%;" autocomplete="off" placeholder="经度(选填)" />
+          <div class="tip"><p>默认 : 西溪谷经度 120.07451533496764, 保留15位小数  </p></div>
         </el-form-item>
       </div>
       <div class="block">
-        <el-form-item label="VehicleVersion" :label-width="formLabelWidth">
-          <el-input v-model="form.vehicleVersion" style="width: 35%;" autocomplete="off" placeholder="整车版本" />
-          <div class="tip"><p>H1、H2等等，默认给H1</p></div>
-        </el-form-item>
+        <!-- <el-form-item label="VehicleVersion" :label-width="formLabelWidth">
+          <el-input v-model="form.vehicleVersion" style="width: 35%;" autocomplete="off" placeholder="整车版本(选填)" />
+          <div class="tip"><p>默认 : H1, H1、H2等等</p></div>
+        </el-form-item> -->
         <el-form-item label="VehicleStatus" :label-width="formLabelWidth">
-          <el-input v-model="form.vehicleStatus" style="width: 35%;" autocomplete="off" placeholder="车辆状态" />
-          <div class="tip"><p>默认给0,0-正常；1-故障；2-高危不可用；10-低危；11-高危可用</p></div>
+          <el-input v-model="form.vehicleStatus" style="width: 35%;" autocomplete="off" placeholder="车辆状态(选填)" />
+          <div class="tip"><p>默认 : 0, 0-正常；1-故障；2-高危不可用；10-低危；11-高危可用</p></div>
         </el-form-item>
         <el-form-item label="OperationStatus" :label-width="formLabelWidth">
-          <el-input v-model="form.operationStatus" style="width: 35%;" autocomplete="off" placeholder="运营状态" />
+          <el-input v-model="form.operationStatus" style="width: 35%;" autocomplete="off" placeholder="运营状态(选填)" />
           <el-tooltip effect="dark" content="默认给100,100:运营中; 200:待运营-出厂; 201:待运营-库存; 202:待运营-移库; 301:停运-调度中; 304:停运-没收; 306:停运-已返厂; 307:停运-在库; 400:退出运营-报废" placement="top">
-            <div class="tip"><p>默认给100,100:运营中; 200:待运营-出厂; 201:待运营-库存 ...</p></div>
+            <div class="tip"><p>默认 : 100, 100:运营中; 200:待运营-出厂; 201:待运营-库存 ...</p></div>
           </el-tooltip>
         </el-form-item>
         <el-form-item class="submit">
@@ -191,7 +170,8 @@ export default {
     background-color #F2F3F6
     display flex
     justify-content center
-    min-width 700px
+    min-width 800px
+    min-height calc(100vh - 50px)
   .set-background >>> .el-form
     width 100%
     overflow auto