Merge branch 'http_test' into insist

src/components/picker/SelDatePicker.vue

@@ -107,6 +107,11 @@ export default {
         }
         nextDate = nextDate.add(1, 'day')
       }
+      const isEnd = () => {
+        return !this.holiday.find(item => item === end.format('YYYY.MM.DD')) &&
+        !NewArr.find(item => item === end.format('YYYY.MM.DD'))
+      }
+      if (isEnd()) NewArr.push(end.format('YYYY.MM.DD'))
       return NewArr
     },
     setSelect(current) { // 选择详细日期

src/styles/detail-pages.scss

@@ -88,6 +88,7 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
+    cursor: pointer;
     /deep/.icon-add {
       padding-top: 4px;
       font-size: 20px;

src/styles/element-ui.scss

@@ -17,12 +17,12 @@
 
 
 // to fixed https://github.com/ElemeFE/element/issues/2461
-.el-dialog {
-  transform: none;
-  left: 0;
-  position: relative;
-  margin: 0 auto;
-}
+// .el-dialog {
+//   transform: none;
+//   left: 0;
+//   position: relative;
+//   margin: 0 auto;
+// }
 
 // refine element ui upload
 .upload-container {

src/views/projectManage/bugList/details/index.vue

@@ -151,7 +151,8 @@
               <el-aside width="49%">
                 <el-form label-width="30%" label-position="left" label-suffix=":">
                   <el-form-item label="所属需求">
-                    <span class="str-task-name" @click="JumpRequire(bug.requireId)">{{ bug.requirementName }}</span>
+                    <span v-if="bug.requirementName !== null" class="str-task-name" @click="JumpRequire(bug.requireId)">{{ bug.requirementName }}</span>
+                    <span v-else class="str-task-name">{{ '无归属需求' }}</span>
                   </el-form-item>
                   <el-form-item label="缺陷等级">
                     <el-select v-model="bug.priority" @change="bugUpdate(bug,'details')">
@@ -1437,6 +1438,8 @@ border-color: #DCDFE6;
 <style scoped lang="scss">
 .str-task-name {
  margin-left: 14px;
+ color: #666666;
+ font-weight: 500;
 }
 .str-task-name:hover {
    color:#409EFF;

src/views/projectManage/iteration/components/requiredTable.vue

@@ -67,11 +67,11 @@
       show-overflow-tooltip="true"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column fixed width="35">
+      <el-table-column width="35">
         <img style="display: inline-block; width: 8px; vertical-align: middle;" :src="image_role">
       </el-table-column>
-      <el-table-column type="selection" fixed min-width="40" align="center" />
-      <el-table-column type="expand" fixed width="40">
+      <el-table-column type="selection" min-width="40" align="center" />
+      <el-table-column type="expand" width="40">
         <template slot="header">
           <div class="expand"><i v-show="!allChange" class="el-icon-plus" @click="expandAll(true)" /></div>
           <div class="expand"><i v-show="allChange" class="el-icon-minus" @click="expandAll(false)" /></div>
@@ -80,7 +80,7 @@
           <iterationTable :id="props.row.id" :type-list="taskScheduleEvent" />
         </template>
       </el-table-column>
-      <el-table-column label="优先级" fixed min-width="80" align="center">
+      <el-table-column label="优先级" min-width="80" align="center">
         <template v-slot="scope">
           <div align="center">
             <div
@@ -100,7 +100,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="需求名称" fixed min-width="250" show-overflow-tooltip>
+      <el-table-column label="需求名称" min-width="250" show-overflow-tooltip>
         <template v-slot="scope">
           <div class="table-project-name" @click="clickRequiredName(scope.row.id)">
             <span class="id">{{ scope.row.requirementDisplayId }} <img v-if="scope.row.type === 1" :src="extraUrgent" style="height: 17px;padding: 0 10px;"></span>

src/views/projectManage/requirement/requirementDetail.vue

@@ -172,7 +172,7 @@
               <div class="tips"><i class="el-icon-warning-outline" /> 每个任务仅支持一次提测和一次准出，请合理拆解后任务再排期</div><br>
               <div class="allTips">
                 <div v-if="BackToTheLatest" class="Scheduling" @click="GetRequireScheduleHistory"><i class="el-icon-refresh" /> 回到最新</div>
-                <div align="left" class="Scheduling" @click="scheduleHiHide"><div class="el-icon-document" /> 排期变更记录</div>
+                <div v-if="Latest" align="left" class="Scheduling" @click="scheduleHiHide"><div class="el-icon-document" /> 排期变更记录</div>
                 <download :id="requirementId" :name="'需求'" />
               </div>
             </div>
@@ -380,6 +380,7 @@ export default {
         children: 'childRqmtOrnts',
         multiple: true
       },
+      Latest: true,
       demandDirection: [], // 需求方向option
       optionName: 'first',
       visible: false, // Hold任务
@@ -443,6 +444,7 @@ export default {
       const res = await scheduleGetRequireScheduleHistory(this.requirementId)
       this.SchedulingContent = res.data
       this.BackToTheLatest = false // 回到最新
+      this.Latest = true
       this.lockHide = false // 隐藏排期变更记录
       this.showunlock = true
       this.ScheduId = 0
@@ -455,6 +457,7 @@ export default {
     },
     async clickScheduling(ele) {
       this.showunlock = false
+      this.Latest = false
       this.ScheduId = ele.id
       const res = await scheduleGetHistoryRequireScheduleById(ele.id)
       this.taskScheduleList = res.data

src/views/virtualDevices/HTvehicle.vue

@@ -58,10 +58,10 @@
             <template slot-scope="scope"><span>{{ scope.row.gmtModify }}</span></template>
           </el-table-column> -->
           <el-table-column label="经度" min-width="60px" align="center" show-overflow-tooltip>
-            <template slot-scope="scope"><span>{{ scope.row.deviceLat }}</span></template>
+            <template slot-scope="scope"><span>{{ scope.row.deviceLng }}</span></template>
           </el-table-column>
           <el-table-column label="纬度" min-width="60px" align="center" show-overflow-tooltip>
-            <template slot-scope="scope"><span>{{ scope.row.deviceLng }}</span></template>
+            <template slot-scope="scope"><span>{{ scope.row.deviceLat }}</span></template>
           </el-table-column>
           <el-table-column label="关锁" align="center" min-width="60px" class-name="small-padding fixed-width">
             <template slot-scope="{row}">
@@ -137,9 +137,9 @@
             </tr>
             <tr>
               <th width="12%" height="40" style="background-color:#F1F4F7">经度</th>
-              <td>{{ detailData.deviceLat }}</td>
+              <td>{{ detailData.deviceLng }}</td>
               <th style="background-color:#F1F4F7">纬度 </th>
-              <td> {{ detailData.deviceLng }}</td>
+              <td> {{ detailData.deviceLat }}</td>
             </tr>
             <tr>
               <th width="12%" height="40" style="background-color:#F1F4F7">锁状态</th>
@@ -181,16 +181,16 @@
         <div class="set-font" style="width:100%">
           <div class="block-edit">
             <div style="display:flex;justify-content:space-between;width:92%">
-              <el-form-item label="经度" prop="deviceLat">
-                <el-input v-model="serviceData.deviceLat" style="width:100%;" placeholder="单车" />
+              <el-form-item label="经度" prop="deviceLng">
+                <el-input v-model="serviceData.deviceLng" style="width:100%;" placeholder="单车" />
               </el-form-item>
               <el-form-item label="电量" prop="lockBatteryLevel">
                 <el-input v-model="serviceData.lockBatteryLevel" style="width:100%;" placeholder="请填写" />
               </el-form-item>
             </div>
             <div style="display:flex;justify-content:space-between;width:92%">
-              <el-form-item label="纬度" prop="deviceLng">
-                <el-input v-model="serviceData.deviceLng" style="width:100%;" placeholder="请填写" />
+              <el-form-item label="纬度" prop="deviceLat">
+                <el-input v-model="serviceData.deviceLat" style="width:100%;" placeholder="请填写" />
               </el-form-item>
             </div>
           </div>
@@ -536,8 +536,8 @@ export default {
       this.bizData = {
         deviceId: vel.deviceId,
         lockBatteryLevel: vel.lockBatteryLevel,
-        deviceLat: vel.deviceLat,
-        deviceLng: vel.deviceLng
+        deviceLng: vel.deviceLng,
+        deviceLat: vel.deviceLat
       }
       updateLockAttr(this.bizData).then(response => {
         if (response.code === 200) {
@@ -554,8 +554,8 @@ export default {
       this.bizData = {
         deviceId: vel.deviceId,
         lockBatteryLevel: vel.lockBatteryLevel,
-        deviceLat: vel.deviceLat,
-        deviceLng: vel.deviceLng
+        deviceLng: vel.deviceLng,
+        deviceLat: vel.deviceLat
       }
       updateLockAttr1(this.bizData).then(response => {
         if (response.code === 200) {
@@ -572,8 +572,8 @@ export default {
       this.bizData = {
         deviceId: vel.deviceId,
         lockBatteryLevel: vel.lockBatteryLevel,
-        deviceLat: vel.deviceLat,
-        deviceLng: vel.deviceLng
+        deviceLng: vel.deviceLng,
+        deviceLat: vel.deviceLat
       }
       updateLockAttr2(this.bizData).then(response => {
         if (response.code === 200) {