合代码

src/api/InterfaceReport.js

@@ -1,14 +1,11 @@
 import request from '@/utils/request'
-import { mockUrl } from '@/apiConfig/api'
+import { Presentation } from '@/apiConfig/api'
 // ================================== Interface ======================================
 
-// const mockUrl = 'http://10.179.24.176:8980' // 线下
-// const mockUrl = 'http://10.179.24.123:8980' // 线上
-
 // 全局list
 export function launchTestList(data) {
   return request({
-    url: mockUrl + '/launchTest/list',
+    url: Presentation + '/launchTest/list',
     method: 'post',
     data
   })
@@ -16,7 +13,7 @@ export function launchTestList(data) {
 // 删除
 export function launchTestDelete(data, id) {
   return request({
-    url: mockUrl + '/launchTest/delete?id=' + id,
+    url: Presentation + '/launchTest/delete?id=' + id,
     method: 'post',
     data
   })
@@ -24,7 +21,7 @@ export function launchTestDelete(data, id) {
 // 编辑
 export function launchTestUpdate(data) {
   return request({
-    url: mockUrl + '/launchTest/update',
+    url: Presentation + '/launchTest/update',
     method: 'post',
     data
   })
@@ -32,7 +29,7 @@ export function launchTestUpdate(data) {
 // 新建
 export function launchTestCreate(data) {
   return request({
-    url: mockUrl + '/launchTest/create',
+    url: Presentation + '/launchTest/create',
     method: 'post',
     data
   })
@@ -40,7 +37,7 @@ export function launchTestCreate(data) {
 // 新建
 export function taskListCreate(data) {
   return request({
-    url: mockUrl + '/task/listAll',
+    url: Presentation + '/task/listAll',
     method: 'post',
     data
   })

src/api/ResultPage.js

@@ -1,14 +1,11 @@
 import request from '@/utils/request'
-import { mockUrl } from '@/apiConfig/api'
+import { Presentation } from '@/apiConfig/api'
 // ================================== Interface ======================================
 
-// const mockUrl = 'http://10.179.24.176:8980' // 线下
-// const mockUrl = 'http://10.179.24.123:8980' // 线上
-
 // 全局list
 export function projectTestReportList(data) {
   return request({
-    url: mockUrl + '/projectTestReport/list',
+    url: Presentation + '/projectTestReport/list',
     method: 'post',
     data
   })
@@ -17,7 +14,7 @@ export function projectTestReportList(data) {
 // 删除
 export function projectTestReportDelete(data, id) {
   return request({
-    url: mockUrl + '/projectTestReport/delete?id=' + id,
+    url: Presentation + '/projectTestReport/delete?id=' + id,
     method: 'post',
     data
   })
@@ -26,7 +23,7 @@ export function projectTestReportDelete(data, id) {
 // 更新
 export function projectTestReportUpdate(data) {
   return request({
-    url: mockUrl + '/projectTestReport/update',
+    url: Presentation + '/projectTestReport/update',
     method: 'post',
     data
   })
@@ -35,7 +32,7 @@ export function projectTestReportUpdate(data) {
 // 新增
 export function projectTestReportCreate(data) {
   return request({
-    url: mockUrl + '/projectTestReport/create',
+    url: Presentation + '/projectTestReport/create',
     method: 'post',
     data
   })
@@ -44,7 +41,7 @@ export function projectTestReportCreate(data) {
 // 提测邮件
 export function launchTestSendmail(data) {
   return request({
-    url: mockUrl + '/launchTest/sendmail',
+    url: Presentation + '/launchTest/sendmail',
     method: 'post',
     data
   })
@@ -52,7 +49,7 @@ export function launchTestSendmail(data) {
 // 准出邮件
 export function projectTestReportSendmail(data) {
   return request({
-    url: mockUrl + '/projectTestReport/sendmail',
+    url: Presentation + '/projectTestReport/sendmail',
     method: 'post',
     data
   })
@@ -61,7 +58,7 @@ export function projectTestReportSendmail(data) {
 // 日报邮件
 export function dailyReportSendmail(data) {
   return request({
-    url: mockUrl + '/dailyReport/sendmail',
+    url: Presentation + '/dailyReport/sendmail',
     method: 'post',
     data
   })
@@ -70,7 +67,7 @@ export function dailyReportSendmail(data) {
 // bug数据获取
 export function bugFinishList(data) {
   return request({
-    url: mockUrl + '/bug/FinishList',
+    url: Presentation + '/bug/FinishList',
     method: 'post',
     data
   })

src/api/testPresentetion.js

@@ -1,13 +1,11 @@
 import request from '@/utils/request'
-import { mockUrl } from '@/apiConfig/api'
+import { Presentation } from '@/apiConfig/api'
 // ================================== Interface ======================================
-// const mockUrl = 'http://10.179.24.176:8980' // 线下
-// const mockUrl = 'http://10.179.24.123:8980' // 线上
 
 // 全局list
 export function dailyReportList(data) {
   return request({
-    url: mockUrl + '/dailyReport/list',
+    url: Presentation + '/dailyReport/list',
     method: 'post',
     data
   })
@@ -16,7 +14,7 @@ export function dailyReportList(data) {
 // 搜索
 export function dailyReportGet(id, data) {
   return request({
-    url: mockUrl + '/dailyReport/get?id=' + id,
+    url: Presentation + '/dailyReport/get?id=' + id,
     method: 'post',
     data
   })
@@ -25,7 +23,7 @@ export function dailyReportGet(id, data) {
 // 添加
 export function dailyReportCreate(data) {
   return request({
-    url: mockUrl + '/dailyReport/create',
+    url: Presentation + '/dailyReport/create',
     method: 'post',
     data
   })
@@ -34,7 +32,7 @@ export function dailyReportCreate(data) {
 // 删除
 export function dailyReportDelete(data, id) {
   return request({
-    url: mockUrl + '/dailyReport/delete?id=' + id,
+    url: Presentation + '/dailyReport/delete?id=' + id,
     method: 'post',
     data
   })
@@ -43,7 +41,7 @@ export function dailyReportDelete(data, id) {
 // 更新
 export function dailyReportUpdate(data) {
   return request({
-    url: mockUrl + '/dailyReport/update',
+    url: Presentation + '/dailyReport/update',
     method: 'post',
     data
   })
@@ -51,7 +49,7 @@ export function dailyReportUpdate(data) {
 // echarts
 export function bugDailyList(data) {
   return request({
-    url: mockUrl + '/bug/DailyList',
+    url: Presentation + '/bug/DailyList',
     method: 'post',
     data
   })
@@ -59,7 +57,7 @@ export function bugDailyList(data) {
 // 日报
 export function dailyReport(params) {
   return request({
-    url: mockUrl + '/dailyReport/get',
+    url: Presentation + '/dailyReport/get',
     method: 'get',
     params
   })
@@ -67,7 +65,7 @@ export function dailyReport(params) {
 // 提测报告
 export function launchTest(params) {
   return request({
-    url: mockUrl + '/launchTest/get',
+    url: Presentation + '/launchTest/get',
     method: 'get',
     params
   })
@@ -75,7 +73,7 @@ export function launchTest(params) {
 // echarts
 export function projectTestReport(params) {
   return request({
-    url: mockUrl + '/projectTestReport/get',
+    url: Presentation + '/projectTestReport/get',
     method: 'get',
     params
   })

src/apiConfig/api.js

@@ -2,8 +2,6 @@
 export const mockUrl = 'http://10.179.24.176:8980' // 线下
 // export const mockUrl = 'http://10.179.24.123:8980' // 线上
 
-// export const mockUrl = 'http://172.23.162.226:8980' // 舒宁本地
-
 export const qualityUrl = 'http://10.179.181.103:8898' // 质量度量
 
 // export const HMvehicleUrl = 'http://10.96.113.197:9999' // 电单车 线下
@@ -13,4 +11,6 @@ export const HMvehicleUrl = 'http:// 10.179.181.103:9999' // 电单车 线上
 
 export const TeamManagement = 'http://10.179.24.176:8990' // 团队配置 项目
 
-export const task_Url = 'http://10.179.24.176:8990' // 任务
+export const task_Url = 'http://10.179.24.176:8990' // 任务
+
+export const Presentation = 'http://10.179.24.176:8990' // 报告模块

src/views/Platform/bugManage/bugCreate.vue

@@ -241,7 +241,6 @@ export default {
 
     // 上传成功回调
     handleChange(response, file, fileList) {
-      this.fileDbList = []
       this.fileDbList.push({ 'name': file.name, 'url': 'http:' + file.response.url })
       this.accessory = JSON.stringify(this.fileDbList)
       this.dis = false
@@ -264,7 +263,7 @@ export default {
         this.clientTypeEnumList = res.data.clientTypeEnumList
         this.serviceTypeEnumList = res.data.serviceTypeEnumList
       })
-      await taskListCreate({}).then(res => { // 获取任务数据 (后期用this.taskStatus)
+      await taskListCreate({ statusList: [5, 6, 7, 8, 9, 10] }).then(res => { // 获取任务数据 (后期用this.taskStatus)
         this.taskIdStr = res.data
       })
       if (this.$route.query.id) {

src/views/Platform/bugManage/bugQuery.vue

@@ -53,6 +53,7 @@
         </div>
         <div class="display-messege-end">
           <div class="divide-threeparts">reopen次数 :&nbsp;&nbsp;&nbsp;{{ form.reopenTimes }}</div>
+          <div class="divide-threeparts">reopen原因 :&nbsp;&nbsp;&nbsp;{{ form.reopenReason }}</div>
         </div>
       </div>
       <div class="block-end">
@@ -159,6 +160,17 @@
         <el-button type="primary" @click="queryFormDataRepair">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="dialogInReopen" width="40%">
+      <el-form ref="refeshReopenDialog" :model="pauseData" :rules="serviceDataRules">
+        <el-form-item label="reopen原因" prop="pauseReopenReason" label-width="30%">
+          <el-input v-model="pauseData.pauseReopenReason" type="textarea" autocomplete="off" rows="3" style="width:76%;" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogInReopen = false">取 消</el-button>
+        <el-button type="primary" @click="queryFormDataReopen">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -174,6 +186,7 @@ export default {
         id: ''
       },
       fileList: [],
+      dialogInReopen: false,
       uptataKey: [],
       formUpdateValue: {},
       dialogVisible: false,
@@ -183,13 +196,16 @@ export default {
         bugTypePause: '',
         pauseCurrentHandler: '',
         pauseRepairResult: '',
-        pauseReasonsAndSolutionForTheProblem: ''
+        pauseReasonsAndSolutionForTheProblem: '',
+        pauseReopenReason: ''
       },
       serviceDataRules: {
         pauseCurrentHandler: [{ required: true, message: '处理人不能为空', trigger: 'blur' }],
         reasonPause: [{ required: true, message: '问题原因不能为空', trigger: 'change' }],
         bugTypePause: [{ required: true, message: 'bug类型不能为空', trigger: 'change' }],
-        pauseRepairResult: [{ required: true, message: '修复结果不能为空', trigger: 'change' }]
+        pauseRepairResult: [{ required: true, message: '修复结果不能为空', trigger: 'change' }],
+        pauseReopenReason: [{ required: true, message: 'reopen原因不能为空', trigger: 'change' }]
+        // pauseReasonsAndSolutionForTheProblem: [{ required: true, message: '修复方式不能为空', trigger: 'change' }]
       },
       bizId: '',
       optionsCurrentHandlerQA: [],
@@ -262,7 +278,7 @@ export default {
       bugGet(this.$route.query.id).then(res => {
         this.form = res.data
         this.$nextTick(() => {
-          document.getElementById('specialP').childNodes[0].style.cssText = 'margin-top:0'
+          if (document.getElementById('specialP').childNodes[0])document.getElementById('specialP').childNodes[0].style.cssText = 'margin-top:0'
           if (document.getElementById('specialPAnother').childNodes[0])document.getElementById('specialPAnother').childNodes[0].style.cssText = 'margin-top:0'
         })
         this.fileList = []
@@ -311,6 +327,32 @@ export default {
     cancelInput() {
       this.pauseData.pauseCurrentHandler = ''
     },
+    // reopen弹窗
+    queryFormDataReopen() {
+      this.$refs.refeshReopenDialog.validate((valid) => {
+        if (valid) {
+          this.formUpdateValue.currentHandler = this.form.currentHandler
+          this.formUpdateValue.id = this.form.id
+          this.formUpdateValue.status = this.form.status
+          this.formUpdateValue.reopenReason = this.pauseData.pauseReopenReason
+          this.userData = { id: '', ename: this.userInformation, name: this.userNames }
+          this.objData = { bugBaseInfo: this.formUpdateValue, user: this.userData }
+          bugUpdate(this.objData).then(res => {
+            if (res.code === 200) {
+              this.successFun()
+              this._initBegin()
+              if (this.$refs.refeshReopenDialog !== undefined) {
+                this.$refs.refeshReopenDialog.resetFields()
+              }
+            } else {
+              this.errorFun()
+            }
+          })
+          this.dialogInReopen = false
+          this.formUpdateValue = {}
+        }
+      })
+    },
     statusChange(e) {
       if (e === 1) {
         this.dialogInDevelopment = true
@@ -323,6 +365,8 @@ export default {
         this.pauseData.bugTypePause = this.form.bugType
       } else if (e === 3) {
         this.dialogInRepairResult = true
+      } else if (e === 4) {
+        this.dialogInReopen = true
       } else {
         this.formUpdateValue.currentHandler = this.form.currentHandler
         this.formUpdateValue.id = this.form.id

src/views/Platform/bugManage/bugUpdate.vue

@@ -337,7 +337,7 @@ export default {
     },
     // 获取任务数据
     taskIdGet() {
-      taskListCreate({}).then(res => {
+      taskListCreate({ statusList: [5, 6, 7, 8, 9, 10] }).then(res => {
         this.taskIdStr = res.data
       })
     },
@@ -439,7 +439,6 @@ export default {
             this.form.appVersion = this.form.appVersionList.join(',')
             delete this.form.appVersionList
           }
-          // form.reopenTimes = parseInt(form.reopenTimes)
           form.accessory = this.accessory
           this.userData = { id: '', ename: this.userInformation, name: this.userNames }
           this.objData = { bugBaseInfo: form, user: this.userData }

src/views/projectManage/projectList/projectIndex.vue

@@ -112,44 +112,14 @@
           size="mini"
           show-overflow-tooltip="true"
         >
-          <el-table-column label="优先级" sortable min-width="100" align="center">
+          <el-table-column prop="priority" label="优先级" sortable min-width="100" align="center">
             <template slot-scope="scope">
-              <div
-                v-show="scope.row.priorityStr === 'p0'"
-                :style="{background: '#F56C6C',border: '#F56C6C',width:'41.39px',height:'23px',margin: '0 auto','border-radius': '4px','color': 'white'} "
-              >{{ scope.row.priorityStr.toUpperCase() }}</div>
-              <div
-                v-show="scope.row.priorityStr === 'p1'"
-                :style="{background: '#FF8952',border: '#FF8952',width:'41.39px',height:'23px',margin: '0 auto','border-radius': '4px','color': 'white'} "
-              >{{ scope.row.priorityStr.toUpperCase() }}</div>
-              <div
-                v-show="scope.row.priorityStr === 'p2'"
-                :style="{background: '#F5E300',border: '#F5E300',width:'41.39px',height:'23px',margin: '0 auto','border-radius': '4px','color': 'white'} "
-              >{{ scope.row.priorityStr.toUpperCase() }}</div>
-              <div
-                v-show="scope.row.priorityStr === 'p3'"
-                :style="{background: '#7ED321',border: '#7ED321',width:'41.39px',height:'23px',margin: '0 auto','border-radius': '4px','color': 'white'} "
-              >{{ scope.row.priorityStr.toUpperCase() }}</div>
-              <div
-                v-show="scope.row.priorityStr === 'p4'"
-                :style="{background: '#61D3B8',border: '#61D3B8',width:'41.39px',height:'23px',margin: '0 auto','border-radius': '4px','color': 'white'} "
-              >{{ scope.row.priorityStr.toUpperCase() }}</div>
-              <div
-                v-show="scope.row.priorityStr === 'p5'"
-                :style="{background: '#69B3FF',border: '#69B3FF',width:'41.39px',height:'23px',margin: '0 auto','border-radius': '4px','color': 'white'} "
-              >{{ scope.row.priorityStr.toUpperCase() }}</div>
-              <div
-                v-show="scope.row.priorityStr === 'p6'"
-                :style="{background: '#BDBDBD',border: '#BDBDBD',width:'41.39px',height:'23px',margin: '0 auto','border-radius': '4px','color': 'white'} "
-              >{{ scope.row.priorityStr.toUpperCase() }}</div>
+              <div class="div_priority" :style="{background: priorityColors[scope.row.priority % priorityColors.length]}">{{ 'P'+scope.row.priority }}</div>
             </template>
           </el-table-column>
           <el-table-column label="项目名称" min-width="400" show-overflow-tooltip>
             <template slot-scope="scope">
-              <div
-                style="cursor: pointer;"
-                @click="link_project(scope.row.id)"
-              >{{ scope.row.name }}</div>
+              <div style="cursor: pointer;" @click="link_project(scope.row.id)">{{ scope.row.name }}</div>
             </template>
           </el-table-column>
           <el-table-column label="业务线" min-width="100" align="center">
@@ -239,6 +209,7 @@
                 v-model="form.pmOwner"
                 filterable
                 remote
+                clearable
                 reserve-keyword
                 placeholder="请输入姓名或邮箱前缀"
                 :remote-method="remoteMethod"
@@ -260,6 +231,7 @@
               <el-select
                 v-model="form.testOwner"
                 filterable
+                clearable
                 remote
                 reserve-keyword
                 placeholder="请输入姓名或邮箱前缀"
@@ -316,6 +288,7 @@
               <el-select
                 v-model="form.rdOwner"
                 filterable
+                clearable
                 remote
                 reserve-keyword
                 placeholder="请输入姓名或邮箱前缀"
@@ -371,6 +344,7 @@ export default {
         bizType: '项目类型',
         priority: '优先级'
       },
+      priorityColors: ['#F56C6C', '#FF8952', '#F5E300', '#7ED321', '#61D3B8', '#69B3FF', '#C889FF'],
       rules_form: {
         name: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
         bizType: [
@@ -623,4 +597,11 @@ export default {
 .el-dialog__header {
     padding: 0px 0px 0px;
 }
+.div_priority {
+  color: #ffffff;
+  width:fit-content;
+  padding: 0 12px;
+  border-radius: 4px;
+  margin: auto;
+}
 </style>

src/views/projectManage/projectList/projectViewDetails.vue

@@ -426,6 +426,7 @@
               <el-select
                 v-model="project_from.pmOwner"
                 filterable
+                clearable
                 remote
                 reserve-keyword
                 placeholder="请输入姓名或邮箱前缀"
@@ -449,6 +450,7 @@
                 v-model="project_from.testOwner"
                 filterable
                 remote
+                clearable
                 reserve-keyword
                 placeholder="请输入姓名或邮箱前缀"
                 :remote-method="remoteMethod"
@@ -509,6 +511,7 @@
               <el-select
                 v-model="project_from.rdOwner"
                 filterable
+                clearable
                 remote
                 reserve-keyword
                 placeholder="请输入姓名或邮箱前缀"
@@ -852,6 +855,10 @@ export default {
     },
     project_modifica(e) {
       this.modify_project = true
+      this.form_query.projectOwner ? this.remoteMethod(this.form_query.projectOwner) : ''
+      this.form_query.pmOwner ? this.remoteMethod(this.form_query.pmOwner) : ''
+      this.form_query.rdOwner ? this.remoteMethod(this.form_query.rdOwner) : ''
+      this.form_query.testOwner ? this.remoteMethod(this.form_query.testOwner) : ''
     },
     close_dialog() {
       // 关闭弹窗

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

@@ -179,10 +179,10 @@ export default {
           this.form = JSON.parse(JSON.stringify(this.data))
           this.form.pm = this.form.pm[0].idap
           this.init()
+          this.form.modifier = localStorage.getItem('username')
         } else if (this.title === '新建需求' && this.data) {
           this.form = JSON.parse(JSON.stringify(this.data))
         }
-        console.log(this.form)
       }
     },
     isVisible: function(newIsVisible, oldIsVisible) {

src/views/projectManage/taskList/taskViewDetails.vue

@@ -178,7 +178,7 @@
               <template slot-scope="scope">{{ scope.row.desc }}</template>
             </el-table-column>
             <el-table-column label="排期" min-width="200" align="center">
-              <template slot-scope="scope">{{ scope.row.startTime }} - {{ scope.row.endTime }}</template>
+              <template slot-scope="scope">{{ scope.row.startTime | naspOut }} - {{ scope.row.endTime | naspOut }}</template>
             </el-table-column>
             <el-table-column label="人员" min-width="200" align="center">
               <template slot-scope="scope">
@@ -204,7 +204,7 @@
             style="margin: 2% 3%; color: #333B4A; padding-bottom:2%;border-bottom:1px solid #E9E9E9;"
           >
             <el-col :span="12">
-              <div class="dateSet">排期汇总：{{ tiem_date.startTime }} ～ {{ tiem_date.endTime }}</div>
+              <div class="dateSet">排期汇总：{{ tiem_date.startTime | naspOut }} ～ {{ tiem_date.endTime | naspOut }}</div>
             </el-col>
           </el-row>
           <el-row
@@ -212,13 +212,13 @@
             style="margin: 2% 3%; color: #333B4A; padding-bottom:2%;border-bottom:1px solid #E9E9E9;"
           >
             <el-col :span="8">
-              <div class="dateSet">实际提测时间：{{ task_form.launchTestRealTime }}</div>
+              <div class="dateSet">实际提测时间：{{ task_form.launchTestRealTime | naspOut }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="dateSet">实际准出时间：{{ task_form.testFinishRealTime }}</div>
+              <div class="dateSet">实际准出时间：{{ task_form.testFinishRealTime | naspOut }}</div>
             </el-col>
             <el-col :span="8">
-              <div class="dateSet">实际上线完成时间：{{ task_form.onlineRealTime }}</div>
+              <div class="dateSet">实际上线完成时间：{{ task_form.onlineRealTime | naspOut }}</div>
             </el-col>
           </el-row>
           <el-row
@@ -550,6 +550,14 @@ export default {
     openDialog,
     Gantt
   },
+  filters: {
+    naspOut(value) {
+      if (!value) return ''
+      var da = value.split(/\s+/)
+      console.log(da)
+      return da[0]
+    }
+  },
   data() {
     return {
       dialog_open: false,