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

src/views/projectManage/dialog_vue.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="task">
-    <el-dialog :visible.sync="dialogFormVisible" width="70%">
+    <el-dialog :visible.sync="dialogFormVisible" width="70%" :close-on-click-modal="false">
       <div style="margin: 0% 7% 2% 7%; font-size: 18px; white-space: nowrap;color:rgba(51,59,74,1);">
         <b style="color: #409EFF;margin: 0 0.5%;font-weight: 600; ">I</b>{{ tit_Name }}
       </div>

src/views/projectManage/projectList/projectIndex.vue

@@ -104,11 +104,12 @@
         <el-table
           :data="table_project"
           style="width: 100%;"
-          size="mini"
-          :header-cell-style="{ background: '#6AB4FF', color: '#FFFFFF', height:'47px' }"
+          highlight-current-row
+          :header-cell-style="{ background: '#6AB4FF', color: '#FFFFFF',textAlign: 'center'}"
+          :cell-style="{textAlign: 'center','font-size':'14px','font-family':'MicrosoftYaHei'}"
           show-overflow-tooltip="true"
         >
-          <el-table-column label="优先级" min-width="100" align="center">
+          <el-table-column label="优先级" sortable min-width="100" align="center">
             <template slot-scope="scope">
               <div
                 v-show="scope.row.priorityStr === 'p0'"
@@ -193,7 +194,7 @@
         </div>
       </el-main>
     </el-container>
-    <el-dialog :visible.sync="dialogFormVisible" width="70%">
+    <el-dialog :visible.sync="dialogFormVisible" width="70%" :close-on-click-modal="false">
       <div style="margin: 0% 7% 2% 2%; font-size: 18px; white-space: nowrap;color:rgba(51,59,74,1);">
         <b style="color: #409EFF;margin: 0 0.5%;font-weight: 600; ">I</b>{{ '新建项目' }}
       </div>

src/views/projectManage/taskList/taskIndex.vue

@@ -192,8 +192,9 @@
           v-loading="table_loading"
           :data="task_table"
           style="width: 100%;"
-          size="mini"
-          :header-cell-style="{ background: '#6AB4FF', color: '#FFFFFF', height:'47px' }"
+          highlight-current-row
+          :header-cell-style="{ background: '#6AB4FF', color: '#FFFFFF',textAlign: 'center'}"
+          :cell-style="{textAlign: 'center','font-size':'14px','font-family':'MicrosoftYaHei'}"
           show-overflow-tooltip="true"
         >
           <el-table-column label min-width="30" align="center">{{ '' }}</el-table-column>

src/views/projectManage/taskList/taskListIndex.vue

@@ -112,6 +112,7 @@
                       <el-dialog
                         :visible.sync="dialogVisible"
                         width="30%"
+                        :close-on-click-modal="false"
                       >
                         <span>确定要删除这条项目信息吗</span>
                         <span slot="footer" class="dialog-footer">
@@ -122,6 +123,7 @@
                       <el-dialog
                         :visible.sync="dialogVisibleTaskMove"
                         width="30%"
+                        :close-on-click-modal="false"
                       >
                         <span style="padding-right: 20px;font-size: 15px;font-weight: bold;">移动到</span>
                         <el-select v-model="taskProjectId" size="medium" filterable clearable>
@@ -303,7 +305,7 @@
         </div>
       </div>
     </div>
-    <el-dialog title="请选择创建服务端还是客户端" :visible.sync="openDialogVisible" width="30%" center>
+    <el-dialog title="请选择创建服务端还是客户端" :visible.sync="openDialogVisible" width="30%" center :close-on-click-modal="false">
       <div style="text-align: center; margin-top: 5%;">
         <template>
           <el-radio v-model="queryData.radio" label="1">服务端</el-radio>

src/views/projectManage/taskList/taskViewDetails.vue

@@ -310,7 +310,7 @@
                   <div>
                     <el-button size="mini" type="primary" plain @click="pass(1,scope.row.id)">通过</el-button>
                     <el-button size="mini" type="danger" plain @click="back(2,scope.row.id)">打回</el-button>
-                    <el-dialog title="打回原因" :visible.sync="dialog_launchTestInfoDOS" width="30%">
+                    <el-dialog title="打回原因" :visible.sync="dialog_launchTestInfoDOS" width="30%" :close-on-click-modal="false">
                       <el-input v-model="CallBackTheReason" type="textarea" :rows="3" />
                       <span slot="footer" class="dialog-footer">
                         <el-button type="primary" size="mini" @click="passOrBackSend()">确 定</el-button>
@@ -392,14 +392,14 @@
         </el-tabs>
       </el-footer>
     </el-container>
-    <el-dialog :visible.sync="centerDialogVisible" width="30%" center>
+    <el-dialog :visible.sync="centerDialogVisible" width="30%" center :close-on-click-modal="false">
       <div align="center">确定要删除此项目吗？</div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="centerDialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog :visible.sync="dialogFormVisible">
+    <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false">
       <div style="margin: 0% 7% 3% 2%; font-size: 18px; white-space: nowrap;color:rgba(51,59,74,1);">
         <b style="color: #409EFF;margin: 0 0.5%;font-weight: 600; ">I</b>{{ even }}
       </div>
@@ -467,7 +467,7 @@
         >确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="centerDialogVisible_status" width="30%" center>
+    <el-dialog :visible.sync="centerDialogVisible_status" width="30%" center :close-on-click-modal="false">
       <div align="center" style="margin-bottom: 8%; font-weight: 600;">状态变更：已上线</div>
       <el-row :gutter="24" style="margin: 2% 3%">
         <el-col
@@ -490,7 +490,7 @@
       </span>
     </el-dialog>
     <!-- 删除 -->
-    <el-dialog :visible.sync="centerDialogVisible_task" width="30%" center>
+    <el-dialog :visible.sync="centerDialogVisible_task" width="30%" center :close-on-click-modal="false">
       <div align="center">
         确定要删除
         <span style="color:red;">{{ task_form.name }}</span> 的任务吗?
@@ -684,7 +684,6 @@ export default {
         releaseScheduleList(param).then(res => {
           if (res.code === 200) {
             this.appVersion = this.versionDeal(res.data)
-            console.log(this.appVersion)
           }
         })
         this.task_form.stageString === '未知' ? this.bgStyle = '#C889FF' : ''
@@ -913,6 +912,7 @@ export default {
       })
     },
     event_update(e) {
+      console.log(e, 'a')
       // 编辑事件
       this.even = '编辑事件'
       this.$refs['form'].validate(valid => {
@@ -921,6 +921,7 @@ export default {
           e.noHoliday === true
             ? (schedule.noHoliday = 0)
             : (schedule.noHoliday = 1)
+          schedule.peopleObject = e.peoples
           schedule.startTime = e.date_start[0]
           schedule.endTime = e.date_start[1]
           schedule.taskId = Number(this.taskId[1])