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

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

@@ -1167,7 +1167,7 @@ export default {
 .layout_header,
 .layout_aside,
 .layout_main {
-  border-radius: 4px;
+  /* border-radius: 4px; */
   background-color: #ffffff;
 }
 .bug_manage_dialog_fixMethod .el-form-item__label {

src/views/projectManage/bugList/file/createdBug.vue

@@ -402,9 +402,3 @@ export default {
   }
 }
 </script>
-
-<style>
-.soll::-webkit-scrollbar{
-  width:0;
-  }
-</style>

src/views/projectManage/taskList/taskViewDetails.vue

@@ -301,8 +301,9 @@
         </span>
       </el-dialog>
       <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; ">|</b>{{ even }}
+        <div style="display:flex;align-items: center;margin: -4% 7% 3% 4.5%;">
+          <div style="width:4px;height:17px;background:#409EFF;border-radius:1px;" />
+          <div style="width:83px;height:20px;font-size:18px;font-family:MicrosoftYaHei;color:rgba(51,59,74,1);margin-left:6px">{{ even }}</div>
         </div>
         <el-form ref="form" :model="form" :rules="form_rules" label-width="100px">
           <el-form-item label="事件类型" prop="type">

src/views/projectManage/taskList/versionsCalendar.vue

@@ -47,8 +47,8 @@
         </full-calendar>
       </el-main>
 
-      <el-dialog :visible.sync="dialogFormVisible" width="1180px" class="bgborderNow">
-        <el-dialog width="35%" :visible.sync="dialogCraeteVisible" append-to-body>
+      <el-dialog :visible.sync="dialogFormVisible" width="1180px" class="bgborderNow" :close-on-click-modal="false">
+        <el-dialog width="35%" :visible.sync="dialogCraeteVisible" append-to-body :close-on-click-modal="false">
           <div style="display:flex;align-items: center;margin: 0px 0px 34px 29px;">
             <div style="width:4px;height:17px;background:#409EFF;border-radius:1px;" />
             <div style="width:83px;height:20px;font-size:18px;font-family:MicrosoftYaHei;color:rgba(51,59,74,1);margin-left:6px">{{ dialogStatus }}</div>
@@ -67,7 +67,7 @@
           <div style="margin-top:6%" />
         </el-dialog>
 
-        <el-dialog width="48%" :visible.sync="dialogEventVisible" append-to-body @opened="qiaoqiao()">
+        <el-dialog width="48%" :visible.sync="dialogEventVisible" append-to-body :close-on-click-modal="false" @opened="qiaoqiao()">
           <div style="display:flex;align-items: center;margin: 0px 0px 34px 29px;">
             <div style="width:4px;height:17px;background:#409EFF;border-radius:1px;" />
             <div style="width:150px;height:20px;font-size:18px;font-family:MicrosoftYaHei;color:rgba(51,59,74,1);margin-left:6px">{{ dialogStatus }}</div>
@@ -97,7 +97,7 @@
           <div style="margin-top:6%" />
         </el-dialog>
 
-        <el-dialog :visible.sync="dialogDeleteVerVisible" width="35%" style="min-width: 400px;" append-to-body>
+        <el-dialog :visible.sync="dialogDeleteVerVisible" width="35%" style="min-width: 400px;" append-to-body :close-on-click-modal="false">
           <div align="center" style="margin-top:2%">
             <b>是否删除当前版本？</b>
           </div>
@@ -108,7 +108,7 @@
           </div>
           <div style="margin-top:4%" />
         </el-dialog>
-        <el-dialog :visible.sync="dialogDeleteEveVisible" width="30%" append-to-body>
+        <el-dialog :visible.sync="dialogDeleteEveVisible" width="30%" append-to-body :close-on-click-modal="false">
           <div align="center" style="margin-top:2%">
             <b>是否删除当前事件？</b>
           </div>