Merge branch 'http_mock' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_mock

src/apiConfig/api.js

@@ -1,8 +1,8 @@
 import { requestIp } from './requestIP'
 
 /*eslint-disable*/   //规避eslint的检查，如没有eslint可不写
-export const mockUrl = 'http://10.179.24.176:8980' // 线下
-// export const mockUrl = 'http://10.179.24.123:8980' // 线上
+// export const mockUrl = 'http://10.179.24.176:8980' // 线下
+export const mockUrl = 'http://10.179.24.123:8980' // 线上
 
 export const qualityUrl = 'http://10.179.181.103:8898' // 质量度量
 

src/components/Hamburger/index.vue

@@ -10,7 +10,7 @@
       height="64"
     >
       <!-- <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" /> -->
-      <path d="M0 0m70.550626 0l987.708758 0q70.550626 0 70.550625 70.550626l0 0q0 70.550626-70.550625 70.550625l-987.708758 0q-70.550626 0-70.550626-70.550625l0 0q0-70.550626 70.550626-70.550626Z" fill="#FFFFFF" p-id="567" /><path d="M0 423.303754m70.550626 0l564.405004 0q70.550626 0 70.550626 70.550625l0 0q0 70.550626-70.550626 70.550626l-564.405004 0q-70.550626 0-70.550626-70.550626l0 0q0-70.550626 70.550626-70.550625Z" fill="#FFFFFF" p-id="568" /><path d="M0 846.607507m70.550626 0l987.708758 0q70.550626 0 70.550625 70.550626l0 0q0 70.550626-70.550625 70.550625l-987.708758 0q-70.550626 0-70.550626-70.550625l0 0q0-70.550626 70.550626-70.550626Z" fill="#FFFFFF" p-id="569" />
+      <path d="M0 0m70.550626 0l987.708758 0q70.550626 0 70.550625 70.550626l0 0q0 70.550626-70.550625 70.550625l-987.708758 0q-70.550626 0-70.550626-70.550625l0 0q0-70.550626 70.550626-70.550626Z" fill="#6F7C93" p-id="567" /><path d="M0 423.303754m70.550626 0l564.405004 0q70.550626 0 70.550626 70.550625l0 0q0 70.550626-70.550626 70.550626l-564.405004 0q-70.550626 0-70.550626-70.550626l0 0q0-70.550626 70.550626-70.550625Z" fill="#6F7C93" p-id="568" /><path d="M0 846.607507m70.550626 0l987.708758 0q70.550626 0 70.550625 70.550626l0 0q0 70.550626-70.550625 70.550625l-987.708758 0q-70.550626 0-70.550626-70.550625l0 0q0-70.550626 70.550626-70.550626Z" fill="#6F7C93" p-id="569" />
     </svg>
   </div>
 </template>

src/layout/components/Navbar.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="navbar">
     <div>
-      <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+      <!-- <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> -->
       <breadcrumb class="breadcrumb-container" />
     </div>
     <div>
       <div class="right-menu" style="display: fiex; align-items: center; justify-content: space-between;">
-        <el-avatar style="vertical-align: middle;" size="small" src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png" />
+        <el-avatar style="vertical-align: middle; background: #FFF;" size="small"><img :src="options.phoneUrl"></el-avatar>
         <el-dropdown placement="bottom" trigger="click">
           <span class="el-dropdown-link avatar-container" style="color: #FFFFFF; cursor: pointer;" @click="show2 = !show2">
             {{ username }}
@@ -24,20 +24,22 @@
 <script>
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
+// import Hamburger from '@/components/Hamburger'
 import { settingQueryBizTypeList } from '@/api/settingQueryBizTypeList.js'
 import Utils from '../../util.js'
 import { logoutUrl } from '@/apiConfig/requestIP.js'
+import { memberQueryMemberInfoByIDAPorName } from '@/api/projectIndex'
 
 export default {
   components: {
-    Breadcrumb,
-    Hamburger
+    Breadcrumb
+    // Hamburger
   },
   data() {
     return {
       bizOptions: [],
       show2: false,
+      options: [],
       bizShow: {
         id: ''
       }
@@ -56,9 +58,9 @@ export default {
     this.get_bizArr()
   },
   methods: {
-    toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
-    },
+    // toggleSideBar() {
+    //   this.$store.dispatch('app/toggleSideBar')
+    // },
     // logout() {
     //   // await this.$store.dispatch('user/logout')
     //   // this.$router.push(`/login?redirect=${this.$route.fullPath}`)
@@ -70,6 +72,9 @@ export default {
         var int = Number(localStorage.getItem('key'))
         int === 0 ? int = '' : ''
         this.bizShow.id = int
+        memberQueryMemberInfoByIDAPorName({ memberIDAP: localStorage.getItem('realname') }).then(res => {
+          this.options = res.data[0]
+        })
       })
     },
     bizchnage(ele) {
@@ -88,6 +93,9 @@ export default {
 .navbar .rotateNone {
   transform: rotate(270deg);
 }
+.navbar img {
+    margin: 0 auto;
+}
 .navbar .rotate {
   transform: rotate(90deg);
 }

src/views/Platform/presentation/Assumptions.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="eleStyle">
-    <div style="height:100%;width:94%; background:#ffffff; margin: 4%; border-radius: 8px; overflow: hidden;">
+    <div style="height:100%;width:98%; background:#ffffff; margin: 1%; border-radius: 4px; overflow: hidden;">
       <!--提测报告-->
       <div style="margin: 2%; min-height: 73vh; font-size: 14px;">
         <div style="margin: 30px 0;">搜索
@@ -34,11 +34,11 @@
         </template>
         <el-pagination style="margin-top:30px;" align="center" :current-page="curIndex" :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         <el-dialog title="提示" :visible.sync="centerDialogVisible" width="30%" center @close="closeChange">
-          <div style="text-align:text;margin:10px 0;">
+          <div style="text-align:text;margin:0;">
             <el-button ref="btn1" size="mini" @click="getQueryData(1)">项目</el-button>
             <el-button ref="btn2" size="mini" @click="getQueryData(2)">任务</el-button>
           </div>
-          选择任务 :
+          <div style="margin:20px 0 10px 0">选择任务 :</div>
           <el-select v-model="queryData.state" filterable placeholder="搜索" style="width:80%;" @change="handleSelect($event)">
             <el-option v-for="item in restaurants" :key="item.id" :label="item.value" :value="item.id" />
           </el-select>

src/views/Platform/presentation/PresentReport.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 提测报告，新增客户端报告 -->
   <div class="eleStyle">
-    <div style="height:100%;width:94%; background:#ffffff; margin: 3%; border-radius: 4px; overflow: hidden;">
+    <div style="height:100%;width:98%; background:#ffffff; margin: 1%; border-radius: 4px; overflow: hidden;">
       <el-form ref="dataChange" :model="dataChange" :rules="serviceDataRules" style="margin:2% 3%;">
         <div class="double">
           <el-form-item label="标题" prop="name">

src/views/Platform/presentation/ResultPage.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="eleStyle">
-    <div style="height:100%;width:94%; background:#ffffff; margin: 4%; border-radius: 4px; overflow: hidden;">
+    <div style="height:100%;width:98%; background:#ffffff; margin: 1%; border-radius: 4px; overflow: hidden;">
       <!--准出报告-->
       <div style="margin: 2%; min-height: 73vh; font-size: 14px;">
         <div style="margin: 30px 0;">搜索

src/views/Platform/presentation/ResultPageyL.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="eleStyle">
-    <div style="height:100%;width:94%; background:#ffffff; margin: 3% 3% 8% 3%; border-radius: 4px; overflow: hidden;">
+    <div style="height:100%;width:98%; background:#ffffff; margin: 1%; border-radius: 4px; overflow: hidden;">
       <!-- 准出预览 -->
       <div v-if="towShow">
         <div style="padding: 2% 9%;">

src/views/Platform/presentation/testPresentation.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="eleStyle">
-    <div style="height:100%;width:94%; background:#ffffff; margin: 4%; border-radius: 4px; overflow: hidden;">
+    <div style="height:100%;width:98%; background:#ffffff; margin: 1%; border-radius: 4px; overflow: hidden;">
       <!--日报报告-->
       <div style="margin: 2%; min-height: 73vh; font-size: 14px;">
         <div style="margin: 30px 0;">搜索

src/views/Platform/setUp/systemSetup/addConf.vue

@@ -311,8 +311,8 @@ 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%
-      margin 25px 0
+      width 98%
+      margin 10px 0
       padding 20px
       min-height calc(100vh - 100px)
     .block >>> .is-disabled .el-input__inner, .el-textarea.is-disabled .el-textarea__inner

src/views/Platform/setUp/systemSetup/bizPage.vue

@@ -291,8 +291,8 @@ 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%
-      margin 25px 0
+      width 98%
+      margin 10px 0
       padding 20px
       min-height calc(100vh - 100px)
     .set-head

src/views/Platform/setUp/systemSetup/confList.vue

@@ -289,8 +289,8 @@ 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%
-      margin 25px 0
+      width 98%
+      margin 10px 0
       padding 20px
       min-height calc(100vh - 100px)
     .set-head

src/views/Platform/setUp/systemSetup/modulePage.vue

@@ -386,8 +386,8 @@ 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%
-      margin 25px 0
+      width 98%
+      margin 10px 0
       padding 20px
       min-height calc(100vh - 100px)
     .set-head

src/views/Platform/setUp/systemSetup/platformPage.vue

@@ -342,8 +342,8 @@ 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%
-      margin 25px 0
+      width 98%
+      margin 10px 0
       padding 20px
       min-height calc(100vh - 100px)
     .set-head

src/views/Platform/setUp/systemSetup/projectPage.vue

@@ -431,8 +431,8 @@ 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%
-      margin 25px 0
+      width 98%
+      margin 10px 0
       padding 20px
       min-height calc(100vh - 100px)
     .set-head

src/views/Platform/setUp/teamPage.vue

@@ -333,8 +333,8 @@ 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%
-      margin 25px 0
+      width 98%
+      margin 10px 0
       padding 20px
       min-height calc(100vh - 100px)
     .set-head

src/views/projectManage/bugList/bugindex.vue

@@ -10,9 +10,9 @@
             <el-button type="primary" size="mini" style="font-size: 14px;padding: 7px 10px;font-weight: normal" @click="createdDefect">新建缺陷</el-button>
           </el-col>
           <el-col :span="24">
-            <el-divider style="color: #EEF0F5;margin:10px 0" class="divider" />
+            <el-divider style="color: #EEF0F5;" />
           </el-col>
-          <el-col :span="24" class="Layout" style="padding: 0 0.5% 0 1.5%;">
+          <el-col :span="24" class="Layout" style="padding: 0% 0.5% 1% 1.5%;">
             <el-form :model="formInline" class="flex_start" style="width: 100%;">
               <div class="Layout">
                 <div class="queryName">业务线</div>
@@ -148,7 +148,7 @@
       <el-main style="padding: 1%">
         <el-row class="headerBg table_v" style=" padding-top: 0px;">
           <el-col :span="24" style="min-height: 47vh;">
-            <el-table size="small" :data="tableData" style="width: 100%; font-size: 14px; color:rgba(102,102,102,1);" :default-sort="{prop: 'priorityCode'}" show-overflow-tooltip="true" :header-cell-style="{ color: '#4A4A4A', fontSize: '14px', fontWeight: '500' }">
+            <el-table size="small" :data="tableData" style="width: 100%; font-size: 14px; color:rgba(102,102,102,1);" show-overflow-tooltip="true" :header-cell-style="{ color: '#4A4A4A', fontSize: '14px', fontWeight: '500' }">
               <el-table-column label="优先级" prop="priorityCode" sortable align="center">
                 <template slot-scope="scope">
                   <div class="div_priority" :style="{background: priorityColors[scope.row.priorityCode]}">{{ scope.row.priorityLevel | oneA }}</div>
@@ -315,6 +315,7 @@ export default {
               item1.priorityLevel !== null ? item1.priorityLevel === item.name ? item1.priorityCode = item.code : '' : ''
             })
           })
+          console.log(this.tableData, '成都市开车')
         }
       })
     },

src/views/projectManage/bugList/css/index.css

@@ -105,6 +105,12 @@
 .Parent .el-dialog__header {
   padding: 0;
 }
+.Parent .el-dialog__body {
+  padding: 30px 20px 15px 20px;
+  color: #606266;
+  font-size: 14px;
+  word-break: break-all;
+}
 
 .he {
   margin: 0 4% 2% 4%;

src/views/projectManage/bugList/file/createdBug.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="Parent">
-    <el-dialog ref="modalShow" :visible.sync="modalShow" width="60%" top="8vh" :close-on-click-modal="false" @close="modalClose">
+    <el-dialog :visible.sync="modalShow" width="60%" top="8vh" :close-on-click-modal="false" @close="modalClose">
       <el-form ref="formInline" label-position="left" :model="formInline" :rules="rules" label-width="90px">
         <el-row style="margin: 0 4% 2% 4%;">
           <el-col :span="24">
@@ -155,7 +155,7 @@
             </div>
           </div>
         </div>
-        <el-form-item style="text-align: right;margin: 0% 4%;">
+        <el-form-item style="text-align: right;margin: 15px 4% 0 4%;">
           <el-button size="small" @click="modalShow = false">取 消</el-button>
           <el-button :disabled="dis" type="primary" size="small" @click="bug_created(formInline)">创 建</el-button>
         </el-form-item>
@@ -249,12 +249,12 @@ export default {
   methods: {
     init(e, ele) {
       this.modalShow = true
+      this.$nextTick(() => {
+        this.$refs['formInline'].clearValidate()
+      })
       if (e === 1) {
         this.titleName = '新建缺陷'
         if (ele !== undefined) {
-          this.$nextTick(function() {
-            this.$refs.modalShow.resetFields()
-          })
           this.$set(this.formInline, 'taskId', ele.id)
           this.$set(this.formInline, 'cliType', [ele.bizId, ele.type, ele.clientType])
         }
@@ -387,15 +387,6 @@ export default {
             }))
           }))
         }))
-        // this.BusinessLine = res.data // 业务线
-        // this.BusinessLine.map(item => {
-        //   item.child !== null ? item.child.map(value => {
-        //     this.arr_platform.push(value) // 平台数据
-        //     value.child.map(num => {
-        //       this.arr_Modular.push(num) // 模块数据
-        //     })
-        //   }) : ''
-        // })
       })
     }
   }

src/views/projectManage/projectList/css/index.css

@@ -159,7 +159,7 @@
   bottom: 284%;
 }
 
-.bgbug .el-divider--horizontal {
+.bgBug .el-divider--horizontal {
   display: block;
   height: 1px;
   width: 100%;

src/views/projectManage/projectList/projectViewDetails.vue

@@ -164,34 +164,16 @@
           </el-tab-pane>
           <el-tab-pane label="项目里程碑" style="width: 100%;overflow-x: auto;">
             <div style="margin-top: 14%;">
-              <el-divider style="position: absolute;" content-position="right">
-                <el-tooltip
-                  class="item"
-                  effect="dark"
-                  content="温馨提示：点击添加可以新建里程碑"
-                  placement="bottom-end"
-                >
-                  <el-button
-                    style="z-index: 999999;"
-                    size="mini"
-                    type="primary"
-                    icon="el-icon-plus"
-                    circle
-                    @click="details_projectMilepost"
-                  />
+              <el-divider content-position="right">
+                <el-tooltip class="item" effect="dark" content="温馨提示：点击添加可以新建里程碑" placement="bottom-end">
+                  <el-button style="z-index: 999999;" size="mini" type="primary" icon="el-icon-plus" circle @click="details_projectMilepost" />
                 </el-tooltip>
               </el-divider>
-              <ul class="time-horizontal" style="margin-top:-2%;">
+              <ul class="time-horizontal">
                 <li v-for="(item, index) in project_Milepost" :key="index">
                   <i>
                     <div>
-                      <el-popover
-                        class="popover"
-                        placement="top"
-                        width="200"
-                        trigger="click"
-                        style="border-radius: 10px;"
-                      >
+                      <el-popover class="popover" placement="top" width="200" trigger="click" style="border-radius: 10px;">
                         <p style="text-align: center">
                           <el-button size="mini" @click="dalete_Milepost = true">删除</el-button>
                           <el-button size="mini" type="primary" @click="query_date">编辑</el-button>

src/views/projectManage/taskList/taskViewDetails.vue

@@ -1250,7 +1250,7 @@ export default {
           case 4:
             this.modalShow = true
             this.$nextTick(() => {
-              this.$refs.createdBug.init(1, ele.id)
+              this.$refs.createdBug.init(1, ele)
             })
             break
         }

src/views/virtualDevices/HTvehicle.vue

@@ -619,8 +619,8 @@ 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%
-      margin 25px 0
+      width 98%
+      margin 10px 0
       padding 20px
       min-height calc(100vh - 100px)
     .block >>> th