Pārlūkot izejas kodu

Merge branch 'master' of http://121.42.8.157:13000/zengminguo/D-MAP

deepsea 1 gadu atpakaļ
vecāks
revīzija
6e68752c70

+ 3 - 3
src/components/TabList/index.vue

@@ -259,8 +259,8 @@
                 :row-class-name="rowClassName"
                 style="background-color: transparent"
               >
-                <el-table-column label="ID" prop="id"></el-table-column>
-                <el-table-column label="name" prop="name"></el-table-column>
+                <el-table-column label="ID" prop="id" width="60"></el-table-column>
+                <el-table-column label="name" prop="name" width="180"></el-table-column>
                 <el-table-column label="status">
                   <template slot-scope="scope">
                     <div v-if="scope.row.status == 'ready'" style="background: #7BAF66;" class="bench-status">{{ scope.row.status }}</div>
@@ -271,7 +271,7 @@
               </el-table>
             </div>
             <el-button @click="submitAutoCase" class="done-button" :class="autoTaskStatus"
-              >{{autoTaskStatus == 'ready' ? 'Done': (autoTaskStatus == 'waiting' || autoTaskStatus == 'running') ? 'Stop' : 'Done'}}</el-button
+              >{{autoTaskStatus == 'ready' ? 'Start': (autoTaskStatus == 'waiting' || autoTaskStatus == 'running') ? 'Stop' : 'Start'}}</el-button
             >
           </div>
           <div

+ 2 - 2
src/views/ordinaryPage/index.vue

@@ -1227,12 +1227,12 @@ export default {
           </div>`;
     },
     issueRender(item) {
-      return `<div class="item-box" style="display:flex;align-items: center;justify-content: space-between;" onClick="selectRowIssue('${
+      return `<div class="item-box" style="display:flex; align-items: center;justify-content: space-between;" onClick="selectRowIssue('${
         item.uuid || item.id
       }')">
               <div class="left">
                   <div style="display:flex;align-items: center;">
-                    <div class="item-title">${item.ticket_title}</div>
+                    <div class="item-title" style="width: 20vw; white-space: nowrap; overflow:hidden; text-overflow: ellipsis;">${item.ticket_title}</div>
                     <div class="${"status" + item.ticket_status}"></div>
                   </div>
                   <div class="item-tag">