Merge branch 'qinzhipeng' into http_mock

src/views/home/index.vue

@@ -100,28 +100,12 @@
         <div class="div-module-introduction" />
       </el-card>
     </div>
-    <div style="height: 180pt;width 100%;background-color: rgb(15,60,218);">
-      <div class="div-footer1" style="margin-top: 45pt;margin-left: 165pt;">
-        <div>质惠综合测试平台</div>
-        <span style="margin-top: 18pt">普惠质量技术部 效率工具FT</span>
-        <br>
-        <span>© 2019. All Rights Reserved</span>
-      </div>
-      <div class="div-footer2" style="width: 510px;margin-top: 45pt;margin-left: 550pt;">
-        <div style="visibility: hidden;">质惠综合测试平台</div>
-        <span style="margin-top: 18pt">Mock服务-赵福贵</span>
-        <span>数据中心-王丽莎</span>
-        <span>FT负责人-叶宏钢</span>
-        <br>
-        <span>虚拟硬件-魏洁文</span>
-        <span>环境平台-李嘉嘉/刘青</span>
-        <span>产品设计-朱晓菲</span>
-        <br>
-        <span>自动化-陈雅琪</span>
-        <span>流程管控-郑美双/罗舒宁</span>
-        <span>UI设计师-汝瑞</span>
-        <br>
-      </div>
+    <div style="font-size: 12px; color: #FFF; height: 240px;width 100%;background-image: linear-gradient(to bottom right,#3e99fd,#1040db); text-align: center;">
+      <div style="font-size: 20px; padding: 30px 0 10px; font-weight: 600;">质惠综合测试平台</div>
+      <div style="padding: 0px 0 40px;">普惠质量技术部 效率工具FT</div>
+      <div>流程管控-郑美双&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;Mock服务-赵福贵&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;环境平台-李嘉嘉/刘青&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;虚拟硬件-魏洁文&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;数据中心-王丽莎&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;自动化-陈雅琪/程如意</div>
+      <div style="padding: 20px 0 40px;">产品设计-朱晓菲&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;UI设计-余霖&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;前端-秦志鹏/王子乾&nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;FT负责人-叶宏钢/廖子君</div>
+      <div style="font-size: 10px;">© 2019. All Rights Reserved</div>
     </div>
     <float-menu class="float-menu-home" />
   </div>
@@ -159,28 +143,6 @@ img.img-arrow {
   top: 95%;
   left: 48.95%;
 }
-div.div-footer1,
-div.div-footer2 {
-  position: absolute;
-  font-weight: bold;
-  color: #ffffff;
-  font-size: 13.5pt;
-}
-div.div-footer1 > span {
-  margin-bottom: 10px;
-  display: inline-block;
-  font-size: 10.5pt;
-  font-weight: normal;
-  color: #ffffff;
-}
-div.div-footer2 > span {
-  margin-bottom: 10px;
-  display: inline-block;
-  width: 30%;
-  font-size: 10.5pt;
-  font-weight: normal;
-  color: #ffffff;
-}
 .el-menu {
   border: none;
   height: 68px;

src/views/projectManage/bugList/bugindex.vue

@@ -1218,21 +1218,22 @@ export default {
   padding-left: 10px;
   width: 73px;
 }
-.btns .el-input__suffix {
-    // display: none;
-    visibility: hidden;
-}
-.btns :hover {
- /deep/ .el-input__suffix {
-    // display: inline-block;
-    visibility: inherit;
-  }
-}
+// .btns .el-input__suffix {
+//     // display: none;
+//     visibility: hidden;
+// }
+// .btns :hover {
+//  /deep/ .el-input__suffix {
+//     // display: inline-block;
+//     visibility: inherit;
+//   }
+// }
 .item{
   /deep/ input {
     color: rgb(126, 211, 33);
     border: 1px solid rgb(126, 211, 33);
      border-color: rgb(126, 211, 33) !important;
+         font-weight: 900;
   }
   /deep/ .el-input__suffix {
     color: rgb(126, 211, 33) !important;
@@ -1247,6 +1248,7 @@ export default {
     color: rgb(255, 204, 102);
      border: 1px solid rgb(255, 204, 102);
      border-color: rgb(255, 204, 102) !important;
+         font-weight: 900;
   }
   /deep/ .el-input__suffix {
     color: rgb(255, 204, 102) !important;
@@ -1261,6 +1263,7 @@ export default {
     color: rgb(245, 108, 108);
     border: 1px solid rgb(245, 108, 108);
     border-color: rgb(245, 108, 108) !important;
+        font-weight: 900;
   }
    /deep/ .el-input__suffix {
     color: rgb(245, 108, 108) !important;
@@ -1275,6 +1278,7 @@ export default {
     color: #D675F0;
     border: 1px solid #D675F0;
     border-color: #D675F0 !important;
+        font-weight: 900;
   }
     /deep/ .el-input__suffix {
     color: #D675F0 !important;
@@ -1289,6 +1293,7 @@ export default {
     color: rgb(106, 180, 255);
     border: 1px solid rgb(106, 180, 255);
     border-color: rgb(106, 180, 255) !important;
+        font-weight: 900;
   }
     /deep/ .el-input__suffix {
     color: rgb(106, 180, 255) !important;

src/views/projectManage/bugList/details/index.vue

@@ -8,6 +8,13 @@
         v-model="map.bugEnumList[bug.status]"
         :options="enums.bugEnumList"
         :size="'small'"
+        :class="{
+          'item-color' : map.bugEnumList[bug.status] === '待修复' || '修复中',
+          'item' : map.bugEnumList[bug.status] === '已完成',
+          'item1' : map.bugEnumList[bug.status] === '待测试',
+          'item2' : map.bugEnumList[bug.status] === 'Reopen',
+          'item3' : map.bugEnumList[bug.status] === 'Hold'
+        }"
         style="margin-left: 20px"
         class="button_status"
         @command="openStatsDialog"
@@ -16,14 +23,6 @@
         <span class="newBtn" @click="getToDetails()"><i class="el-icon-document" /> 查看详情</span>
         <span class="newBtn" style="padding: 0 10px" @click="openQueryDialog()"><i class="el-icon-document-copy" /> 复制</span>
         <span class="newBtn" style="padding-right: 10px;" @click="openDeleteDialog()"><i class="el-icon-delete" /> 删除</span>
-        <!-- <el-dropdown placement="bottom">
-          <el-button size="small" plain class="button_delete" style="padding:5px"> ··· </el-button>
-          <el-dropdown-menu slot="dropdown" style="text-align: center;">
-            <el-dropdown-item @click.native="openQueryDialog()">复制 </el-dropdown-item>
-            <el-dropdown-item @click.native="getToDetails()">查看详情 </el-dropdown-item>
-            <el-dropdown-item @click.native="openDeleteDialog()">删除 </el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown> -->
         <div style="display: inline-block;margin-left: 10px;margin-right: 15px;" @mouseover="iconName = 'float_反馈_icon_close_蓝色'" @mouseleave="iconName = 'float_反馈_icon_close'" @mousedown="closeDrawer();">
           <el-button size="medium" type="text" style="margin-top:-5px;">
             <svg-icon :icon-class="iconName" />
@@ -1810,3 +1809,45 @@ border-color: #DCDFE6;
   white-space: nowrap;
 }
 </style>
+<style lang="scss">
+.item-color {
+  /deep/ .el-button {
+    color: rgb(106, 180, 255);
+    border: 1px solid rgb(106, 180, 255);
+    border-color: rgb(106, 180, 255) !important;
+    background: #FFF;
+  }
+}
+.item{
+  /deep/ .el-button {
+    color: rgb(126, 211, 33);
+    border: 1px solid rgb(126, 211, 33);
+     border-color: rgb(126, 211, 33) !important;
+    background: #FFF;
+  }
+}
+.item1 {
+  /deep/ .el-button {
+    color: rgb(255, 204, 102);
+     border: 1px solid rgb(255, 204, 102);
+     border-color: rgb(255, 204, 102) !important;
+    background: #FFF;
+  }
+}
+.item2 {
+  /deep/ .el-button {
+    color: rgb(245, 108, 108);
+    border: 1px solid rgb(245, 108, 108);
+    border-color: rgb(245, 108, 108) !important;
+    background: #FFF;
+  }
+}
+.item3 {
+  /deep/ .el-button {
+    color: #D675F0;
+    border: 1px solid #D675F0;
+    border-color: #D675F0 !important;
+    background: #FFF;
+  }
+}
+</style>