新建提测报告，添加B端可以选择服务端或客户端弹窗

src/router/index.js

@@ -92,7 +92,7 @@ export const constantRoutes = [
             meta: { title: '个人工作台' }
           },
           {
-            path: 'TeamWorkbench',
+            path: 'TeamWorkb1ench',
             name: '团队工作台'
           },
           {
@@ -580,13 +580,11 @@ export const constantRoutes = [
     component: Layout,
     redirect: '/quality/qualityMeasurement',
     name: '质量度量',
-    // hidden: true,
     meta: { title: '质量度量', icon: 'rule' },
     children: [
       {
         path: 'qualityMeasurement',
         name: '质量大盘',
-        // hidden: true,
         component: () => import('@/views/quality/qualityMeasurement.vue'),
         meta: { title: '质量大盘' }
       },
@@ -614,7 +612,6 @@ export const constantRoutes = [
       {
         path: 'problemList',
         name: '线上问题',
-        // hidden: true,
         component: () => import('@/views/onlineProblem/problemList.vue'),
         meta: { title: '线上问题' }
       },
@@ -640,6 +637,13 @@ export const constantRoutes = [
         meta: { title: '更新线上问题' }
       }
     ]
+  },
+  {
+    path: '/ToConfigure',
+    component: Layout,
+    redirect: '/online-quality/check-list',
+    name: '组织配置',
+    meta: { title: '组织配置', icon: '上线质检' }
   }
 ]
 

src/views/Platform/presentation/Assumptions.vue

@@ -148,18 +148,22 @@ export default {
             this.data_type = ele
           }
         }
-        if (e.radio) { // B端可以选择创建服务端或客户端
-          if (e.radio === '1') {
-            this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: this.data_type }})
+        if (e.radio !== undefined) {
+          if (e.radio) { // B端可以选择创建服务端或客户端
+            if (e.radio === '1') {
+              this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: this.data_type }})
+            } else {
+              this.$router.push({ path: '/Platform/presentation/PresentReport', query: { task: this.data_type }})
+            }
           } else {
-            this.$router.push({ path: '/Platform/presentation/PresentReport', query: { task: this.data_type }})
+            if (this.data_type.type === 5) {
+              this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: this.data_type }}) // 服务端
+            } else {
+              this.$router.push({ path: '/Platform/presentation/PresentReport', query: { task: this.data_type }}) // 客户端
+            }
           }
         } else {
-          if (this.data_type.type === 5) {
-            this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: this.data_type }}) // 服务端
-          } else {
-            this.$router.push({ path: '/Platform/presentation/PresentReport', query: { task: this.data_type }}) // 客户端
-          }
+          this.$message({ message: '请选择想要创建服务端还是客户端', type: 'success', duration: 1000, offset: 150 })
         }
       } else {
         this.centerDialogVisible = true
@@ -167,6 +171,9 @@ export default {
       }
     },
     getQueryData() {
+      this.DuanKopu = false
+      this.$set(this.queryData, 'state', '')
+      this.$set(this.queryData, 'radio', undefined)
       taskListCreate({ status: 5 }).then(res => {
         const arr = []
         for (var ele of res.data.taskInfoList) {

src/views/Platform/testPage.vue

@@ -10,7 +10,7 @@
               <br>
               <el-tree :data="data1" style="overflow-x:auto; min-width:100%;display:inline-block !important" :default-expanded-keys="key_arr" :expand-on-click-node="true" node-key="id" @node-click="clickFun">
                 <span slot-scope="{ node, data }" style="width:100%;" class="custom-tree-node" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
-                  <span class="span-ellipsis" :title="data.label">{{ node.label }}</span>
+                  <span class="span-ellipsis" :title="data.label">{{ node.label | ellipsis }}</span>
                   <el-dropdown v-show="data.del" style="margin-left:10px" trigger="click">
                     <span v-show="data.codes === '1' ? false : true" class="el-dropdown-link">
                       ···<i class="el-icon--right" />
@@ -171,6 +171,15 @@ import Unclicked_3 from '@/assets/阻塞未点击状态.png'
 import Unclicked_4 from '@/assets/未执行未点击状态.png'
 export default {
   name: 'Testpage',
+  filters: {
+    ellipsis(value) {
+      if (!value) return ''
+      if (value.length > 10) {
+        return value.slice(0, 10) + '...'
+      }
+      return value
+    }
+  },
   data() {
     return {
       test_plan: {},

src/views/projectManage/taskList/taskListIndex.vue

@@ -99,7 +99,7 @@
                       <el-dropdown style="margin-left:10px" trigger="click">
                         <el-button size="mini" type="primary">···</el-button>
                         <el-dropdown-menu slot="dropdown">
-                          <el-dropdown-item icon="el-icon-coin" @click.native="createReport(1, scope.row)">新建提测报告</el-dropdown-item>
+                          <el-dropdown-item icon="el-icon-coin" @click.native="create_Report(1, scope.row)">新建提测报告</el-dropdown-item>
                           <el-dropdown-item icon="el-icon-coin" @click.native="createReport(2, scope.row)">新建日报报告</el-dropdown-item>
                           <el-dropdown-item icon="el-icon-coin" @click.native="createReport(3, scope.row)">新建准出报告</el-dropdown-item>
                           <el-dropdown-item icon="el-icon-coin" @click.native="dialogMoveTask(scope.row.id)">任务移动</el-dropdown-item>
@@ -300,6 +300,17 @@
         </div>
       </div>
     </div>
+    <el-dialog title="请选择创建服务端还是客户端" :visible.sync="openDialogVisible" width="30%" center>
+      <div style="text-align: center; margin-top: 5%;">
+        <template>
+          <el-radio v-model="queryData.radio" label="1">服务端</el-radio>
+          <el-radio v-model="queryData.radio" label="2">客户端</el-radio>
+        </template>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="create_code(queryData)">创建</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -321,10 +332,14 @@ export default {
   },
   data() {
     return {
+      queryData: {
+        radio: ''
+      },
       taskMoveAfter: [],
       groupTypeStr: [],
       pauseTaskMoveId: '',
       taskProjectId: '',
+      openDialogVisible: false,
       dialogVisibleTaskMove: false,
       isPlatformShow: false,
       isBusinessShow: false,
@@ -410,6 +425,29 @@ export default {
         // console.log(this.tableData)
       })
     },
+    create_code(e) {
+      console.log(e.radio)
+      if (e.radio !== undefined) {
+        if (e.radio === '1') {
+          this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: e }}) // 服务端提测
+        } else {
+          this.$router.push({ path: '/Platform/presentation/PresentReport', query: { task: e }}) // 客户端提测
+        }
+      } else {
+        this.$message({ message: '请选择想要创建服务端还是客户端', type: 'success', duration: 1000, offset: 150 })
+      }
+    },
+
+    // 判断创建的提测报告是否为B端
+    create_Report(e, ele) {
+      if (ele.typeString === '两轮车B端') {
+        this.$set(this.queryData, 'radio', undefined)
+        this.openDialogVisible = true
+        this.queryData = ele
+      } else {
+        this.createReport(e, ele)
+      }
+    },
     // 团队查询
     realTimeChange() {
       const user = { ename: this.userInformation, name: this.userNames }
@@ -441,7 +479,6 @@ export default {
       })
     },
     dataQuery(queryCode) {
-      console.log(queryCode.teamId)
       this.curIndex = 1
       queryCode.bizId = localStorage.getItem('key')
       queryCode.pageSize = this.pageSize

src/views/projectManage/taskList/taskPreview.vue

@@ -302,7 +302,9 @@ export default {
       openDialogVisible: false,
       processStatusEnumList: [],
       bugLevelStr: [],
-      queryData: {},
+      queryData: {
+        radio: ''
+      },
       activeName: 'first'
     }
   },
@@ -371,16 +373,22 @@ export default {
     },
 
     create_code(e) {
-      if (e.radio === '1') {
-        this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: e }}) // 服务端提测
+      console.log(e.radio)
+      if (e.radio !== undefined) {
+        if (e.radio === '1') {
+          this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: e }}) // 服务端提测
+        } else {
+          this.$router.push({ path: '/Platform/presentation/PresentReport', query: { task: e }}) // 客户端提测
+        }
       } else {
-        this.$router.push({ path: '/Platform/presentation/PresentReport', query: { task: e }}) // 客户端提测
+        this.$message({ message: '请选择想要创建服务端还是客户端', type: 'success', duration: 1000, offset: 150 })
       }
     },
 
     // 判断创建的提测报告是否为B端
     create_Report(e, ele) {
       if (ele.typeString === '两轮车B端') {
+        this.$set(this.queryData, 'radio', undefined)
         this.openDialogVisible = true
         this.queryData = ele
       } else {
@@ -389,8 +397,6 @@ export default {
     },
     // 创建日报 提测 准出 Bug报告跳转
     createReport(e, ele) {
-      console.log(ele)
-
       if (ele.typeString !== '服务端') {
         switch (e) {
           case 1: