Merge branch 'http_test' of git.xiaojukeji.com:pu_qa_tool/thoth-frontend into http_test

src/components/filterModal/index.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="coms-filterModal">
-    <el-dialog
-      :visible.sync="visible"
-      :width="width"
-      :modal="false"
+    <modal
+      :visible="visible"
+      :bg="false"
+      :title="title"
+      :box-styles="{ width: '450px', top: '110px', left: 'calc(100% - 470px)'}"
       @close="$emit('cancel', false)"
     >
       <div slot="title" class="dialog-title">
@@ -14,11 +15,13 @@
         <el-button @click="reset()">重置</el-button>
         <el-button type="primary" @click="confirm()">筛选</el-button>
       </span>
-    </el-dialog>
+    </modal>
   </div>
 </template>
 <script>
+import modal from '../modal'
 export default {
+  components: { modal },
   props: {
     title: {
       type: String,
@@ -58,11 +61,13 @@ export default {
 </script>
 <style scoped lang="scss">
 .coms-filterModal {
-  /deep/.el-dialog {
-    margin: 0px!important;
-    margin-left: calc(100% - 470px)!important;
-    top: 60px;
-  }
+  // .dialogbox {
+  //   .box {
+  //     margin: 0px!important;
+  //     margin-left: calc(100% - 470px)!important;
+  //     top: 60px;
+  //   }
+  // }
   .dialog-title {
     font-size: 16px;
     color: #333;

src/components/modal/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- <el-dialog :visible.sync="dialogDaliy" width="70vw" class="public_task report-dialog" :title="reportHome ? '测试日报' : `${tipName}测试日报模版`" :close-on-click-modal="false" :destroy-on-close="true" :before-close="handleClose"> -->
   <div v-if="visible" class="dialogbox">
-    <div class="box">
+    <div class="box" :style="boxStyles">
       <div class="title">
         <span v-show="showline" class="line" />
         <span class="name">{{ title }}</span>
@@ -14,7 +14,7 @@
         <slot name="footer" />
       </div>
     </div>
-    <div class="bg" />
+    <div v-if="bg" class="bg" />
   </div>
 </template>
 
@@ -23,7 +23,9 @@ export default {
   props: {
     visible: { type: Boolean, default: false, required: false },
     title: { type: String, default: '', required: false },
-    showline: { type: Boolean, default: true, required: false }
+    showline: { type: Boolean, default: true, required: false },
+    boxStyles: { type: Object, default: () => {}, required: false },
+    bg: { type: Boolean, default: true, required: false }
   }
 }
 </script>
@@ -41,6 +43,7 @@ export default {
     z-index: 1000;
     display: flex;
     flex-direction: column;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
     .title {
       padding: 20px 20px 10px;
       border-bottom: 1px solid #eee;

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

@@ -6,65 +6,16 @@
           <span class="bug-statusList" :class="[statusNum === item.value ? 'bug-color' : 'bug-bgColor']" @click="bugGetQueryList(item)">{{ item.name }}</span>
         </span>
       </div>
-      <el-popover placement="bottom-end" width="400" trigger="click" :visible-arrow="false">
-        <div class="bug-query">
-          <div class="bug-queryTitle"> 筛选项 </div>
-          <span class="el-icon-close bug-statusList" @click="clone" />
-        </div>
-        <el-form label-position="left" :model="bugFormQuery" label-width="100px" style="max-height: 450px;overflow-y: auto;">
-          <el-form-item label="优先级">
-            <el-select v-model="bugFormQuery.priorityLevels" multiple filterable clearable placeholder="请选择" size="medium" style="width:100%;">
-              <el-option v-for="item in priorityLevelEnumList" :key="item.code" :label="item.name" :value="item.name" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="缺陷状态">
-            <el-select v-model="bugFormQuery.statusList" filterable multiple clearable placeholder="请选择" size="medium" style="width:100%;">
-              <el-option v-for="item in bugEnumList" :key="item.code" :label="item.name" :value="item.code" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="缺陷等级">
-            <el-select v-model="bugFormQuery.priorityList" filterable multiple clearable placeholder="请选择" size="medium" style="width:100%;">
-              <el-option v-for="item in priorityEnumList" :key="item.code" :label="item.name" :value="item.code" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="缺陷类型">
-            <el-cascader v-model="bugFormQuery.theBugTypes" :options="theBugTypeEnumList" :props="{ value:'code', label:'name', children: 'childrenEnums', multiple: true, emitPath: false}" clearable placeholder="请选择" size="medium" style="width:100%;" />
-          </el-form-item>
-          <el-form-item label="提报人">
-            <searchPeople :value.sync="bugFormQuery.creators" :multiple="true" :size="'medium'" style="width: 100%;" />
-          </el-form-item>
-          <el-form-item label="责任人">
-            <search-people :value.sync="bugFormQuery.assigners" :multiple="true" :size="'medium'" style="width: 100%;" />
-          </el-form-item>
-          <el-form-item label="修复人">
-            <searchPeople :value.sync="bugFormQuery.currentHandlers" :multiple="true" :size="'medium'" style="width: 100%;" />
-          </el-form-item>
-          <div class="Reopen">
-            <div style="width: 77px; padding-right: 12px; margin-right: 23px;">是否发生Reopen</div>
-            <el-select v-model="bugFormQuery.reopenTimes" filterable placeholder="请选择" size="medium" style="width:73%;">
-              <el-option v-for="item in reopens" :key="item.code" :label="item.name" :value="item.code" />
-            </el-select>
-          </div>
-          <el-form-item v-if="dataShow !== 'taskName'" label="所属任务">
-            <el-select v-model="bugFormQuery.taskIds" filterable multiple clearable placeholder="请选择" size="medium" style="width:100%;">
-              <el-option v-for="item in taskEnumList" :key="item.id" :label="item.name" :value="item.id">
-                <div class="belong-task">
-                  <div class="task-id">{{ item.id }}</div>
-                  <div class="modules-name">
-                    <span class="name">{{ item.name }}</span>
-                    <span v-if="item.bizIdString" class="modules">{{ item.bizIdString }}</span>
-                  </div>
-                </div>
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <div class="bug-footer">
-          <el-button class="bug-botton" @click="bugFormQuery = {}">重置</el-button>
-          <el-button class="bug-botton" style="margin-left: 20px;" type="primary" @click="bugGetTableList(bugFormQuery, true, 2)">筛选</el-button>
-        </div>
-        <div slot="reference" class="bug-Status" :class="{'bug-color': !bugIcon, 'bug-bgColor': bugIcon}" @click="bugClickIcon"><svg-icon v-if="bugIcon" icon-class="筛选" /><svg-icon v-if="!bugIcon" icon-class="筛选1" /> 筛选项 </div>
-      </el-popover>
+      <div class="bug-Status" :class="{'bug-color': !bugIcon, 'bug-bgColor': bugIcon}" @click="bugClickIcon">
+        <svg-icon v-if="bugIcon" icon-class="筛选" />
+        <svg-icon v-if="!bugIcon" icon-class="筛选1" />
+        筛选项
+      </div>
+      <!-- <el-popover placement="bottom-end" width="400" trigger="click" :visible-arrow="false"> -->
+      <!-- <div class="bug-query">
+        <div class="bug-queryTitle"> 筛选项 </div>
+        <span class="el-icon-close bug-statusList" @click="clone" />
+      </div> -->
     </div>
     <el-table
       size="small"
@@ -128,6 +79,67 @@
         />
       </div>
     </el-drawer>
+    <modal
+      :visible="visible"
+      :bg="false"
+      title="筛选项"
+      :box-styles="{ width: '450px', top: '130px', left: 'calc(100% - 490px)'}"
+      @close="visible = false"
+    >
+      <el-form label-position="left" :model="bugFormQuery" label-width="100px" style="overflow-y: auto;">
+        <el-form-item label="优先级">
+          <el-select v-model="bugFormQuery.priorityLevels" multiple filterable clearable placeholder="请选择" size="medium" style="width:100%;">
+            <el-option v-for="item in priorityLevelEnumList" :key="item.code" :label="item.name" :value="item.name" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="缺陷状态">
+          <el-select v-model="bugFormQuery.statusList" filterable multiple clearable placeholder="请选择" size="medium" style="width:100%;">
+            <el-option v-for="item in bugEnumList" :key="item.code" :label="item.name" :value="item.code" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="缺陷等级">
+          <el-select v-model="bugFormQuery.priorityList" filterable multiple clearable placeholder="请选择" size="medium" style="width:100%;">
+            <el-option v-for="item in priorityEnumList" :key="item.code" :label="item.name" :value="item.code" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="缺陷类型">
+          <el-cascader v-model="bugFormQuery.theBugTypes" :options="theBugTypeEnumList" :props="{ value:'code', label:'name', children: 'childrenEnums', multiple: true, emitPath: false}" clearable placeholder="请选择" size="medium" style="width:100%;" />
+        </el-form-item>
+        <el-form-item label="提报人">
+          <searchPeople :value.sync="bugFormQuery.creators" :multiple="true" :size="'medium'" style="width: 100%;" />
+        </el-form-item>
+        <el-form-item label="责任人">
+          <search-people :value.sync="bugFormQuery.assigners" :multiple="true" :size="'medium'" style="width: 100%;" />
+        </el-form-item>
+        <el-form-item label="修复人">
+          <searchPeople :value.sync="bugFormQuery.currentHandlers" :multiple="true" :size="'medium'" style="width: 100%;" />
+        </el-form-item>
+        <div class="Reopen">
+          <div style="width: 77px; padding-right: 12px; margin-right: 23px;">是否发生Reopen</div>
+          <el-select v-model="bugFormQuery.reopenTimes" filterable placeholder="请选择" size="medium" style="width:73%;">
+            <el-option v-for="item in reopens" :key="item.code" :label="item.name" :value="item.code" />
+          </el-select>
+        </div>
+        <el-form-item v-if="dataShow !== 'taskName'" label="所属任务">
+          <el-select v-model="bugFormQuery.taskIds" filterable multiple clearable placeholder="请选择" size="medium" style="width:100%;">
+            <el-option v-for="item in taskEnumList" :key="item.id" :label="item.name" :value="item.id">
+              <div class="belong-task">
+                <div class="task-id">{{ item.id }}</div>
+                <div class="modules-name">
+                  <span class="name">{{ item.name }}</span>
+                  <span v-if="item.bizIdString" class="modules">{{ item.bizIdString }}</span>
+                </div>
+              </div>
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button class="bug-botton" @click="bugFormQuery = {}">重置</el-button>
+        <el-button class="bug-botton" style="margin-left: 20px;" type="primary" @click="bugGetTableList(bugFormQuery, true, 2)">筛选</el-button>
+      </div>
+      <!-- </el-popover> -->
+    </modal>
   </div>
 </template>
 
@@ -139,12 +151,13 @@ import { bugList, bugGetEnum, taskListGet } from '@/api/defectManage'
 import BugDetails from './index'
 import '@/styles/PublicStyle/index.scss'
 import searchPeople from '@/components/select/searchPeople' // 人员select
-
+import modal from '@/components/modal'
 export default {
   components: {
     statusChange,
     BugDetails,
-    searchPeople
+    searchPeople,
+    modal
   },
   filters: {
     naspOut(value) {
@@ -170,6 +183,7 @@ export default {
   },
   data() {
     return {
+      visible: false,
       bugIcon: true,
       statusNum: null,
       showQuery: false,
@@ -282,6 +296,7 @@ export default {
       return arr
     },
     bugGetQueryList(e) {
+      this.visible = false
       this.bugIcon = true
       this.statusNum = e.value
       this.$set(this.bugFormQuery, 'theBugTypes', '')
@@ -322,6 +337,7 @@ export default {
       })
     },
     bugClickIcon() {
+      this.visible = true
       this.bugIcon = false
       this.statusNum = 44
     },
@@ -339,6 +355,7 @@ export default {
       this.key === 1 ? this.bugGetTableList(this.bugFormQuery, false, 1) : this.bugGetTableList(this.queryData, false, 2)
     },
     clone() {
+      this.visible = !this.visible
       this.bugIcon = false
       this.$refs.bugBg.click()
     },

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

@@ -485,12 +485,14 @@ export default {
       this.nowTab = e
       if (this.nowTab === 'charts') {
         this.get_charts()
+        window.log({ c: 'requirement', d: 'changtab_requirement_charts' })
       } else {
         this.chartData = {}
         this.getTableData()
       }
     },
     get_charts() {
+      window.log({ c: 'requirement', d: 'get_requirement_charts' })
       this.updateChartSearchFormValue()
       this.getSearchFormHandle()
       this.get_chartList()
@@ -547,6 +549,7 @@ export default {
       this.get_chartListDetial(res.data.data[0].code)
     },
     async get_chartListDetial(code) {
+      this.showChartModal = false
       if (code) {
         this.searchForm.curIndex = 1
         this.searchForm.code = code
@@ -556,6 +559,7 @@ export default {
       this.total = dataList.total
       this.tableTitle = dataList.data.title
       this.loading = false
+      window.log({ c: 'requirement', d: 'get_requirement_charts_list_detial' })
     },
     async showRequirementEnum() {
       const res = await showRequirementEnum()

src/views/projectManage/taskList/taskIndex.vue

@@ -482,6 +482,7 @@ export default {
       this.nowTab = e
       if (this.nowTab === 'charts') {
         this.get_charts()
+        window.log({ c: 'task', d: 'changtab_task_charts' })
       } else {
         this.chartData = {}
         this.get_taskList()
@@ -495,6 +496,7 @@ export default {
       }
     },
     get_charts() {
+      window.log({ c: 'task', d: 'get_task_charts' })
       this.updateChartSearchFormValue()
       this.form_taskHandle()
       this.get_chartList()
@@ -506,6 +508,7 @@ export default {
       this.get_chartListDetial(res.data.data[0].code)
     },
     async get_chartListDetial(code) {
+      this.showChartModal = false
       if (code) {
         this.form_task.curIndex = 1
         this.form_task.code = code
@@ -515,6 +518,7 @@ export default {
       this.total = dataList.total
       this.tableTitle = dataList.data.title
       this.table_loading = false
+      window.log({ c: 'task', d: 'get_task_charts_list_detial' })
     },
     test2(item, e) {
       // 获取团队人员信息