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

src/api/projectIndex.js

@@ -42,7 +42,7 @@ export function projectUpdate(data) {
     data
   })
 }
-// 修改项目
+// 删除项目
 export function projectDelete(id, data) {
   return request({
     url: TeamManagement + `/project/delete?id=` + id,
@@ -50,6 +50,15 @@ export function projectDelete(id, data) {
     data
   })
 }
+
+// 删除项目(查看项目下有没有任务  需求)
+export function projectDeleteCheck(id, data) {
+  return request({
+    url: TeamManagement + `/project/deleteCheck?id=` + id,
+    method: 'post',
+    data
+  })
+}
 // 获取里程碑
 export function mileStoneList(data) {
   return request({

src/router/index.js

@@ -379,6 +379,96 @@ export const constantRoutes = [{
   }
   ]
 },
+
+{
+  path: '/onlineProblem',
+  name: '线上问题',
+  component: Layout,
+  redirect: '/onlineProblem/problemList',
+  meta: { title: '线上问题', icon: '质量度量' },
+  children: [
+    {
+      path: 'problemList',
+      name: '线上问题',
+      component: () =>
+            import('@/views/onlineProblem/problemList.vue'),
+      meta: { title: '线上问题' }
+    }
+  ]
+},
+
+{
+  path: '/quality',
+  component: Layout,
+  redirect: '/quality/qualityMeasurement',
+  name: '统计分析',
+  meta: { title: '统计分析', icon: '质量度量' },
+  children: [{
+    path: 'qualityMeasurement',
+    name: '质量大盘',
+    component: () =>
+          import('@/views/quality/qualityMeasurement.vue'),
+    meta: { title: '统计分析' }
+  },
+  {
+    path: 'qualityProcess',
+    name: '上线过程',
+    hidden: true,
+    component: () =>
+          import('@/views/quality/qualityProcess.vue'),
+    meta: { title: '上线过程' }
+  },
+  {
+    path: 'qualityDefectProcess',
+    name: '缺陷过程',
+    hidden: true,
+    component: () =>
+          import('@/views/quality/qualityDefectProcess.vue'),
+    meta: { title: '缺陷过程' }
+  },
+  {
+    path: 'qualityHotpatchProcess',
+    name: '热修复过程',
+    hidden: true,
+    component: () =>
+          import('@/views/quality/qualityHotpatchProcess.vue'),
+    meta: { title: '热修复过程' }
+  },
+  {
+    path: 'problemList',
+    name: '线上问题',
+    hidden: true,
+    component: () =>
+          import('@/views/onlineProblem/problemList.vue'),
+    meta: { title: '线上问题' }
+  },
+  {
+    path: '/Platform/defectManagement/problemCreate',
+    name: '新建线上问题',
+    hidden: true,
+    component: () =>
+          import('@/views/onlineProblem/problemCreate'),
+    meta: { title: '新建线上问题' }
+  },
+  {
+    path: '/Platform/defectManagement/problemQuery',
+    name: '查看线上问题',
+    hidden: true,
+    component: () =>
+          import('@/views/onlineProblem/problemQuery'),
+    meta: { title: '查看线上问题' }
+  },
+  {
+    path: '/Platform/defectManagement/problemUpdate',
+    name: '更新线上问题',
+    hidden: true,
+    component: () =>
+          import('@/views/onlineProblem/problemUpdate'),
+    meta: { title: '更新线上问题' }
+  }
+  ]
+},
+
 {
   path: '/views',
   component: Layout,
@@ -491,128 +581,12 @@ export const constantRoutes = [{
       meta: { title: '新增电单车' }
     }
     ]
-  },
-  {
-    path: '/data',
-    component: () =>
-    import('@/views/Platform/presentation/testa'),
-    redirect: '/data/upload-file',
-    name: '数据构造',
-    meta: { title: '数据构造' },
-    children: [{
-      path: 'upload-file',
-      name: 'jar包管理',
-      component: () =>
-            import('@/views/data/upload.vue'),
-      meta: { title: 'jar包管理' }
-    },
-    {
-      path: 'item',
-      name: '动态数据',
-      component: () =>
-            import('@/views/data/index.vue'),
-      meta: { title: '动态数据' }
-    }
-    ]
   }
   ]
 },
-// {
-//   path: '/data',
-//   component: Layout,
-//   redirect: '/data/upload-file',
-//   name: '数据构造',
-//   meta: { title: '数据构造', icon: 'examlpe' },
-//   children: [{
-//     path: 'upload-file',
-//     name: 'jar包管理',
-//     component: () =>
-//           import('@/views/data/upload.vue'),
-//     meta: { title: 'jar包管理' }
-//   },
-//   {
-//     path: 'item',
-//     name: '动态数据',
-//     component: () =>
-//           import('@/views/data/index.vue'),
-//     meta: { title: '动态数据' }
-//   }
-//   ]
-// },
 
 { path: '*', redirect: '/404', hidden: true },
 
-{
-  path: '/quality',
-  component: Layout,
-  redirect: '/quality/qualityMeasurement',
-  name: '质量度量',
-  meta: { title: '质量度量', icon: '质量度量' },
-  children: [{
-    path: 'qualityMeasurement',
-    name: '质量大盘',
-    component: () =>
-          import('@/views/quality/qualityMeasurement.vue'),
-    meta: { title: '质量大盘' }
-  },
-  {
-    path: 'qualityProcess',
-    name: '上线过程',
-    hidden: true,
-    component: () =>
-          import('@/views/quality/qualityProcess.vue'),
-    meta: { title: '上线过程' }
-  },
-  {
-    path: 'qualityDefectProcess',
-    name: '缺陷过程',
-    hidden: true,
-    component: () =>
-          import('@/views/quality/qualityDefectProcess.vue'),
-    meta: { title: '缺陷过程' }
-  },
-  {
-    path: 'qualityHotpatchProcess',
-    name: '热修复过程',
-    hidden: true,
-    component: () =>
-          import('@/views/quality/qualityHotpatchProcess.vue'),
-    meta: { title: '热修复过程' }
-  },
-  {
-    path: 'problemList',
-    name: '线上问题',
-    component: () =>
-          import('@/views/onlineProblem/problemList.vue'),
-    meta: { title: '线上问题' }
-  },
-  {
-    path: '/Platform/defectManagement/problemCreate',
-    name: '新建线上问题',
-    hidden: true,
-    component: () =>
-          import('@/views/onlineProblem/problemCreate'),
-    meta: { title: '新建线上问题' }
-  },
-  {
-    path: '/Platform/defectManagement/problemQuery',
-    name: '查看线上问题',
-    hidden: true,
-    component: () =>
-          import('@/views/onlineProblem/problemQuery'),
-    meta: { title: '查看线上问题' }
-  },
-  {
-    path: '/Platform/defectManagement/problemUpdate',
-    name: '更新线上问题',
-    hidden: true,
-    component: () =>
-          import('@/views/onlineProblem/problemUpdate'),
-    meta: { title: '更新线上问题' }
-  }
-  ]
-},
-
 {
   path: '/Platform/setUp',
   component: Layout,
@@ -674,7 +648,6 @@ export const constantRoutes = [{
                 import('@/views/Platform/setUp/systemSetup/addConf'),
         meta: { title: '新增配置' }
       }
-
       ]
     },
     {
@@ -685,22 +658,30 @@ export const constantRoutes = [{
       meta: { title: '团队设置' }
     }
   ]
+},
+{
+  path: '/data',
+  component: Layout,
+  redirect: '/data/upload-file',
+  name: '数据中心',
+  hidden: true,
+  meta: { title: '数据中心', icon: 'examlpe' },
+  children: [
+    {
+      path: 'upload-file',
+      name: 'jar包管理',
+      component: () => import('@/views/data/upload.vue'),
+      meta: { title: 'jar包管理' }
+    },
+    {
+      path: 'item',
+      name: '动态数据',
+      component: () => import('@/views/data/index.vue'),
+      meta: { title: '动态数据' }
+    }
+  ]
 }
-// {
-//   path: '/ToConfigure',
-//   name: '组织配置',
-//   component: Layout,
-//   redirect: '/ToConfigure/configure',
-//   // hidden: true,
-//   meta: { title: '组织配置', icon: '上线质检' },
-//   children: [{
-//     path: 'configure',
-//     name: '组织配置',
-//     component: () =>
-//         import('@/views/ToConfigure/configure'),
-//     meta: { title: '组织配置', icon: '组织配置' }
-//   }]
-// }
+
 ]
 
 const createRouter = () => new Router({

src/views/projectManage/dialog_vue.vue

@@ -18,10 +18,10 @@
           </el-form-item>
           <el-form-item v-if="ascription_demand" label="归属需求" prop="requireId">
             <el-select v-model="task_form.requireId" filterable clearable placeholder="请选择" style="width:20vw">
-              <el-option v-for="item in demandList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option v-for="item in demandList" :key="item.code" :label="item.msg" :value="item.code" />
             </el-select>
           </el-form-item>
-          <el-form-item v-if="ascription_project" label="归属项目" prop="requireId">
+          <el-form-item v-if="ascription_project" label="归属项目" prop="projectId">
             <el-select v-model="task_form.projectId" filterable clearable placeholder="请选择" style="width:20vw">
               <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
@@ -84,7 +84,7 @@
 </template>
 
 <script>
-import { taskCreate, memberQueryMemberInfoByIDAPorName, configShowTaskEnum, settingGetTypeMap, requirementQueryRequirementInfoList, taskGet, taskUpdate } from '@/api/taskIndex' // ajax
+import { taskCreate, memberQueryMemberInfoByIDAPorName, configShowTaskEnum, settingGetTypeMap, configShowRequirementVersionEnum, taskGet, taskUpdate } from '@/api/taskIndex' // ajax
 import { projectList } from '@/api/projectIndex'
 export default {
   data() {
@@ -189,8 +189,9 @@ export default {
       projectList({ curIndex: 1, pageSize: 15 }).then(res => { // 获取项目（查询）
         this.projectList = res.data
       })
-      requirementQueryRequirementInfoList({ curIndex: 1, pageSize: 15 }).then(res => { // 获取需求（查询）
-        this.demandList = res.data.list
+      configShowRequirementVersionEnum('').then(res => {
+        // 获取需求（查询）
+        this.demandList = res.data.belongingRequire
       })
     },
     test2(item, e) { // 获取团队人员信息
@@ -214,7 +215,7 @@ export default {
           taskCreate({ taskInfoDO, user }).then(res => {
             this.dialogFormVisible = false
             this.$message({ message: res.msg, type: 'success', duration: 1000, offset: 150 })
-            // this.tit === '新建任务' ? this.$router.push({ name: '任务详情', query: { taskId: e.id }}) : ''
+            this.$router.push({ name: '任务详情', query: { id: res.data.id }})
           })
         }
       })

src/views/projectManage/projectList/projectViewDetails.vue

@@ -30,7 +30,7 @@
           </el-dropdown>
         </span>
         <span style="float: right;">
-          <el-button size="mini" @click="centerDialogVisible = true">删除项目</el-button>
+          <el-button size="mini" @click="dele_pro()">删除项目</el-button>
           <el-dropdown>
             <el-button size="mini" type="primary">
               新建
@@ -567,6 +567,7 @@ import {
   mileStoneUpdate,
   mileStoneDelete,
   projectDelete,
+  projectDeleteCheck,
   taskList,
   requirementQueryRequirementInfoList
 } from '@/api/projectIndex'
@@ -582,8 +583,7 @@ export default {
     dateStr(value) {
       if (!value) return ''
       var date = value.split('T')
-      var a = date[1].split('.')
-      return date[0] + ' ' + a[0]
+      return date[0]
     },
     ellipsis(value) {
       if (!value) return ''
@@ -762,14 +762,14 @@ export default {
       }).then(res => {
         this.form_query = res.data[0]
         this.project_from = res.data[0]
-        if (this.form_query.target !== '') {
-          this.Addition1 = false
-          this.Addition = false
-          this.Addition2 = true
-        } else {
+        if (this.form_query.target === '' || this.form_query.target === null) {
           this.Addition1 = false
           this.Addition2 = false
           this.Addition = true
+        } else {
+          this.Addition1 = false
+          this.Addition = false
+          this.Addition2 = true
         }
         this.form_query.status === 0
           ? this.$set(this.form_query, 'statusString', '未开始')
@@ -806,6 +806,15 @@ export default {
         this.total = res.total
       })
     },
+    dele_pro() {
+      projectDeleteCheck(this.form_query.id, {}).then(res => {
+        if (res.code === 200) {
+          this.centerDialogVisible = true
+        } else {
+          this.$message({ message: res.msg, type: 'error', duration: 1000, offset: 150 })
+        }
+      })
+    },
     project_modifica(e) {
       this.modify_project = true
     },

src/views/projectManage/taskList/taskIndex.vue

@@ -33,8 +33,8 @@
             <el-dropdown-item
               v-for="item in projectList"
               :key="item.value"
-              :command="{ value: item.id, label: item.name, flag: 3 }"
-            >{{ item.name }}</el-dropdown-item>
+              :command="{ value: item.code, label: item.msg, flag: 3 }"
+            >{{ item.msg }}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
         <el-dropdown @command="handleCommand">
@@ -272,8 +272,7 @@ import {
   settingGetTypeMap,
   memberQueryMemberInfoByIDAPorName,
   configShowRequirementVersionEnum,
-  taskIdAndName,
-  projectList
+  taskIdAndName
 } from '@/api/taskIndex' // ajax
 import openDialog from '@/views/projectManage/dialog_vue'
 export default {
@@ -347,10 +346,6 @@ export default {
         this.total = res.total
         this.table_loading = false
       })
-      projectList({ curIndex: 1, pageSize: 15 }).then(res => {
-        // 获取项目（查询）
-        this.projectList = res.data
-      })
       configShowRequirementVersionEnum('').then(res => {
         // 获取需求（查询）
         this.demandList = res.data.belongingRequire
@@ -396,7 +391,6 @@ export default {
         case 3:
           this.form_task.project_label = command.label
           this.form_task_number.project = command.value
-          console.log(command.value, 'cdcsdcdsc')
           configShowRequirementVersionEnum(Number(command.value)).then(res => {
             // 获取需求（查询）
             this.demandList = res.data.belongingRequire
@@ -459,6 +453,7 @@ export default {
       // 下拉菜单数据
       configShowTaskEnum().then(res => {
         this.noTest = res.data.noTest // 是否免测
+        this.projectList = res.data.belongingProject
         this.taskSource = res.data.taskSource // 归属需求
         this.appClient = res.data.appClient // 涉及客户端
       })