Merge branch 'xiaotong'

src/views/qa/Notify.vue

@@ -45,7 +45,7 @@
         </el-table-column>
         <el-table-column prop="dingRobot.creator" label="创建人" width="80px"></el-table-column>
         <el-table-column prop="dingRobot.jiraProjectName" label="JIRA项目" width="100px"></el-table-column>
-        <el-table-column prop="dingRobot.createTime" label="创建时间" width="170px"></el-table-column>
+        <el-table-column prop="dingRobot.createTime" label="创建时间" width="175px"></el-table-column>
         <el-table-column label="操作">
           <slot slot-scope="scope">
             <el-button type="primary" size="small" @click="openEditDialog(scope.row)"

src/views/qa/TestDescription.vue

@@ -31,8 +31,17 @@
         <el-table-column label="apollo变更" width="200px">
           <template slot-scope="scope">
             <div v-for="item in JSON.parse(scope.row.apollo)" :key="item.projectName">
-              <b>{{ item.projectName }}</b> ->
-              {{ item.key }}<b> ->{{ item.value }}</b>
+              <div v-if="item.value.length<=200">
+                <b>{{ item.projectName }}</b> ->
+                {{ item.key }}<b> ->{{ item.value}}</b>
+              </div>
+              <div v-else>
+                <b>项目名称:{{ item.projectName }}</b><br>
+                <el-popover placement="top-start" title="value" width="250" trigger="hover" :content="item.value">
+                  <div slot="reference" style="color:#409EFF">{{item.key}}</div>
+                </el-popover>
+              </div>
+
             </div>
           </template>
         </el-table-column>
@@ -43,7 +52,6 @@
                 <div slot="reference" style="color:#409EFF">{{item.db}}</div>
               </el-popover>
             </div>
-
           </template>
         </el-table-column>
         <el-table-column prop="jiraProjectName" label="Jira项目" width="95px"></el-table-column>
@@ -113,63 +121,6 @@
           </el-table>
           <el-button type="primary" size="mini" plain class="el-icon-circle-plus" style="margin-top:10px"
             @click="addServiceAndBranchRow()">添加行</el-button>
-
-          <!-- <el-row>
-            <el-col :span="8">
-              <div style="margin-left:100px">
-                服务
-              </div>
-            </el-col>
-            <el-col :span="8">
-              <div style="margin-left:100px">
-                分支
-              </div>
-            </el-col>
-            <el-col :span="4">
-              <div style="margin-left:50px">
-                开发负责人
-              </div>
-            </el-col>
-            <el-col :span="4">
-              <div style="margin-left:60px">
-                操作
-              </div>
-            </el-col>
-          </el-row> -->
-          <!-- 操作数据 -->
-          <!-- <el-row v-for="(item, index) in serviceAndBranchList" :key="index" :gutter="20">
-            <el-col :span="8">
-              <div>
-                <el-select v-model="item.serviceName" filterable placeholder="请选择服务"
-                  @change="selectServiceModel(item.serviceName)" clearable style="width:320px;margin-top:10px">
-                  <el-option v-for="item2 in serviceList" :key="item2.name" :label="item2.name" :value="item2.name">
-                  </el-option>
-                </el-select>
-              </div>
-            </el-col>
-            <el-col :span="8">
-              <div>
-                <el-select v-model="item.branch" filterable placeholder="请选择分支" clearable
-                  @focus="focusevent(item.serviceName)" style="width:320px;margin-top:10px">
-                  <el-option v-for="item2 in serviceBranchList" :key="item2.name" :label="item2.name"
-                    :value="item2.name"></el-option>
-                </el-select>
-              </div>
-            </el-col>
-            <el-col :span="4">
-              <div>
-                <el-input v-model="item.developer" style="width:180px;margin-top:10px"></el-input>
-              </div>
-            </el-col>
-            <el-col :span="4">
-              <div style="margin-left:20px;margin-top:10px">
-                <el-button size="small" type="danger" icon="el-icon-delete" @click="serviceAndBranchDelete(index)">删除
-                </el-button>
-              </div>
-            </el-col>
-          </el-row>
-          <el-button type="primary" size="mini" plain icon="el-icon-circle-plus-outline"
-            @click="addServiceAndBranchRow()" class="btn-style">添加</el-button> -->
         </el-form-item>
         <!-- apollo变更 -->
         <el-form-item label="apollo变更:">
@@ -354,11 +305,11 @@ export default {
     },
     handleSizeChange(newSize) {
       this.queryModuleInfo.pageSize = newSize
-      this.getProjectList()
+      this.getTestDescriptionList()
     },
     handleCurrentChange(newPage) {
       this.queryModuleInfo.pageNum = newPage
-      this.getProjectList()
+      this.getTestDescriptionList()
     },
     // 获取服务列表
     getServiceList() {