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

src/views/reportManagement/ReleaseReport/components/iconDisplay.vue

@@ -12,10 +12,10 @@
       <el-table-column prop="遗留缺陷" label="遗留缺陷" align="center" min-width="100" />
       <el-table-column prop="缺陷解决率" label="缺陷解决率" align="center" min-width="100" />
     </el-table>
-    <div id="line-echarts" class="line-echarts" />
+    <div :id="'line-echarts' + randomId" class="line-echarts" />
     <div class="Layout_space_between">
-      <div id="lineShow" class="backTop" />
-      <div id="barShow" class="backTop" />
+      <div :id="'lineShow' + randomId" class="backTop" />
+      <div :id="'barShow' + randomId" class="backTop" />
     </div>
     <div class="title">遗留缺陷</div>
     <el-table
@@ -53,6 +53,7 @@ export default {
       bugTableData: [],
       tableData: [],
       types: false,
+      randomId: Math.floor(Math.random() * 6666 + 1),
       taskId: [] // 创建准出的任务
     }
   },
@@ -88,7 +89,7 @@ export default {
         smooth: true
       }))
       setTimeout(() => {
-        echarts.init(document.getElementById('line-echarts')).setOption({
+        echarts.init(document.getElementById('line-echarts' + this.randomId)).setOption({
           color: ['#409EFF'],
           title: { text: '新增缺陷趋势图', x: 'center', textStyle: { fontSize: 14, fontStyle: 'normal', fontWeight: 'normal' }},
           tooltip: { axisPointer: { type: 'shadow' }},
@@ -105,7 +106,7 @@ export default {
         barWidth: '20px'
       }))
       setTimeout(() => {
-        echarts.init(document.getElementById('lineShow')).setOption({
+        echarts.init(document.getElementById('lineShow' + this.randomId)).setOption({
           color: ['#409EFF'],
           title: { text: '缺陷责任人分布', x: 'center', textStyle: { fontSize: 14, fontStyle: 'normal', fontWeight: 'normal' }},
           tooltip: { axisPointer: { type: 'shadow' }},
@@ -121,7 +122,7 @@ export default {
         barWidth: '20px'
       }))
       setTimeout(() => {
-        echarts.init(document.getElementById('barShow')).setOption({
+        echarts.init(document.getElementById('barShow' + this.randomId)).setOption({
           backgroundColor: '#FFF',
           color: ['#409EFF'],
           title: { text: '缺陷等级分布', x: 'center', textStyle: { fontSize: 14, fontStyle: 'normal', fontWeight: 'normal' }},
@@ -152,7 +153,7 @@ export default {
             smooth: true
           }))
           setTimeout(() => {
-            echarts.init(document.getElementById('line-echarts')).setOption({
+            echarts.init(document.getElementById('line-echarts' + this.randomId)).setOption({
               color: ['#409EFF'],
               title: { text: '新增缺陷趋势图', x: 'center', textStyle: { fontSize: 14, fontStyle: 'normal', fontWeight: 'normal' }},
               tooltip: { axisPointer: { type: 'shadow' }},
@@ -172,7 +173,7 @@ export default {
             barWidth: '20px'
           }))
           setTimeout(() => {
-            echarts.init(document.getElementById('lineShow')).setOption({
+            echarts.init(document.getElementById('lineShow' + this.randomId)).setOption({
               color: ['#409EFF'],
               title: { text: '缺陷责任人分布', x: 'center', textStyle: { fontSize: 14, fontStyle: 'normal', fontWeight: 'normal' }},
               tooltip: { axisPointer: { type: 'shadow' }},
@@ -191,7 +192,7 @@ export default {
             barWidth: '20px'
           }))
           setTimeout(() => {
-            echarts.init(document.getElementById('barShow')).setOption({
+            echarts.init(document.getElementById('barShow' + this.randomId)).setOption({
               backgroundColor: '#FFF',
               color: ['#409EFF'],
               title: { text: '缺陷等级分布', x: 'center', textStyle: { fontSize: 14, fontStyle: 'normal', fontWeight: 'normal' }},
@@ -205,7 +206,7 @@ export default {
         }
       } else {
         setTimeout(() => {
-          echarts.init(document.getElementById('line-echarts')).setOption({
+          echarts.init(document.getElementById('line-echarts' + this.randomId)).setOption({
             color: ['#409EFF'],
             title: { text: '新增缺陷趋势图', x: 'center', textStyle: { fontSize: 14, fontStyle: 'normal', fontWeight: 'normal' }},
             tooltip: { axisPointer: { type: 'shadow' }},
@@ -214,7 +215,7 @@ export default {
             yAxis: [{ type: 'value', axisLine: { show: false }, axisTick: { show: false }, splitLine: { show: true, lineStyle: { type: 'dashed' }}}],
             series: [{ name: '直接访问', type: 'line', smooth: true, data: [0] }]
           })
-          echarts.init(document.getElementById('lineShow')).setOption({
+          echarts.init(document.getElementById('lineShow' + this.randomId)).setOption({
             color: ['#409EFF'],
             title: { text: '缺陷责任人分布', x: 'center', textStyle: { fontSize: 14, fontStyle: 'normal', fontWeight: 'normal' }},
             tooltip: { axisPointer: { type: 'shadow' }},
@@ -223,7 +224,7 @@ export default {
             yAxis: [{ type: 'value', axisLine: { show: false }, axisTick: { show: false }, splitLine: { show: true, lineStyle: { type: 'dashed' }}}],
             series: [{ name: '无数据', type: 'bar', barWidth: '20px', data: [0] }]
           })
-          echarts.init(document.getElementById('barShow')).setOption({
+          echarts.init(document.getElementById('barShow' + this.randomId)).setOption({
             backgroundColor: '#FFF',
             color: ['#409EFF'],
             title: { text: '缺陷等级分布', x: 'center', textStyle: { fontSize: 14, fontStyle: 'normal', fontWeight: 'normal' }},

src/views/reportManagement/ReleaseReport/components/releaseDetails.vue

@@ -116,16 +116,20 @@
             </div>
             <div class="Layout_flex_start task-bot">
               <div class="title-name">收件人 :</div>
-              <div v-for="(item, index) in details.sendToObject" :key="index" class="task-name">
-                {{ item.name }}
-                <span v-if="index < details.sendToObject.length - 1">,</span>
+              <div class="flex_start">
+                <div v-for="(item, index) in details.sendToObject" :key="index" class="task-name">
+                  {{ item.name }}
+                  <span v-if="index < details.sendToObject.length - 1">,</span>
+                </div>
               </div>
             </div>
             <div class="Layout_flex_start task-bot">
               <div class="title-name">抄送人 :</div>
-              <div v-for="(item, index) in details.sendCcObject" :key="index" class="task-name">
-                {{ item.name }}
-                <span v-if="index < details.sendCcObject.length - 1">,</span>
+              <div class="flex_start">
+                <div v-for="(item, index) in details.sendCcObject" :key="index" class="task-name">
+                  {{ item.name }}
+                  <span v-if="index < details.sendCcObject.length - 1">,</span>
+                </div>
               </div>
             </div>
           </el-header>
@@ -233,6 +237,12 @@ export default {
 </script>
 
 <style lang='scss' scoped>
+.flex_start { // 布局
+  display:flex;
+  align-items: center;
+  justify-content: flex-start;
+  flex-wrap: wrap;
+}
 .BackgroundCloth {
   .report-Header {
     margin: 10px 10px 0;

src/views/reportManagement/daily/components/iconDisplay.vue

@@ -48,7 +48,7 @@ export default {
       taskid_arr: [],
       DataByPri: '',
       PriData: '',
-      randomId: Math.floor(Math.random() * 10)
+      randomId: Math.floor(Math.random() * 6666 + 1)
     }
   },
   watch: {