reedliuqing_i 5 роки тому
батько
коміт
2f5f1ecb65

+ 4 - 0
src/views/projectManage/bugList/bugindex.vue

@@ -344,6 +344,9 @@
       <el-main :style="type === 'page'?{padding: '1%'}:{padding: '0'}">
         <el-row class="headerBg table_v" style=" padding-top: 0px;">
           <el-col :span="24" style="min-height: 47vh;">
+            <div v-if="type !== 'page'" style="position: relative;top: 5px;right: 10px">
+              <el-divider />
+            </div>
             <el-table
               size="small"
               :data="tableData"
@@ -746,3 +749,4 @@ export default {
   }
 }
 </script>
+

+ 59 - 60
src/views/projectManage/version/list/index.vue

@@ -1,38 +1,55 @@
 <template>
-  <el-container>
+  <el-container class="version_list">
     <div style="width:100%;height:100%;padding-top:1px;background-color: #F2F3F6;">
-      <div class="layout_header">
-        <div style="font-size: 14px;color: #333333;padding-left:20px">
-          <el-dropdown placement="bottom" @command="handleCommand">
-            <span class="el-dropdown-link">
-              {{ getTitle(searchTitle.client) }}
-              <i class="el-icon-arrow-down el-icon--right" />
-            </span>
-            <el-dropdown-menu slot="dropdown" class="version_el-dropdown-menu">
-              <el-dropdown-item
-                v-for="(item,index) in searchInfo.clients"
-                :key="index"
-                :command="{value: item,flag: 1}"
-              >{{ item.msg }}</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
+      <el-main class="layout_header" style="padding: 1% 2%">
+        <div>
+          <span style="font-size: 22px;letter-spacing: 1px;font-weight: 600;color: #333B4A;">版本</span>
         </div>
-        <div style="font-size: 14px;color: #333333;padding-left:50px">
-          <el-dropdown placement="bottom" @command="handleCommand">
-            <span class="el-dropdown-link">
-              {{ getTitle(searchTitle.version) }}
-              <i class="el-icon-arrow-down el-icon--right" />
-            </span>
-            <el-dropdown-menu slot="dropdown" class="version_el-dropdown-menu">
-              <el-dropdown-item
-                v-for="(item,index) in searchInfo.versions"
-                :key="index"
-                :command="{value: item,flag: 2}"
-              >{{ item.msg }}</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
+        <div style="position: relative;right: 1%">
+          <el-divider />
         </div>
-      </div>
+        <el-row>
+          <el-col :span="20">
+            <span class="queryName">客户端</span>
+            <el-select
+              v-model="searchForm.clientType"
+              size="small"
+              style="padding-left: 2px;"
+              clearable
+              filterable
+              placeholder="请选择"
+              @change="getVersionHomePageList()"
+            >
+              <el-option
+                v-for="item in searchInfo.clients"
+                :key="item.code"
+                :label="item.msg"
+                :value="item.code"
+              />
+            </el-select>
+            <span class="queryName" style="margin-left: 4%">版本</span>
+            <el-select
+              v-model="searchForm.versionType"
+              size="small"
+              style="padding-left: 2px;"
+              clearable
+              filterable
+              placeholder="请选择"
+              @change="getVersionHomePageList()"
+            >
+              <el-option
+                v-for="item in searchInfo.versions"
+                :key="item.code"
+                :label="item.msg"
+                :value="item.code"
+              />
+            </el-select>
+          </el-col>
+          <el-col :span="4">
+            <div style="font-size: 14px;color: #00A0FF;cursor: pointer;line-height: 32px;text-align: right">版本详情</div>
+          </el-col>
+        </el-row>
+      </el-main>
       <div class="layout_main version_list_layout_main">
         <div style="display:flex;align-items: center;padding:20px">
           <div style="width:4px;height:17px;background:#409EFF;border-radius:1px;" />
@@ -301,29 +318,6 @@ export default {
         return str.substring(0, 6) + '...'
       }
     },
-    handleCommand(command) {
-      switch (command.flag) {
-        case 1:
-          this.searchTitle.client = command.value.msg
-          this.searchInfo.versions = command.value.childEnumInfos
-          if (command.value.code !== this.searchForm.clientType) {
-            if (this.searchInfo.versions && this.searchInfo.versions.length > 0) {
-              this.searchForm.versionType = this.searchInfo.versions[0].code
-              this.searchTitle.version = this.searchInfo.versions[0].msg
-            } else {
-              this.searchForm.versionType = null
-              this.searchTitle.version = '无版本'
-            }
-          }
-          this.searchForm.clientType = command.value.code
-          break
-        case 2:
-          this.searchForm.versionType = command.value.code
-          this.searchTitle.version = command.value.msg
-          break
-      }
-      this.getVersionHomePageList()
-    },
     getToRequirementDetails(id) {
       this.$router.push({ name: '需求详情', params: { id: id + '' }})
     },
@@ -448,6 +442,12 @@ export default {
 </script>
 
 <style scoped>
+.queryName {
+  display: inline-block;
+  width: 80px;
+  color: #333333;
+  font-size: 14px;
+}
 .el-dropdown-link {
   cursor: pointer;
   color: #333333;
@@ -461,11 +461,8 @@ export default {
   padding: 0 5px 2% 0
 }
 .layout_header {
-  height: 60px;
   width: 98%;
   margin: 1% auto;
-  display: flex;
-  align-items: center;
 }
 .layout_main {
   width: 98%;
@@ -493,9 +490,11 @@ export default {
 </style>
 
 <style>
-.el-dropdown-menu__item:not(.is-disabled):hover {
-  background-color: #f6f7fa;
-  color: #606266;
+.version_list .el-divider--horizontal {
+    display: block;
+    height: 1px;
+    width: 100%;
+    margin: 10px;
 }
 .version_list_layout_main .el-table__body tr:hover td {
   color: #409eff;

+ 1 - 7
src/views/workbench/person/index.vue

@@ -59,7 +59,7 @@
     <el-main class="layout_main" style="margin-top: 10px">
       <el-tabs v-model="activeName">
         <el-tab-pane label="缺陷" name="first">
-          <div style="margin: 10px 0 20px 0">
+          <div style="margin: 10px 0 10px 0">
             <div :class="myHandleTab" style="display: inline-block;font-size: 14px" @click="myHandleTab = 'bug_tab_select';myCreateTab = 'my_create';selectBugList(2)">待我处理</div>
             <div :class="myCreateTab" style="display: inline-block;font-size: 14px;margin-left: 20px" @click="myHandleTab = 'my_handle';myCreateTab = 'bug_tab_select';selectBugList(1)">我提报的</div>
           </div>
@@ -581,9 +581,6 @@ button:hover {
 </style>
 
 <style>
-.workbench_penson .el-tabs .el-tabs__nav-wrap::after {
-  background-color: transparent;
-}
 .workbench_penson button {
   outline: none !important;
   outline-color: transparent;
@@ -612,9 +609,6 @@ button:hover {
 .workbench_fullscreen_dialog .el-tabs .el-tabs__nav-scroll {
   padding: 0 44%;
 }
-.workbench_fullscreen_dialog .el-tabs .el-tabs__nav-wrap::after {
-  background-color: transparent;
-}
 </style>
 
 // 布局

+ 1 - 1
src/views/workbench/person/myFullCalendar.vue

@@ -104,7 +104,7 @@ export default {
   data() {
     return {
       today: new Date(),
-      monthClassName: 'month',
+      monthClassName: 'month selected',
       weekClassName: 'week',
       dayClassName: 'day',
       todayClassName: 'today',

+ 1 - 1
src/views/workbench/team/index.vue

@@ -379,8 +379,8 @@ export default {
             }
           }
           this.tasks.push(item)
-          this.ganttShow = true
         }
+        this.ganttShow = true
       }
     }
   }