Merge remote-tracking branch 'origin/http_mock' into http_mock

src/apiConfig/requestIP.js

@@ -7,6 +7,7 @@ export let envTag = 'test'
 export let envUrl = 'http://zhihui-test.intra.xiaojukeji.com/zhihui_env/'
 export let toolsUrl = 'http://zhihui-test.intra.xiaojukeji.com/tools/'
 export let playBackUrl = 'http://zhihui-test.intra.xiaojukeji.com/playback/'
+export let automation = 'http://zhihui-test.intra.xiaojukeji.com/automation/'
 if (location.host.indexOf('localhost') < 0) {
   host = 'http://' + location.host
   requestIp = host + '/zuul'
@@ -17,11 +18,13 @@ if (location.host.indexOf('localhost') < 0) {
     envUrl = 'http://zhihui-pre.intra.xiaojukeji.com/zhihui_env/'
     toolsUrl = 'http://zhihui-pre.intra.xiaojukeji.com/tools/'
     playBackUrl = 'http://zhihui-pre.intra.xiaojukeji.com/playback/'
+    automation = 'http://zhihui-pre.intra.xiaojukeji.com/automation/'
   } else if (host.indexOf('zhihui.xiaojukeji.com') >= 0) {
     envTag = 'online'
     envUrl = 'http://zhihui.xiaojukeji.com/zhihui_env/'
     toolsUrl = 'http://zhihui.xiaojukeji.com/tools/'
     playBackUrl = 'http://zhihui.xiaojukeji.com/playback/'
+    automation = 'http://zhihui.xiaojukeji.com/automation/'
   }
 }
 

src/components/input/textArea.vue

@@ -24,12 +24,12 @@
             class="icon"
           />
         </span>
-        <el-tooltip effect="dark" content="单击‘编辑’" placement="bottom">
-          <editor :id="'tinymce_'+id" v-model="inputValue" :class="'tinymce_'+id" :init="init" @input="changeText" />
-        </el-tooltip>
+        <editor :id="'tinymce_'+id" v-model="inputValue" :class="'tinymce_'+id" :init="init" @input="changeText" />
       </div>
       <div v-show="!isEmpty && !edit">
-        <pre class="text-pre" @click="ImmediateAddition" v-html="handlerText(value)" />
+        <el-tooltip effect="dark" content="单击‘编辑’" placement="bottom">
+          <pre class="text-pre" @click="ImmediateAddition" v-html="handlerText(value)" />
+        </el-tooltip>
       </div>
       <div :id="'inputUpload_'+id" style="display: none" @click.stop="blur_textarea" />
       <div v-show="edit" class="control">
@@ -48,6 +48,15 @@ import 'tinymce/themes/silver/theme'
 import 'tinymce/icons/default/icons'
 import 'tinymce/plugins/table'
 
+import 'tinymce/plugins/image'
+import 'tinymce/plugins/media'
+import 'tinymce/plugins/lists'
+import 'tinymce/plugins/contextmenu'
+import 'tinymce/plugins/wordcount'
+import 'tinymce/plugins/colorpicker'
+import 'tinymce/plugins/textcolor'
+import 'tinymce/skins/ui/oxide/skin.css'
+
 export default {
   components: {
     Editor

src/styles/detail-pages.less

@@ -103,6 +103,25 @@
       color: #409EFF;
     }
   }
+  .top-tabs-public {
+    height: 100%;
+    position: absolute;
+    left: 60%;
+    top: 0;
+    transform: translate(-50%,0);
+    /deep/.el-tabs__header {
+      margin: 0;
+    }
+    /deep/.el-tabs__item {
+      height: 60px;
+      line-height: 60px;
+      font-size: 16px;
+      color: #666666;
+    }
+    /deep/.el-tabs__item.is-active {
+      color: #409EFF;
+    }
+  }
   .top-control {
     // width: 235px;
     display: flex;

src/views/business/bizIdSelect.vue

@@ -6,8 +6,8 @@
       </div>
       <article>
         <div class="my-business">
-          <div class="business-title">我的业务线</div>
-          <div class="my-business-list">
+          <div class="business-title" style="color: #333333; font-weight: 500;">我的业务线</div>
+          <div v-if="myBusiness && myBusiness[0]" class="my-business-list">
             <div
               v-for="(item, index) in myBusiness"
               :key="'my'+item.code"
@@ -19,9 +19,10 @@
               <span class="biz-name">{{ item.name }}</span>
             </div>
           </div>
+          <div v-else style=" padding: 27px 32px; color: #666666; font-size: 16px;">请联系所在业务线负责人将您添加为团队成员</div>
         </div>
         <div class="all-business">
-          <div class="business-title" style="margin: 15px 0">所有业务线</div>
+          <div class="business-title" style="margin: 15px 0; color: #333333; font-weight: 500">所有业务线</div>
           <div class="all-business-list">
             <div
               v-for="(item, index) in bizSelectList"
@@ -134,19 +135,19 @@ export default {
 .business-contain {
   height: 100%;
   width: 100%;
-  padding: 70px 130px 120px;
+  padding: 30px;
   background-color: #f7f8fc;
 }
 .bizId-select {
   position: relative;
-  height: 628px;
+  // height: 628px;
   width: 100%;
-  padding-bottom: 32px;
+  // padding-bottom: 32px;
   background-color: #ffffff;
   border-radius: 10px;
-  box-shadow: 0px 30px 16px #eef0f5;
+  // box-shadow: 0px 30px 16px #eef0f5;
   article {
-    height: 480px;
+    // height: 480px;
     overflow: scroll;
   }
 }
@@ -170,20 +171,21 @@ export default {
     padding: 27px 32px;
     display: grid;
     text-align: center;
-    grid-template-columns: repeat(5, 20%);
+    grid-template-columns: repeat(6, 17%);
     grid-gap: 50px 0;
   }
 }
 .all-business {
   width: 100%;
-  padding: 0 46px 43px;
+  padding: 0 46px 0;
   color: #666666;
   font-size: 18px;
   .all-business-list {
+    font-size: 16px;
     padding: 27px 32px;
     display: grid;
     text-align: center;
-    grid-template-columns: repeat(5, 20%);
+    grid-template-columns: repeat(6, 17%);
     grid-gap: 33px 0;
   }
 }
@@ -235,8 +237,8 @@ export default {
 //   background-color: #13cbc2;
 // }
 .business-tips {
-  margin-top: 43px;
-  margin-bottom: 50px;
+  margin-top: 20px;
+  padding-bottom: 50px;
   display: flex;
   flex-direction: column;
   align-items: center;

src/views/home/index.vue

@@ -42,6 +42,8 @@
           <el-button plain class="enter-button" @click.native="handleSelect('1')"><svg-icon icon-class="env-enter" />环境管理</el-button>
           <el-button plain class="enter-button" @click.native="handleSelect('playback')"><svg-icon icon-class="playback-enter" />流量回放</el-button>
           <el-button plain class="enter-button" @click.native="handleSelect('9')"><svg-icon icon-class="tool-enter" />工具集合</el-button>
+          <el-button v-if="false" plain class="enter-button" @click.native="handleSelect('auto')">
+            <svg-icon icon-class="tool-enter" />自动化测试</el-button>
         </div>
         <div class="home-carousel">
           <el-carousel :height="imgHeight + 'px'" indicator-position="outside">
@@ -192,6 +194,7 @@ img.img-arrow {
   left: 48.95%;
 }
 .enter-button {
+  width: 120px;
   margin-top: 6vh;
   margin-right: 30px;
   margin-left: 0px;
@@ -299,7 +302,7 @@ img.img-arrow {
 <script>
 import { mapGetters } from 'vuex'
 import FloatMenu from './floatMenu'
-import { logoutUrl, envUrl, toolsUrl, playBackUrl } from '@/apiConfig/requestIP.js'
+import { logoutUrl, envUrl, toolsUrl, playBackUrl, automation } from '@/apiConfig/requestIP.js'
 import { settingUserGetBiz } from '@/api/projectIndex'
 import { materialGetMaterialList } from '@/api/monthly/index.js'
 
@@ -400,6 +403,9 @@ export default {
         case '10':
           this.$router.push({ name: '测试用例' })
           break
+        case 'auto':
+          window.open(automation, '_block')
+          break
         case 'playback':
           window.open(playBackUrl, '_self')
           break

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

@@ -366,6 +366,7 @@ export default {
       this.nowPageId = bizId_id[1]
     },
     init(e, ele) {
+      console.log(e, ele, '才能健康的事')
       this.modalShow = true
       this.createLoading = false
       this.$nextTick(() => {
@@ -385,6 +386,7 @@ export default {
         this.titleName = '新建缺陷'
         if (ele !== undefined) {
           this.$set(this.formInline, 'taskId', ele.id)
+          this.$set(this.formInline, 'moduleIds', ele.moduleIds)
         }
       }
       if (e === 2) {

src/views/projectManage/requirement/list/index.vue

@@ -161,8 +161,8 @@
                 <i style="color:#409EFF; cursor: pointer; margin-right: 5px;" class="el-icon-remove-outline" @click="DemandSta" />
                 <span> 需求状态包含:</span>
               </div>
-              <el-checkbox-group v-model="searchForm.containStatus" class="allCheckbox">
-                <el-checkbox v-for="item in requiredStatus" :key="item.value" :value="item.value">{{ item.label }}</el-checkbox>
+              <el-checkbox-group v-model="searchForm.containStatus" class="allCheckbox" @change="test">
+                <el-checkbox v-for="item in requiredStatus" :key="item.code" :label="item.code">{{ item.msg }}</el-checkbox>
               </el-checkbox-group>
               <div class="DemandStatus">状态停留时长:</div>
               <el-select v-model="searchForm.comparisonOperator" size="small" style="width: 80px; margin: 20px 20px 0 79px;" clearable filterable placeholder="请选择">
@@ -476,6 +476,9 @@ export default {
     this.$store.state.data.status = false
   },
   methods: {
+    test(e) {
+      console.log(e)
+    },
     // 修改状态
     async statusChange(item, value) {
       this.statusObj = value
@@ -506,6 +509,7 @@ export default {
         this.get_charts()
         this.logHandle('changtab_requirement_charts')
       } else {
+        this.showChartModal = false
         this.chartData = {}
         this.getTableData()
       }
@@ -622,6 +626,7 @@ export default {
           value: t.code
         }))
         this.requiredStatus = requiredStatus
+        console.log(requiredStatus)
         this.updateChartSlectOption('statusList', requiredStatus)
       }
       const res3 = await settingQueryBizRqmtOrntList(this.bizId)

src/views/projectManage/taskList/childrenTask/childDrawer.vue

@@ -121,7 +121,7 @@
           <div class="title-left-name">描述</div>
         </div>
         <div>
-          <text-area :id="'pro-desc'" :value.sync="formData.remark" :empty-text="'点击'" :input-button="'添加描述'" @change="changeArea('remark')" />
+          <text-area :id="'pro-descs'" :value.sync="formData.remark" :empty-text="'点击'" :input-button="'添加描述'" @change="changeArea('remark')" />
         </div>
       </section>
       <!-- 子任务列表 -->

src/views/projectManage/taskList/components/scheduleList.vue

@@ -76,7 +76,7 @@
             <div class="blueStr" />
             <div class="task-object-list">
               <template v-for="(item,index) in scope.row.taskObjectList">
-                <div v-if="index<5" :key="'task-object'+index" class="task-item" @click="link(item.id)">
+                <div :key="'task-object'+index" class="task-item" @click="link(item.id)">
                   <span class="item-id">{{ item.taskId }}</span>
                   <span class="item-name">{{ item.name }}</span>
                   <span>{{ item.moduleInfoName }}</span>
@@ -294,6 +294,7 @@ export default {
 }
 .task-object-list {
   width: 100%;
+  height: 130px;
   overflow: scroll;
   .task-item {
     width: 100%;

src/views/projectManage/taskList/taskViewDetail.vue

@@ -61,7 +61,7 @@
             </el-dropdown-menu>
           </el-dropdown>
         </div>
-        <div class="top-tabs">
+        <div class="top-tabs-public">
           <el-tabs v-model="activeName">
             <el-tab-pane label="概览" name="1" />
             <el-tab-pane label="子任务" name="2" />
@@ -373,7 +373,7 @@
       <!-- 新建（bug） -->
       <createdBug v-if="bug_open" ref="createdBug" @getBugList="reloadList" />
       <create-children v-if="createChildren" :visible.sync="createChildren" :data="form_query" :new-add="true" @change="reloadList" />
-      <Test-report v-if="dialogTest" ref="TestReport" />
+      <Test-report v-if="dialogTest" ref="TestReport" @getList="getTest" />
       <Daily-report v-if="dialogDaily" ref="DailyReport" />
       <ReleaseReport v-if="dialogClient" ref="ClientReport" />
       <!-- 新建 -->
@@ -616,6 +616,9 @@ export default {
     this.$store.state.data.status = false
   },
   methods: {
+    getTest() {
+      this.taskGet()
+    },
     analysisBizId_id() { // 解析路由中的bizId_id
       if (!this.$route.query.bizId_id) return
       const bizId_id = analysisBizId_id(this.$route.query.bizId_id)
@@ -899,9 +902,10 @@ export default {
       }
     },
     created_bug() { // 缺陷创建
+      console.log(this.form_query)
       this.bug_open = true
       this.$nextTick(() => {
-        this.$refs.createdBug.init(1, { id: this.taskId })
+        this.$refs.createdBug.init(1, { id: this.taskId, moduleIds: this.form_query.moduleIds })
       })
     },
     createReport(e, ele) { // 创建报告