Merge branch 'monthly_report_daily_0.0.7' into http_test

src/views/monthlyReport/childrenPage/editReport/components/MrTable/index.vue

@@ -139,7 +139,10 @@
                   </div>
                   <!-- 多选人员 -->
                   <div v-else-if="item.selectType && item.selectType === 'MultiplePeople'">
-                    <searchPeople :ref="`${scope.row.rowKey}_9867`" :value.sync="scope.row[item.headerKey]" :multiple="true" />
+                    <searchPeople
+:ref="`${scope.row.rowKey}_9867`"
+:value.sync="scope.row[item.headerKey]"
+                                  :multiple="true" />
                   </div>
                   <!-- 多选人员 -->
                   <div v-else-if="item.selectType && item.selectType === 'people'">
@@ -221,7 +224,10 @@
                 </div>
                 <div
                   v-else-if="item.displayType === 'Texterea'"
-                  :style="{cursor: item.name === '问题' && scope.row.operationTarget ? 'pointer' : 'auto'}"
+                  :style="{
+                    cursor: item.name === '问题' && scope.row.operationTarget ? 'pointer' : 'auto',
+                    color: item.name === '问题' && scope.row.operationTarget ? '#1890ff':'#666'
+                  }"
                   @click.stop="item.name === '问题' && pageType.search(/edit/) < 0 && goto(scope.row.operationTarget) || editLine(scope.row, index)"
                 >
                   <TextInfo :text-align="item.name" :text="scope.row[item.headerKey]" />
@@ -385,14 +391,11 @@ export default {
           width = item.defaultValue.length * (item.defaultValue.length > 2 ? 20 : 30)
         }
         if (this.isExpand) {
-          width = 90
+          width = 50
         }
       }
       if (item.name === '定级') {
         width = 70
-        if (this.$route.query.pageType.search(/read/) > -1) {
-          width = 55
-        }
       }
 
       if (item.name === '原因') {
@@ -402,7 +405,32 @@ export default {
       if (item.name === '影响') {
         width = 100
       }
+      if (item.name.search(/团队/) > -1) {
+        width = 50
+      }
+      if (item.name.search(/问题/) > -1 && ((this.tabsActive.search(/本月重点问题/) > -1 &&
+        this.pageType === 'readAll') ||
+        (this.pageType === 'read' && this.title === '本月重点问题'))) {
+        width = 300
+      }
 
+      if (this.pageType.search(/read/) > -1) {
+        if (item.name.search(/标签|影响/) > -1) {
+          width = 150
+        }
+        if (item.name.search(/定级|天数|类型/) > -1) {
+          width = 35
+        }
+        if (item.name.search(/原因|描述/) > -1) {
+          width = 250
+        }
+        if (item.name.search(/改进项/) > -1) {
+          width = 200
+        }
+        if (item.name.search(/责任人|负责人|模块|团队|是否/) > -1) {
+          width = 40
+        }
+      }
       return `${width}px`
     },
     isFixed(item, index, columns) {

src/views/monthlyReport/childrenPage/editReport/components/PushAndBanck.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-if="subTitle" class="subTitle-wrapper">
-    {{ title }}&nbsp;-&nbsp;
+    <span class="fontWeight">{{ title }}</span>&nbsp;-&nbsp;
     <div v-for="(item, index) in subTitle" :key="index" class="item">
       <div v-if="isShowItem(item.copywriter)">{{ item.copywriter }}
         <div :class="{ red: isShowColor(item.copywriter, item.label) }"><span class="fontWeight">{{ item.label }}</span><span

src/views/monthlyReport/childrenPage/editReport/components/SubTitle.vue

@@ -1,5 +1,5 @@
 <template>
-  <span><span class="query-bug">线下缺陷 - </span>
+  <span><span><span class="fontWeight">线下缺陷</span> - </span>
     <span v-for="(item, index) in reportTextList" :key="index">
       <span class="query-bug" @click.stop="query(item, index)">
         <span v-if="index === 0">新增bug<span class="fontWeight">{{ item.label }}</span>个，</span>

src/views/monthlyReport/childrenPage/editReport/components/TextInfo.vue

@@ -18,7 +18,7 @@ export default {
   },
   methods: {
     setTextAlign(name) {
-      if (name.search(/天数|模块/) > -1) {
+      if (name.search(/天数|模块|项目名称/) > -1) {
         return 'center'
       }
       return 'left'

src/views/monthlyReport/childrenPage/editReport/components/VarText.vue

@@ -15,9 +15,9 @@
         />
         <span
           v-if="pageDate.status > 10 && textValue"
-          style="padding: 10px 0;display: inline-block;"
-          >{{ textValue }}</span
-        >
+          style="padding: 10px 0;display: inline-block;line-height: 1.65;"
+          v-html="textValue.replace(/\n/g, '<br />')"
+          />
       </div>
     </div>
   </div>
@@ -103,6 +103,8 @@ export default {
     .title {
       padding: 9px 0;
       flex: none;
+      font-weight: 600;
+      color: #333;
       width: 50px;
     }
 

src/views/monthlyReport/childrenPage/editReport/components/core.vue

@@ -32,7 +32,8 @@
         :style="{
           color: '#333',
           marginBottom: '10px',
-          fontWeight: fontWeightFont.indexOf(baseData.title) > -1 ? 500 : 400
+          fontSize: baseData.type.search(/Head2/) > -1 ? '15px' : '14px',
+          fontWeight: fontWeightFont.indexOf(baseData.title) > -1 ? 600 : 600
         }"
         v-html="headerIndex"
       />
@@ -52,9 +53,10 @@
         :style="{
           color: '#333',
           marginBottom: '10px',
-          fontWeight: fontWeightFont.indexOf(baseData.title) > -1 ? 500 : 400
+          fontSize: baseData.type.search(/Head2/) > -1 ? '14px' : '14px',
+          fontWeight: baseData.type.search(/Head2/) > -1 ? 600 : 400
         }"
-        v-html="headerTitle"
+        v-html="headerTitle.replace(/(延期|提测打回\/准出不通过|提测打回\/发版撤回|增发) -/g,'<hhtsubtitle>$1</hhtsubtitle> -')"
       />
       <span v-if="baseData.title.search(/延期|发布&回滚/) > -1">。</span>
       <Refresh
@@ -82,7 +84,7 @@
     </div>
     <div v-if="baseData.children && baseData.children.length">
       <div v-if="baseData.children[0].type === 'Tag'">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tabs v-model="activeName" :class="{'isBar':baseData.children.filter(elm => elm.title.search(/服务端|客户端/) < 0).length}" @tab-click="handleClick">
           <el-tab-pane
             v-for="(item, index) in baseData.children"
             :key="item.domKey"
@@ -97,14 +99,25 @@
                   :class="{colorActive: item.domKey === activeName}">{{ item.title === '服务端' ? '&#xe607;' : '&#xe608;'
                   }}</i>
               </span>
-            {{ item.title }}</span>
-            <Core
-              :key="item.domKey"
-              v-loading="loading"
-              style="padding-left: 20px;"
-              :tab-key="baseData.domKey"
-              :dom-index="index"
-              :base-data="item" />
+              <span
+                :style="{
+                  fontSize:item.title.search(/服务端|客户端/) > -1 ? '15px' : '14px',
+                  marginLeft:item.title.search(/服务端|客户端/) > -1 ? '5px':'0',
+                  fontSize:item.title.search(/服务端|客户端/) > -1 ? '600' : '400',
+                }"
+              >{{ item.title }}</span>
+            </span>
+            <span :key="domKey">
+              <Core
+                :key="item.domKey"
+                v-loading="loading"
+                style="padding-left: 20px;"
+                :tab-key="baseData.domKey"
+                :dom-index="index"
+                :base-data="item"
+              />
+            </span>
+
           </el-tab-pane>
         </el-tabs>
       </div>
@@ -164,6 +177,7 @@ export default {
       pullDataAgainTitle: ['上月问题跟进', '线上问题', '线下缺陷', '发布&回滚'],
       activeName: '',
       loading: false,
+      domKey: '123456',
       headerTitle: ''
     }
   },
@@ -200,6 +214,7 @@ export default {
     }
   },
   mounted() {
+    console.log(212)
     if (
       this.baseData &&
       this.baseData.children &&
@@ -207,7 +222,9 @@ export default {
       this.baseData.children[0].type === 'Tag'
     ) {
       // this.$store.commit('monthlyReportEdit/SUB_TABS_ACTIVE', this.baseData.children[0].domKey, this.activeName)
-      this.activeName = this.baseData.children[0].domKey
+      this.$nextTick(() => {
+        this.activeName = this.baseData.children[0].domKey
+      })
     }
     this.setHeader()
     this.pushAndBanckheadle()
@@ -239,6 +256,7 @@ export default {
         this.$store.commit('monthlyReportEdit/INIT_EDIT_KEYS')
       })
       setTimeout(() => {
+        this.domKey = new Date().getTime()
         this.loading = false
       }, 650)
       // const { name } = tab
@@ -341,17 +359,28 @@ export default {
 
 <style scoped lang='less'>
 /*elm-tabs 默认样式处理*/
-/deep/ .el-tabs__active-bar,
 /deep/ .el-tabs__nav-wrap::after {
   display: none;
+  //bottom: 5px;
 }
 
+/deep/ .el-tabs__active-bar {
+  //bottom: 5px;
+}
+.isBar{
+  /deep/ .el-tabs__nav-wrap::after {
+    display: initial;
+  }
+  /deep/ .el-tabs__header {
+    margin-bottom: 20px;
+  }
+}
 /deep/ .el-tabs__header {
-  margin-bottom: 0;
+  //margin-bottom: 15px;
 }
 
 /deep/ .el-tabs__item {
-  padding: 0 10px;
+  //padding: 0 10px;
 }
 
 /deep/ .el-tabs__content {
@@ -374,4 +403,13 @@ export default {
     }
   }
 }
+
+.fontWeight {
+  //color: #333;
+  font-weight: 600;
+}
+
+///deep/.title-left-name{
+//  font-weight: 600;
+//}
 </style>

src/views/monthlyReport/childrenPage/editReport/index.vue

@@ -608,6 +608,7 @@ export default {
 
 /deep/ hhtsubtitle {
   color: #333;
+  font-weight: 600;
 }
 
 /deep/ .view-report {

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

@@ -349,13 +349,13 @@
           </div>
           <el-divider v-if="type !== 'page'" />
           <div
-            v-if="bugDescribeNoHtml.length == 0 && describeEditorVisible == false"
+            v-if="!bug.bugDescribe.trim() && describeEditorVisible == false"
             style="width: 100%;height: 300px;text-align: center;line-height: 300px"
           >
             <span class="bug_describe" @click="describeEditorVisible = true;">点击添加描述</span>
           </div>
           <el-tooltip
-            v-if="bugDescribeNoHtml.length > 0 && describeEditorVisible == false"
+            v-if="bug.bugDescribe.trim() && describeEditorVisible == false"
             effect="dark"
             content="点击编辑"
             placement="top"
@@ -1042,11 +1042,11 @@ export default {
     },
     describeConfirm() {
       this.bug.bugDescribe = this.text_content
-      if (this.text_content) {
-        this.bugDescribeNoHtml = this.text_content
-          .replace(/<[^>]+>/g, '')
-          .replace(/&nbsp;/gi, '')
-      }
+      // if (this.text_content) {
+      //   this.bugDescribeNoHtml = this.text_content
+      //     .replace(/<[^>]+>/g, '')
+      //     .replace(/&nbsp;/gi, '')
+      // }
       this.bugUpdate(this.bug, 'describe').then(res => {
         if (res.code === 200) {
           this.describeEditorVisible = false
@@ -1077,11 +1077,12 @@ export default {
           this.bug.assigner = res.data.assigner.split(',')
           this.bugModel = JSON.parse(JSON.stringify(res.data))
           this.bugDescribe = this.bug.bugDescribe
-          if (this.bugDescribe !== null) {
-            this.bugDescribeNoHtml = this.bugDescribe
-              .replace(/<[^>]+>/g, '')
-              .replace(/&nbsp;/gi, '')
-          }
+          // if (this.bugDescribe !== null) {
+          // this.bugDescribeNoHtml = this.bugDescribe
+          //     .replace(/<[^>]+>/g, '')
+          //     .replace(/&nbsp;/gi, '')
+          // }
+          // console.log(this.bugDescribe)
           this.bugNameForm.bugName = this.bug.bugName
           this.bug.networkType = this.bug.networkType
           this.bug.appVersion = this.bug.appVersion