qinzhipeng_v@didiglobal.com 4 jaren geleden
bovenliggende
commit
43f8a52c7f

+ 11 - 6
src/views/projectManage/requirement/components/BasicsCode.vue

@@ -111,13 +111,8 @@
           </template>
         </over-click>
       </el-form-item>
-      <!-- <el-form-item label="是否跟版:">
-        <el-select v-model="form_query.dependOnRelease" size="small" filterable placeholder="请选择" @change="changeArea">
-          <el-option v-for="(item,index) in dependList" :key="item.msg + index" :label="item.msg" :value="item.code" />
-        </el-select>
-      </el-form-item> -->
       <el-form-item label="跟版客户端:">
-        <over-click id="referredClientType-select" style="line-height: normal; padding: 10px 0;" @overMouse="changeArea">
+        <over-click id="referredClientType-select" style="line-height: normal; padding: 10px 0;" @overMouse="changeArea" @click="setName">
           <template slot="active">
             <el-select v-model="form_query.referredClientType" size="small" multiple filterable placeholder="请选择" @change="ReferredClientType(form_query.referredClientType)">
               <el-option v-for="(item,index) in appClient" :key="item.msg + index" :label="item.msg" :value="item.code" :disabled="item.dis" @click.native="setReferredClientType(item)" />
@@ -317,6 +312,16 @@ export default {
         this.appClient.map(item => { item.dis = false })
       }
     },
+    setName() {
+      if (this.form_query.referredClientTypeName === '不跟版') {
+        this.form_query.referredClientType = [-1]
+        this.appClient.map(item => {
+          if (item.code !== -1) {
+            item.dis = true
+          }
+        })
+      }
+    },
     setReferredClientType(val) {
       if (val.dis === true) {
         return false

+ 0 - 10
src/views/reportManagement/daily/components/iconDisplay.vue

@@ -72,16 +72,6 @@ export default {
       immediate: true
     }
   },
-  //  mounted() {
-  // const myChart = echarts.init(document.getElementById('lineShow'))
-  // const myChartA = echarts.init(document.getElementById('barShow'))
-  // window.addEventListener('resize', () => {
-  //   if (myChart) {
-  //     myChart.resize()
-  //     myChartA.resize()
-  //   }
-  // })
-  // },
   methods: {
     click_bugName(id) { // 缺陷跳转
       this.$router.push({ name: '缺陷详情', params: { id: Number(id.replace('BUG-', '')) }})

+ 17 - 21
src/views/reportManagement/daily/components/testPresenyL.vue

@@ -1,24 +1,22 @@
 <template>
   <!-- 老日报预览 -->
-  <div>
-    <el-form :model="fromCreat" class="from-creat reportContent">
-      <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
-        <span style="flex:1;font-weight: bold;font-size: 20px;color: #3a8ee6">{{ fromCreat.reportName }}</span>
-        <span style="flex:2;margin: 0.5% 0 0 20px;font-size: 17px;">by {{ fromCreat.ownner }}</span>
+  <el-form :model="fromCreat" class="from-creat reportContent">
+    <div style="display: flex; white-space: nowrap; font-family:SimSuncss">
+      <span style="flex:1;font-weight: bold;font-size: 20px;color: #3a8ee6">{{ fromCreat.reportName }}</span>
+      <span style="flex:2;margin: 0.5% 0 0 20px;font-size: 17px;">by {{ fromCreat.ownner }}</span>
+    </div>
+    <div style="font-size:15px;color:#606266;line-height: 25px;" class="rich" v-html="projectProgress" />
+    <div class="titleStyle" style="margin-top: 10px;">三. bug情况</div>
+    <div style="border: 1px,solid #ccc;font-size:14px;color:#606266;padding-bottom: 20px;">
+      <div style="margin: 1%;">1、bug统计</div>
+      <div :class="{'space-between' : xaxisTotal < 8} ">
+        <div id="lineShow" :class="{'backTop' : xaxisTotal < 8,'backLeft' : xaxisTotal > 7}" />
+        <div id="barShow" :class="{'backTop' : xaxisTotal < 8, 'backLeft' : xaxisTotal > 7}" />
       </div>
-      <div style="font-size:15px;color:#606266;line-height: 25px;" class="rich" v-html="projectProgress" />
-      <div class="titleStyle" style="margin-top: 10px;">三. bug情况</div>
-      <div style="border: 1px,solid #ccc;font-size:14px;color:#606266;padding-bottom: 20px;">
-        <div style="margin: 1%;">1、bug统计</div>
-        <div :class="{'space-between' : xaxisTotal < 8} ">
-          <div id="lineShow" :class="{'backTop' : xaxisTotal < 8,'backLeft' : xaxisTotal > 7}" />
-          <div id="barShow" :class="{'backTop' : xaxisTotal < 8, 'backLeft' : xaxisTotal > 7}" />
-        </div>
-        <div style="margin: 1%;">2、bug说明:</div>
-        <div class="pre-line">{{ bugshow }}</div>
-      </div>
-    </el-form>
-  </div>
+      <div style="margin: 1%;">2、bug说明:</div>
+      <div class="pre-line">{{ bugshow }}</div>
+    </div>
+  </el-form>
 </template>
 
 <script>
@@ -38,9 +36,7 @@ export default {
       userInformation: localStorage.getItem('username'),
       userNames: localStorage.getItem('realname'),
       bugshow: '',
-      postData: {},
       fromCreat: {},
-      TestProgress: '',
       projectProgress: '',
       dateList: [],
       numList: [],
@@ -158,7 +154,7 @@ export default {
     white-space: pre-line;
     padding-left: 10px;
   }
-    .rich>>> table tr td{border:1px solid #ccc;font-size: 15px; color: #606266}
+  .rich>>> table tr td{border:1px solid #ccc;font-size: 15px; color: #606266}
   .rich>>> table th{border:1px solid #ccc; font-size: 15px; background: #F0F7FF; color: #606266}
   .rich>>> table {border:1px solid #ccc; border-collapse: collapse;line-height: 30px; text-align: center;font-size: 15px; color: #606266}
 </style>