更新了下电单车

src/router/index.js

@@ -478,13 +478,13 @@ export const constantRoutes = [
         meta: { title: '单车' }
       },
       {
-        path: 'HMvehicle',
+        path: 'ebike',
         name: '电单车',
         component: () => import('@/views/virtualDevices/HMvehicle.vue'),
         meta: { title: '电单车' }
       },
       {
-        path: 'HMvehicle/HTvehicleCreate',
+        path: 'ebike/ebikeCreate',
         name: '新增电单车',
         hidden: true,
         component: () => import('@/views/virtualDevices/HMvehicleCreate.vue'),

src/views/Platform/bugManage/bugCreate.vue

@@ -74,7 +74,7 @@
           <el-form-item label="bug描述" prop="bugDescribe" label-width="112px"><el-input v-model="form.bugDescribe" type="textarea" placeholder="bug描述" rows="2" style="width:89.6%;" /></el-form-item>
           <div class="line-between">
             <el-form-item label="当前处理人" prop="currentHandler" label-width="124px">
-              <el-select v-model="form.currentHandler" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+              <el-select v-model="form.currentHandler" multiple filterable placeholder="公司邮箱前缀" style="width:76%;" @visible-change="realTimeChange">
                 <el-option
                   v-for="item in optionsCurrentHandler"
                   :key="item.id"
@@ -84,7 +84,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="bug责任人" prop="assigner" label-width="147px">
-              <el-select v-model="form.assigner" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+              <el-select v-model="form.assigner" multiple filterable placeholder="公司邮箱前缀" style="width:76%;" @visible-change="realTimeChange">
                 <el-option
                   v-for="item in optionsAssigner"
                   :key="item.id"
@@ -336,6 +336,10 @@ export default {
       }
       this.$set(this.form, 'moduleId', '')
     },
+    // 点击一次更新一次
+    realTimeChange(e) {
+      if (e === true) this.getMember()
+    },
     // 人员搜索
     getMember() {
       const objDataAssigner = { bizId: this.form.bizId, email: '', role: 'rd' }

src/views/Platform/bugManage/bugUpdate.vue

@@ -62,7 +62,7 @@
           <el-form-item label="bug描述" prop="bugDescribe" label-width="112px"><el-input v-model="form.bugDescribe" type="textarea" placeholder="bug描述" rows="2" style="width:89.6%;" /></el-form-item>
           <div class="line-between">
             <el-form-item label="当前处理人" prop="currentHandler" label-width="124px">
-              <el-select v-model="form.currentHandler" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+              <el-select v-model="form.currentHandler" multiple filterable placeholder="公司邮箱前缀" style="width:76%;" @visible-change="realTimeChange">
                 <el-option
                   v-for="item in optionsCurrentHandler"
                   :key="item.id"
@@ -72,7 +72,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="bug责任人" prop="assigner" label-width="147px">
-              <el-select v-model="form.assigner" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+              <el-select v-model="form.assigner" multiple filterable placeholder="公司邮箱前缀" style="width:76%;" @visible-change="realTimeChange">
                 <el-option
                   v-for="item in optionsAssigner"
                   :key="item.id"
@@ -347,6 +347,10 @@ export default {
       }
       this.$set(this.form, 'moduleId', '')
     },
+    // 点击一次更新一次
+    realTimeChange(e) {
+      if (e === true) this.getMember()
+    },
     // 人员搜索
     getMember() {
       const objDataAssigner = { bizId: this.form.bizId, email: '', role: 'rd' }

src/views/projectManage/projectList/projectCreate.vue

@@ -37,8 +37,8 @@
             <el-form-item label="版本" label-width="147px"><el-input v-model="form.version" autocomplete="off" placeholder="请填写" style="width:76%;" /></el-form-item>
           </div>
           <div class="line-between">
-            <el-form-item label="产品" label-width="124px">
-              <el-select v-model="form.pm" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+            <el-form-item label="产品" label-width="124px" prop="pm">
+              <el-select v-model="form.pm" multiple filterable placeholder="公司邮箱前缀" style="width:76%;" @visible-change="realTimeChange">
                 <el-option
                   v-for="item in optionsPM"
                   :key="item.id"
@@ -47,8 +47,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="开发" label-width="147px">
-              <el-select v-model="form.rd" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+            <el-form-item label="开发" label-width="147px" prop="rd">
+              <el-select v-model="form.rd" multiple filterable placeholder="公司邮箱前缀" style="width:76%;" @visible-change="realTimeChange">
                 <el-option
                   v-for="item in optionsRD"
                   :key="item.id"
@@ -59,8 +59,8 @@
             </el-form-item>
           </div>
           <div class="line-between">
-            <el-form-item label="测试" label-width="124px">
-              <el-select v-model="form.qa" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+            <el-form-item label="测试" label-width="124px" prop="qa">
+              <el-select v-model="form.qa" multiple filterable placeholder="公司邮箱前缀" style="width:76%;" @visible-change="realTimeChange">
                 <el-option
                   v-for="item in optionsQA"
                   :key="item.id"
@@ -131,7 +131,10 @@ export default {
         platForm: [{ required: true, message: '平台类型不能为空', trigger: 'change' }],
         status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
         name: [{ required: true, message: '项目名称不能为空', trigger: 'change' }],
-        priority: [{ required: true, message: '优先级不能为空', trigger: 'change' }]
+        priority: [{ required: true, message: '优先级不能为空', trigger: 'change' }],
+        pm: [{ required: true, message: '产品人员不能为空', trigger: 'blur' }],
+        rd: [{ required: true, message: '开发人员不能为空', trigger: 'blur' }],
+        qa: [{ required: true, message: '测试人员不能为空', trigger: 'blur' }]
         // stage: [{ required: true, message: '进展不能为空', trigger: 'change' }]
       }
     }
@@ -213,6 +216,10 @@ export default {
         }
       })
     },
+    // 点击一次更新一次
+    realTimeChange(e) {
+      if (e === true) this.getMember()
+    },
     // 人员搜索
     getMember() {
       this.objDataPM = { bizId: this.form.bizId, email: '', role: 'pm' }
@@ -312,6 +319,10 @@ export default {
     .force-height >>> .w-e-text-container
       height auto !important
       min-height 110px !important
+      z-index 0 !important
+    .force-height >>> .w-e-toolbar .w-e-menu
+      position relative
+      z-index 0 !important
     .line-between
       width 100%
       display flex

src/views/projectManage/taskList/taskCreate.vue

@@ -71,8 +71,8 @@
             </el-form-item>
           </div>
           <div class="line-between">
-            <el-form-item label="产品" label-width="124px">
-              <el-select v-model="form.pm" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+            <el-form-item label="产品" label-width="124px" prop="pm">
+              <el-select v-model="form.pm" multiple filterable placeholder="公司邮箱前缀" style="width:76%;" @visible-change="realTimeChange">
                 <el-option
                   v-for="item in optionsPM"
                   :key="item.id"
@@ -81,8 +81,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="开发" label-width="147px">
-              <el-select v-model="form.rd" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+            <el-form-item label="开发" label-width="147px" prop="rd">
+              <el-select v-model="form.rd" multiple filterable placeholder="公司邮箱前缀" style="width:76%;" @visible-change="realTimeChange">
                 <el-option
                   v-for="item in optionsRD"
                   :key="item.id"
@@ -93,8 +93,8 @@
             </el-form-item>
           </div>
           <div class="line-between-add">
-            <el-form-item label="测试" label-width="124px">
-              <el-select v-model="form.qa" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+            <el-form-item label="测试" label-width="124px" prop="qa">
+              <el-select v-model="form.qa" multiple filterable placeholder="公司邮箱前缀" style="width:76%;" @visible-change="realTimeChange">
                 <el-option
                   v-for="item in optionsQA"
                   :key="item.id"
@@ -183,7 +183,10 @@ export default {
         name: [{ required: true, message: '任务名称不能为空', trigger: 'change' }],
         priority: [{ required: true, message: '优先级不能为空', trigger: 'change' }],
         // stage: [{ required: true, message: '进展不能为空', trigger: 'change' }],
-        clientType: [{ required: true, message: '工程模块为空', trigger: 'change' }]
+        clientType: [{ required: true, message: '工程模块为空', trigger: 'change' }],
+        pm: [{ required: true, message: '产品人员不能为空', trigger: 'blur' }],
+        rd: [{ required: true, message: '开发人员不能为空', trigger: 'blur' }],
+        qa: [{ required: true, message: '测试人员不能为空', trigger: 'blur' }]
       }
     }
   },
@@ -256,6 +259,10 @@ export default {
       }
       this.$set(this.form, 'clientType', '')
     },
+    // 点击一次更新一次
+    realTimeChange(e) {
+      if (e === true) this.getMember()
+    },
     // 人员搜索
     getMember() {
       this.objDataPM = { bizId: this.form.bizId, email: '', role: 'pm' }

src/views/projectManage/taskList/taskUpdateCreate.vue

@@ -71,8 +71,8 @@
             </el-form-item>
           </div>
           <div class="line-between">
-            <el-form-item label="产品" label-width="124px">
-              <el-select v-model="form.pm" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+            <el-form-item label="产品" label-width="124px" prop="pm">
+              <el-select v-model="form.pm" multiple filterable placeholder="公司邮箱前缀" style="width:76%;" @visible-change="realTimeChange">
                 <el-option
                   v-for="item in optionsPM"
                   :key="item.id"
@@ -81,8 +81,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="开发" label-width="147px">
-              <el-select v-model="form.rd" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+            <el-form-item label="开发" label-width="147px" prop="rd">
+              <el-select v-model="form.rd" multiple filterable placeholder="公司邮箱前缀" style="width:76%;" @visible-change="realTimeChange">
                 <el-option
                   v-for="item in optionsRD"
                   :key="item.id"
@@ -93,8 +93,8 @@
             </el-form-item>
           </div>
           <div class="line-between-add">
-            <el-form-item label="测试" label-width="124px">
-              <el-select v-model="form.qa" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+            <el-form-item label="测试" label-width="124px" prop="qa">
+              <el-select v-model="form.qa" multiple filterable placeholder="公司邮箱前缀" style="width:76%;" @visible-change="realTimeChange">
                 <el-option
                   v-for="item in optionsQA"
                   :key="item.id"
@@ -183,7 +183,10 @@ export default {
         name: [{ required: true, message: '任务名称不能为空', trigger: 'change' }],
         priority: [{ required: true, message: '优先级不能为空', trigger: 'change' }],
         // stage: [{ required: true, message: '进展不能为空', trigger: 'change' }],
-        clientType: [{ required: true, message: '工程模块为空', trigger: 'change' }]
+        clientType: [{ required: true, message: '工程模块为空', trigger: 'change' }],
+        pm: [{ required: true, message: '产品人员不能为空', trigger: 'blur' }],
+        rd: [{ required: true, message: '开发人员不能为空', trigger: 'blur' }],
+        qa: [{ required: true, message: '测试人员不能为空', trigger: 'blur' }]
       }
     }
   },
@@ -252,6 +255,10 @@ export default {
       }
       this.$set(this.form, 'clientType', '')
     },
+    // 点击一次更新一次
+    realTimeChange(e) {
+      if (e === true) this.getMember()
+    },
     // 人员搜索
     getMember() {
       this.objDataPM = { bizId: this.form.bizId, email: '', role: 'pm' }

src/views/quality/qualityMeasurement.vue

@@ -19,7 +19,18 @@
     </el-header>
     <el-container style="height:calc(100vh - 140px);">
       <el-aside class="aside">
-        <el-tree ref="treeBox" :default-expanded-keys="expandedClient" icon-class="el-icon-caret-right" accordion :data="dealWithBusinessDate" node-key="id" highlight-current :props="defaultProps" style="margin-top:20px" @node-click="handleNodeClick" />
+        <el-tree
+          ref="treeBox"
+          :default-expanded-keys="expandedClient"
+          icon-class="el-icon-caret-right"
+          accordion
+          :data="dealWithBusinessDate"
+          node-key="id"
+          highlight-current
+          :props="defaultProps"
+          style="margin-top:20px;min-width:100%;display:inline-block !important;"
+          @node-click="handleNodeClick"
+        />
       </el-aside>
       <el-main class="combine-table">
         <el-tabs v-model="activeIndexSecondary" @tab-click="handleClick">
@@ -722,7 +733,7 @@ export default {
     clientAfter() {
       this.guild = this.treeGuideClient(this.dealWithBusinessDate, this.pauseTreeNode.id).join('/')
       // const pretermitSearch = { appKey: 'f9a0bc6213db35deb155ff08bffa90a9', startTime: this.timeInterval[0], endTime: this.timeInterval[1] }
-      const pretermitSearch = { appKey: this.pauseTreeNode.appKey }
+      const pretermitSearch = { appKey: this.pauseTreeNode.appKey, startTime: this.timeInterval[0], endTime: this.timeInterval[1] }
       const pretermitSearchOthers = { id: this.pauseTreeNode.idForData, type: this.pauseTreeNode.type, startTime: this.timeInterval[0], endTime: this.timeInterval[1] }
       // getHotpatch(pretermitSearch).then((res) => {
       //   res.code === 0 ? this.clientOnline[0].clientOnlineCount = res.data : this.errorFun(res.msg)
@@ -819,7 +830,7 @@ export default {
       const { href } = this.$router.resolve({
         name: '热修复过程',
         query: {
-          appKey: this.pauseTreeNode.appKey
+          appKey: this.pauseTreeNode.appKey, startTime: this.timeInterval[0], endTime: this.timeInterval[1]
         }
       })
       window.open(href, '_blank')
@@ -943,6 +954,7 @@ export default {
       width 72px
     .aside
       width 12.9% !important
+      overflow-x scroll
       margin 0 0 2% 1.5%
       background-color white
       border-radius 7px

src/views/virtualDevices/HMvehicle.vue

@@ -47,40 +47,46 @@
               width="95"
             />
             <el-table-column
-              prop="vehicleVersion"
-              label="车辆类型"
+              prop="ecuId"
+              label="ECUID"
               align="center"
-              width="70"
             />
             <el-table-column
-              prop="ecuId"
-              label="ECUID"
+              prop="vehicleVersion"
+              label="车辆类型"
               align="center"
+              width="70"
             />
             <el-table-column
-              label="锁状态"
+              label="链接状态"
               align="center"
               width="80"
             >
               <template slot-scope="scope">
                 <el-tag
-                  :type="scope.row.lockStatus === 1 ? 'success' : 'danger'"
+                  :type="scope.row.isActive === 1 ? 'success' : 'danger'"
                   disable-transitions
-                >{{ scope.row.lockStatus | toLockStatus }}</el-tag>
+                >{{ scope.row.isActive | toActiveStatus }}</el-tag>
               </template>
             </el-table-column>
             <el-table-column
-              label="链接状态"
+              label="锁状态"
               align="center"
               width="80"
             >
               <template slot-scope="scope">
                 <el-tag
-                  :type="scope.row.isActive === 1 ? 'success' : 'danger'"
+                  :type="scope.row.lockStatus === 1 ? 'success' : 'danger'"
                   disable-transitions
-                >{{ scope.row.isActive | toActiveStatus }}</el-tag>
+                >{{ scope.row.lockStatus | toLockStatus }}</el-tag>
               </template>
             </el-table-column>
+            <el-table-column
+              prop="cityName"
+              label="城市"
+              align="center"
+              width="70"
+            />
             <el-table-column
               label="激活时间"
               align="center"
@@ -182,8 +188,8 @@ export default {
     _queryDeviceInfo() {
       const params = { page: this.curIndex, pageSize: this.pageSize }
       queryDeviceInfo(params).then(res => {
-        res.code === 200 ? this.tableData = res.data : this.errorFun(res.msg)
-        // this.total = res.data.length
+        res.code === 200 ? this.tableData = res.data.ebikeInfos : this.errorFun(res.msg)
+        this.total = res.data.total
         this.loading = false
       })
     },