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

src/views/env/index.vue

@@ -5,6 +5,7 @@
 </template>
 
 <script>
+import { host } from '@/apiConfig/requestIP.js'
 export default {
   name: 'ENV',
   data() {
@@ -15,7 +16,7 @@ export default {
   },
   computed: {
     envUrl() {
-      return 'http://10.179.181.222:8866/' + this.$route.name
+      return host + '/env/#/' + this.$route.name
     }
   },
   mounted() {

src/views/projectManage/projectList/projectViewDetails.vue

@@ -1345,6 +1345,7 @@ export default {
   word-break: break-all;
   white-space:pre-line;
   overflow-y: auto;
+  font-family: MicrosoftYaHei !important;
 }
 .details .el-input__count{
   display: none;

src/views/projectManage/taskList/versionsCalendar.vue

@@ -29,11 +29,7 @@
         </full-calendar>
       </el-main>
 
-      <el-dialog :visible.sync="dialogFormVisible" width="1180px">
-        <div style="display:flex;align-items: center;margin-bottom:20px;margin-left: 56px;">
-          <div style="width:4px;height:17px;background:#409EFF;border-radius:1px;" />
-          <div style="width:83px;height:20px;font-size:18px;font-family:MicrosoftYaHei;color:rgba(51,59,74,1);margin-left:6px">版本管理</div>
-        </div>
+      <el-dialog :visible.sync="dialogFormVisible" width="1180px" class="bgborderNow">
         <el-dialog width="35%" :visible.sync="dialogCraeteVisible" append-to-body>
           <div style="display:flex;align-items: center;margin: 0px 0px 34px 29px;">
             <div style="width:4px;height:17px;background:#409EFF;border-radius:1px;" />
@@ -104,18 +100,20 @@
           </div>
           <div style="margin-top:4%" />
         </el-dialog>
-
-        <div style="display:flex;margin-top:3%">
-          <div style="margin-left:5%">
-            <template>
-              <div slot="footer" class="dialog-footer">
-                <el-button type="primary" style="margin-left:76%" @click="handleVersionadd()">添加版本</el-button>
+        <div style="padding:0 51px" class="force-button">
+          <div style="display:flex;align-items: center;margin-bottom:15px;">
+            <div style="width:4px;height:17px;background:#409EFF;border-radius:1px;" />
+            <div style="width:83px;height:20px;font-size:18px;font-family:MicrosoftYaHei;color:rgba(51,59,74,1);margin-left:6px">版本管理</div>
+          </div>
+          <div style="display:flex;justify-content: space-between;">
+            <div style="width:35%">
+              <div style="display: flex;justify-content: flex-end;">
+                <el-button style="margin-bottom: 15px;" type="primary" size="mini" @click="handleVersionadd()">添加版本</el-button>
               </div>
-              <el-table :data="tableData" fit highlight-current-row style="width: 100%;margin-top:3%" border :header-cell-style="{background:'#F0F2F4',color:'#606266'}" @row-click="cellBack">
-                <el-table-column prop="version" label="版本号" width="220%" align="center"><template slot-scope="scope"><span>{{ scope.row.version }}</span></template></el-table-column>
+              <el-table border :data="tableData" show-overflow-tooltip="true" highlight-current-row fit style="width: 100%;" :header-cell-style="{ background:'#F0F2F4',color:'#606266' }" @row-click="cellBack">
+                <el-table-column prop="version" label="版本号" align="center"><template slot-scope="scope"><span>{{ scope.row.version }}</span></template></el-table-column>
                 <el-table-column
                   label="操作"
-                  width="200%"
                   align="center"
                 >
                   <template slot-scope="row">
@@ -124,45 +122,43 @@
                 </el-table-column>
               </el-table>
               <el-pagination
+                style="margin-left:-10px;padding-top: 20px;"
                 background
                 :page-size="pageSize"
                 layout="prev, pager, next"
                 :total="total"
                 @current-change="handleCurrentChange"
               />
-            </template>
-          </div>
-          <div style="margin-top:8%;margin-left:8%">   <el-button type="primary" icon="el-icon-arrow-right" circle /></div>
-          <div style="margin-left:7%">
-            <template>
-              <div slot="footer" class="dialog-footer">
-                <div style="display:flex">
-                  <div style="font-size:17px;margin-top:4%">
-                    版本 : {{ versionNum === '' ? "-" :versionNum }}
-                  </div>
-                  <div>
-                    <el-button :disabled="!versionNum" type="primary" style="margin-left:220%" @click="handleAddEvent()">添加事件</el-button>
-                  </div>
+            </div>
+            <div style="width:5%;text-align:center;padding-top:10%">
+              <el-button type="primary" icon="el-icon-arrow-right" circle />
+            </div>
+            <div style="width:47%">
+              <div style="display:flex;align-items: center;justify-content: space-between;margin-bottom:15px">
+                <div style="font-size:17px;">
+                  版本 : {{ versionNum === '' ? "-" :versionNum }}
+                </div>
+                <div>
+                  <el-button :disabled="!versionNum" type="primary" size="mini" @click="handleAddEvent()">添加事件</el-button>
                 </div>
               </div>
-              <el-table :data="tableData1" fit highlight-current-row style="width: 100%;margin-top:3%" border :header-cell-style="{background:'#F0F2F4',color:'#606266'}">
+              <el-table border :data="tableData1" highlight-current-row style="width: 100%;" :header-cell-style="{ background:'#F0F2F4',color:'#606266'}">
                 <el-table-column
                   prop="name"
+                  width="80"
                   label="事件"
-                  width="100%"
                   align="center"
                 />
                 <el-table-column
                   prop="time"
                   label="时间"
-                  width="180%"
                   align="center"
                 >
-                  <!-- <template slot-scope="scope"><span>{{ scope.row.time }}</span></template> -->
+                <!-- <template slot-scope="scope"><span>{{ scope.row.time }}</span></template> -->
                 </el-table-column>
                 <el-table-column
                   label="操作"
-                  width="120%"
+                  width="100"
                   align="center"
                 >
                   <template slot-scope="row">
@@ -170,16 +166,12 @@
                   </template>
                 </el-table-column>
               </el-table>
-
-              <div style="margin-top:20%;margin-left:50%" />
-
-            </template>
+            </div>
+          </div>
+          <div style="display: flex;justify-content: flex-end;">
+            <el-button type="info" plain size="mini" @click="getVersionList(),dialogFormVisible=false">关闭</el-button>
           </div>
         </div>
-        <el-row style="margin-top:1%;margin-left:90%">
-          <el-button @click="getVersionList(),dialogFormVisible=false">关闭</el-button>
-          <!-- <el-button type="primary">确定</el-button> -->
-        </el-row>
       </el-dialog>
     </el-container>
   </div>
@@ -437,7 +429,6 @@ export default {
       this.$set(this.addVersionData, 'version', '')
       this.addBizData = {}
     },
-
     // 添加版本
     addVersion(ele) {
       this.$refs.addVersionForms.validate((valid) => {
@@ -581,6 +572,23 @@ export default {
 
   .bgborder { background-color: #FFFFFF; border-radius: 8px;}
 
+  .bgborderNow .el-table .el-table__body tr:hover td { color: #409EFF; background: #EDF6FF;} /*hover时字体, 背景颜色*/
+
+  .bgborderNow  .el-table .cell {
+    /* padding: 5px 0; */
+    font-size: 14px;
+    font-family: MicrosoftYaHei;
+  }
+
+  .bgborderNow .el-table__body tr.current-row>td {
+    color: #409EFF;
+  }
+
+  .force-button .el-button--info.is-plain:hover {
+    background: #3f9eff !important;
+    border-color: #3f9eff !important;
+  }
+
   .bgborder .el-input__inner { border: none; padding: 0px 50px 0px 0px;}
 
   .bgborder .event-item { height:25px !important;line-height: 25px !important; }
@@ -600,15 +608,15 @@ export default {
     color: #333333;
   }
   .drop_down {
-     font-size: 13px;
+     font-size: 14px;
      color: #333333;
      /* white-space: nowrap; */
   }
   .events-day {
-    cursor: pointer;
-    flex: 1;
-    min-height: 97px !important;
-    overflow: hidden;
-    text-overflow: ellipsis;
+    /* cursor: pointer;
+    flex: 1; */
+    min-height: 100px !important;
+    /* overflow: hidden;
+    text-overflow: ellipsis; */
 }
 </style>