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

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

@@ -20,7 +20,7 @@
             <el-dropdown-item @click.native="openDeleteDialog()">删除</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <div style="display: inline-block;margin-left: 10px;margin-right: 15px;padding: 10px" @mouseover="iconName = 'float_反馈_icon_close_蓝色'" @mouseleave="iconName = 'float_反馈_icon_close'" @mousedown="closeDrawer();">
+        <div style="display: inline-block;margin-left: 10px;margin-right: 15px;" @mouseover="iconName = 'float_反馈_icon_close_蓝色'" @mouseleave="iconName = 'float_反馈_icon_close'" @mousedown="closeDrawer();">
           <el-button size="medium" type="text" style="margin-top:-5px;">
             <svg-icon :icon-class="iconName" />
           </el-button>
@@ -29,7 +29,7 @@
     </div>
     <el-container
       v-loading.fullscreen.lock="loading.fullscreen"
-      :style="type=='page'?{'background-color': '#F2F3F6','padding': '1%'}:{'background-color': '#F2F3F6','overflow': 'auto','height':height}"
+      :style="type=='page'?{'background-color': '#F2F3F6','padding': '1%'}:{'background-color': '#F56C6C','overflow': 'auto','height':height}"
       class="bug_manage_container"
     >
       <el-header height="0" />
@@ -278,7 +278,7 @@
             </el-container>
           </el-main>
         </el-aside>
-        <el-aside :width="type=='page'?'28.5%':'100%'">
+        <el-aside :width="type=='page'?'29.2%':'100%'">
           <el-main v-loading="loading.userInfo" :style="type=='page'?{'padding': '20px 30px'}:{'padding-left':'30px'}" class="layout_main bug_manage_user_info">
             <div class="module_title">
               <div class="module_title__sign" />
@@ -416,12 +416,12 @@
             placement="top"
           >
             <div class="bug_describe_content" @click="describeEditorVisible = true;">
-              <div v-html="bug.bugDescribe" />
+              <div style="font-size:14px" v-html="bug.bugDescribe" />
             </div>
           </el-tooltip>
-          <div v-show="describeEditorVisible">
+          <div v-show="describeEditorVisible" style="margin-top:15px">
             <div id="wage" class="toolbar" />
-            <div id="wage1" class="text" @blur="describeConfirm()" />
+            <div id="wage1" class="text" style="font-size:14px" @blur="describeConfirm()" />
             <div style="margin-top:40px;float: right">
               <el-button @click="describeCancel()">取 消</el-button>
               <el-button type="primary" @click="describeConfirm()">确 认</el-button>
@@ -436,6 +436,7 @@
           <el-divider v-if="type !== 'page'" />
           <el-upload
             ref="upload"
+            style="margin-top: 15px"
             class="upload-demo"
             list-type="picture-card"
             multiple
@@ -695,6 +696,7 @@ export default {
       }
     },
     id(newVal, oldVal) {
+      window.scrollTo(0, 0)
       this.bug = {}
       this.bugModel = {}
       this.bugNameForm = { bugName: '' }
@@ -896,6 +898,11 @@ export default {
     },
     describeConfirm() {
       this.bug.bugDescribe = this.bugDescribe
+      if (this.bugDescribe) {
+        this.bugDescribeNoHtml = this.bugDescribe
+          .replace(/<[^>]+>/g, '')
+          .replace(/&nbsp;/gi, '')
+      }
       this.bugUpdate(this.bug, 'describe').then(res => {
         if (res.code === 200) {
           this.describeEditorVisible = false
@@ -1269,6 +1276,7 @@ export default {
 }
 .bug_describe {
   color: #C0C4CC;
+  font-size: 14px;
 }
 .bug_describe:hover {
   color: #409eff;