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

src/views/Platform/presentation/Templates/ClientReport.vue

@@ -84,7 +84,7 @@ export default {
       Client: false,
       clienData: {},
       showOne: true,
-      radio: '3',
+      radio: '1',
       newNum: '',
       form: {},
       report: {},
@@ -107,7 +107,7 @@ export default {
           this.showThree = false
           this.showTow = false
           this.active = 1
-          this.radio = '3'
+          this.radio = '1'
           break
         case 2: // 编辑
           this.clienData = newData
@@ -146,13 +146,13 @@ export default {
           this.showThree = false
           this.showTow = false
           this.active = 1
-          this.radio = '3'
+          this.radio = '1'
           break
       }
     },
     handleClose() {
       this.dialogDaliy = false
-      this.radio = '3'
+      this.radio = '1'
       this.showOne = false
       this.showThree = false
       this.showTow = false

src/views/Platform/presentation/Templates/DailyReport.vue

@@ -74,7 +74,7 @@ export default {
       showOne: true,
       showTow: false,
       showThree: false,
-      radio: '2',
+      radio: '1',
       newIndex: '',
       active: 1,
       daily_task: [],
@@ -128,7 +128,7 @@ export default {
       this.showThree = false
       this.showOne = false
       this.showTow = false
-      this.radio = '2'
+      this.radio = '1'
     },
     handleClose1() {
       this.active = 1

src/views/Platform/presentation/Templates/TestReport.vue

@@ -87,7 +87,7 @@ export default {
       showClient: false,
       showClientYL: false,
       active: 1,
-      radio: '3',
+      radio: '1',
       clienData: {},
       newNum: '',
       present_task: [],
@@ -204,7 +204,7 @@ export default {
     },
     handleClose1() {
       this.dialogVisible1 = false
-      this.radio = '3'
+      this.radio = '1'
       this.showOne = false
       this.showThree = false
       this.showTow = false

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

@@ -320,6 +320,7 @@ export default {
             if (this.getBugList) {
               this.getBugList()
             }
+            this.$emit('reloadList')
           })
         }
       })

src/views/projectManage/projectList/projectIndex.vue

@@ -11,7 +11,7 @@
       <div class="Layout">
         <div>
           <el-form :model="form_all" class="Layout">
-            <div class="Layout">
+            <div class="Layout" style="padding-left: 15px">
               <div class="queryName">项目名称</div>
               <el-input v-model="form_all.name" size="small" clearable style="width:72% !important;" @change="query_project(form_all)" />
             </div>
@@ -583,7 +583,7 @@ export default {
     .stylus-more
       background rgba(252,252,252,1)
       border-radius 4px
-      padding 1%
+      padding 15px
       min-height 100px
       margin-top 22px
       border 1px solid rgba(238,238,238,1)

src/views/projectManage/taskList/taskViewDetails.vue

@@ -165,7 +165,7 @@
               <div style="padding: 1.5% 0;font-family: MicrosoftYaHei;color: rgba(51,51,51,1);font-size: 14px;align-items: center;display: flex; justify-content: space-start; align-items: center;border-top: 1px solid #E9E9E9;">
                 <span>快速筛选：</span>
                 <span v-for="(item, code) of bugStatus" :key="code" class="status" @click="bug_list(item.code)">
-                  <span :style="{color: item.msg === '全部'? colorSty :''}">{{ item.msg }}</span>
+                  <span :class="[item.code === codeCache ? 'selected' :'']">{{ item.msg }}</span>
                 </span>
               </div>
               <el-table size="mini" :data="bugBaseInfoDOList" min-height="200" style="width: 100%; font-size: 14px; color:rgba(102,102,102,1);" show-overflow-tooltip="true" :default-sort="{prop: 'priorityCode'}" :header-cell-style="{ background: '#E9E9E9', color: '#333B4A', fontSize: '14px', fontWeight: '500',borderTop: '0.5px solid #EEF0F5'}">
@@ -356,8 +356,7 @@
         top="35vh"
       >
         <div align="center">
-          确定要删除
-          <span style="color:red;">{{ task_form.name }}</span> 的任务吗?
+          确定要删除<span style="color:red;">{{ task_form.name }}</span> 的任务吗?
         </div>
         <span slot="footer" class="dialog-footer">
           <el-button @click="centerDialogVisible_task = false">关 闭</el-button>
@@ -366,7 +365,7 @@
       </el-dialog>
       <!-- 弹窗 -->
       <openDialog v-if="dialog_open" ref="task_createdUpdata" />
-      <createdBug v-if="modalShow" ref="createdBug" />
+      <createdBug v-if="modalShow" ref="createdBug" @reloadList="bug_list(codeCache)" />
       <TestReport v-if="dialogVisible1" ref="TestReport" />
       <DailyReport v-if="dialogDaily" ref="DailyReport" />
       <ClientReport v-if="dialogClient" ref="ClientReport" />
@@ -1100,6 +1099,9 @@ export default {
 }
 </style>
 <style lang="stylus" scoped>
+.selected {
+  color: rgb(106, 180, 255)
+}
 .bgborderButton .el-button--info.is-plain:hover {
   background: #3f9eff !important;
   border-color: #3f9eff !important;