ui

src/components/chartView/index.vue

@@ -97,7 +97,8 @@ export default {
 .op-chart {
   height: 370px;
   .chartViewHeight {
-    height: 324px;
+    height: 292px;
+    padding-left: 15px;
   }
   .mt15 {
     margin-top: 15px;
@@ -109,7 +110,7 @@ export default {
     font-weight: 700;
   }
   .chartSearchbar {
-    padding: 0 5%;
+    padding-left: 15px;
     .label {
       font-size: 14px;
       color: #444;

src/components/newLayout/Head.vue

@@ -74,32 +74,16 @@
               </span>
             </div>
             <div class="item">
-              <div class="label">
+              <div class="label fontSize14">
                 {{ userInfo.name }} {{ userInfo.idap }}
               </div>
               <div class="label">
-                <span class="outLogin">
-                  <!-- <svg-icon icon-class="admin" class="icon mr10" /> -->
+                <span class="outLogin" @click="layout()">
                   <i class="el-icon-switch-button icon" style="margin-right:4px" />
                   <span class="label">退出</span>
                 </span>
-                <!-- <el-button type="primary" plain size="small" @click="layout()">退出登录</el-button> -->
               </div>
             </div>
-            <!-- <div class="user-name">{{ userInfo.name }}</div>
-            <div class="line" />
-            <div class="user-logout">
-              <el-button v-if="navTagType === 1" type="primary" plain size="small" @click="setNavTagType(2)">顶部导航</el-button>
-              <el-button v-if="navTagType === 2" type="primary" plain size="small" @click="setNavTagType(1)">侧边导航</el-button>
-            </div>
-            <div class="line" />
-            <div v-if="memberCheck" class="user-logout">
-              <el-button type="primary" plain size="small" @click="administratorsJump()"> 管 理 员 </el-button>
-            </div>
-            <div v-if="memberCheck" class="line" />
-            <div class="user-logout">
-              <el-button type="primary" plain size="small" @click="layout()">退出登录</el-button>
-            </div> -->
           </div>
         </template>
         <img :src="userInfo.phoneUrl">

src/utils/options.js

@@ -8,10 +8,10 @@ export function getBarOption(xAxis, data) {
       }
     },
     'grid': {
-      'left': '5%',
-      'right': '5%',
+      'left': '0',
+      'right': '0',
       'top': '10%',
-      'bottom': data && data.length > 50 ? '20%' : '10%',
+      'bottom': data && data.length > 50 ? '70px' : '0',
       'containLabel': true
     },
     'dataZoom': [

src/views/projectManage/bugList/css/index.css

@@ -60,13 +60,14 @@
  }
 
 .table_v .div_priority {
+  display: inline-block;
+  width: 38px;
   text-align: center;
-  color: #ffffff;
-  padding: inherit;
+  line-height: 24px;
+  font-size: 14px;
+  color: #fff;
   border-radius: 4px;
-  margin-right: 14%;
-  width: 35px;
-  display: inline-block;
+  margin-right: 30px;
 }
 
 .bugNameSty:hover {

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

@@ -74,7 +74,7 @@
       :header-cell-style="{ color: '#4A4A4A', fontSize: '14px', fontWeight: '500' }"
       row-key="id"
     >
-      <el-table-column label="优先级" prop="priorityLevelShortName" min-width="100" sortable align="center">
+      <el-table-column label="优先级" prop="priorityLevelShortName" min-width="90" sortable align="right">
         <template slot-scope="scope" style="text-align: center;">
           <span class="div_priority" :class="[{'priority_color': scope.row.priorityLevel === 'High'},{'priority_color1': scope.row.priorityLevel === 'Medium'},{'priority_color3': scope.row.priorityLevel === 'Low'}]">
             {{ scope.row.priorityLevelShortName }}
@@ -368,13 +368,14 @@ export default {
   color:rgba(102,102,102,1);
 }
 .div_priority {
+  display: inline-block;
+  width: 38px;
   text-align: center;
-  color: #ffffff;
-  padding: inherit;
+  line-height: 24px;
+  font-size: 14px;
+  color: #fff;
   border-radius: 4px;
-  margin-right: 14%;
-  width: 35px;
-  display: inline-block;
+  margin-right: 30px;
 }
 .bugNameSty:hover {
   cursor: pointer;

src/views/projectManage/onlineproblem/component/chart.vue

@@ -24,7 +24,9 @@
         <el-option v-for="(y, index) in yearList" :key="index" :label="y" :value="y" />
       </el-select>
     </div>
-    <normal-echart v-if="echartsOption3" :chart-id="'chartThird'" :option="echartsOption3" @onClick="changeList" />
+    <div class="chatBox">
+      <normal-echart v-if="echartsOption3" :chart-id="'chartThird'" :option="echartsOption3" @onClick="changeList" />
+    </div>
   </div>
 </template>
 <script>
@@ -96,11 +98,15 @@ export default {
   .chartSearchbar {
     display: flex;
     justify-content: space-between;
-    padding: 0 5%;
+    padding-left: 15px;
     .label {
       font-size: 14px;
       color: #444;
     }
   }
+  .chatBox {
+    padding-left: 15px;
+    height: 292px;
+  }
 }
 </style>

src/views/projectManage/onlineproblem/component/list.vue

@@ -126,7 +126,7 @@ export default {
     display: inline-block;
     text-align: center;
     width: 38px;
-    height: 24px;
+    text-align: center;
     line-height: 24px;
     font-size: 14px;
     color: #fff;

src/views/projectManage/projectList/components/needsList.vue

@@ -11,7 +11,7 @@
       show-overflow-tooltip="true"
       :header-row-style="{height: '50px'}"
     >
-      <el-table-column label="优先级" fixed prop="priority" width="100" sortable align="center">
+      <el-table-column label="优先级" fixed prop="priority" width="100" sortable align="right">
         <template slot-scope="scope" style="text-align: center;">
           <span class="div_priority" :class="scope.row.priorityName">
             {{ scope.row.priorityName }}
@@ -239,12 +239,14 @@ export default {
   color: rgba(245,108,108,1);
 }
 .div_priority {
+  display: inline-block;
+  width: 38px;
   text-align: center;
-  color: #ffffff;
-  padding: inherit;
+  line-height: 24px;
+  font-size: 14px;
+  color: #fff;
   border-radius: 4px;
-  width: 40px;
-  display: inline-block;
+  margin-right: 30px;
 }
 .table-project-name {
   cursor: pointer;

src/views/projectManage/projectList/components/taskList.vue

@@ -36,7 +36,7 @@
           <schedule-list :id="props.row.id" :type-list="taskScheduleEvent" />
         </template>
       </el-table-column>
-      <el-table-column label="优先级" prop="priority" width="90" sortable align="center">
+      <el-table-column label="优先级" prop="priority" width="90" sortable align="right">
         <template slot-scope="scope" style="text-align: center;">
           <span class="div_priority" :class="scope.row.priorityString">
             {{ scope.row.priorityString }}
@@ -473,12 +473,14 @@ export default {
   background-color: #FFFFFF !important;
 }
 .div_priority {
+  display: inline-block;
+  width: 38px;
   text-align: center;
-  color: #ffffff;
-  padding: inherit;
+  line-height: 24px;
+  font-size: 14px;
+  color: #fff;
   border-radius: 4px;
-  width: 40px;
-  display: inline-block;
+  margin-right: 30px;
 }
 .plan-checked {
   padding-left: 21px;

src/views/projectManage/projectList/projectIndex.vue

@@ -601,11 +601,14 @@ export default {
     padding: 0px 0px 0px;
 }
 .div_priority {
-  color: #ffffff;
-  width:fit-content;
-  padding: 0 12px;
+  display: inline-block;
+  width: 38px;
+  text-align: center;
+  line-height: 24px;
+  font-size: 14px;
+  color: #fff;
   border-radius: 4px;
-  margin-left: 4px;
+  margin-right: 30px;
 }
  .Parent1 .el-table .cell {
     box-sizing: border-box;

src/views/projectManage/requirement/components/taskList.vue

@@ -36,7 +36,7 @@
           <schedule-list :id="props.row.id" :showunlock="'true'" :type-list="taskScheduleEvent" />
         </template>
       </el-table-column>
-      <el-table-column label="优先级" prop="priority" width="90" sortable align="center">
+      <el-table-column label="优先级" prop="priority" width="90" sortable align="right">
         <template slot-scope="scope" style="text-align: center;">
           <span class="div_priority" :class="scope.row.priorityString">
             {{ scope.row.priorityString }}
@@ -479,12 +479,14 @@ export default {
   background-color: #FFFFFF !important;
 }
 .div_priority {
+  display: inline-block;
+  width: 38px;
   text-align: center;
-  color: #ffffff;
-  padding: inherit;
+  line-height: 24px;
+  font-size: 14px;
+  color: #fff;
   border-radius: 4px;
-  width: 40px;
-  display: inline-block;
+  margin-right: 30px;
 }
 .plan-checked {
   padding-left: 21px;

src/views/projectManage/requirement/list/index.vue

@@ -199,7 +199,7 @@
         size="small"
         show-overflow-tooltip="true"
       >
-        <el-table-column label="优先级" prop="priority" fixed min-width="90" sortable align="left">
+        <el-table-column label="优先级" prop="priority" fixed min-width="90" sortable align="right">
           <template v-slot="scope">
             <div class="div_priority" :style="{background: priorityColors[scope.row.priority % priorityColors.length]}">{{ 'P'+scope.row.priority }}</div>
           </template>
@@ -853,11 +853,14 @@ export default {
   color: #ffffff;
 }
 .div_priority {
-  color: #ffffff;
-  width:fit-content;
-  padding: 0 12px;
+  display: inline-block;
+  width: 38px;
+  text-align: center;
+  line-height: 24px;
+  font-size: 14px;
+  color: #fff;
   border-radius: 4px;
-  margin-left: 4px;
+  margin-right: 30px;
 }
 .el-from-spacing {
   margin: 15px 0;

src/views/projectManage/taskList/taskIndex.vue

@@ -188,7 +188,7 @@
         size="small"
         show-overflow-tooltip="true"
       >
-        <el-table-column label="优先级" min-width="100" prop="priority" sortable align="left">
+        <el-table-column label="优先级" width="90" prop="priority" sortable align="right">
           <template slot-scope="scope">
             <div class="div_priority" :style="{background: priorityColors[scope.row.priority]}">{{ scope.row.priorityString }}</div>
           </template>
@@ -873,7 +873,7 @@ export default {
   font-size: 16px;
   background: #fff;
   font-weight: 700;
-  padding: 16px 8px;
+  padding: 16px 12px;
 }
 .search_box {
   .item {
@@ -929,11 +929,14 @@ export default {
   color: #606266;
 }
 .div_priority {
-  color: #ffffff;
-  width:fit-content;
-  padding: 0 12px;
+  display: inline-block;
+  width: 38px;
+  text-align: center;
+  line-height: 24px;
+  font-size: 14px;
+  color: #fff;
   border-radius: 4px;
-  margin-left: 4px;
+  margin-right: 30px;
 }
 .tagNotification {
   background: rgba(255,137,82,15%);

src/views/projectManage/version/components/taskList.vue

@@ -36,7 +36,7 @@
           <schedule-list :id="props.row.id" :type-list="taskScheduleEvent" />
         </template>
       </el-table-column>
-      <el-table-column label="优先级" prop="priority" width="90" sortable align="center">
+      <el-table-column label="优先级" prop="priority" width="90" sortable align="right">
         <template slot-scope="scope" style="text-align: center;">
           <span class="div_priority" :class="scope.row.priorityString">
             {{ scope.row.priorityString }}
@@ -453,12 +453,14 @@ export default {
   background-color: #FFFFFF !important;
 }
 .div_priority {
+  display: inline-block;
+  width: 38px;
   text-align: center;
-  color: #ffffff;
-  padding: inherit;
+  line-height: 24px;
+  font-size: 14px;
+  color: #fff;
   border-radius: 4px;
-  width: 40px;
-  display: inline-block;
+  margin-right: 30px;
 }
 .plan-checked {
   padding-left: 21px;

src/views/projectManage/version/list/index.vue

@@ -47,7 +47,7 @@
             <el-row>
               <el-col :span="24">
                 <el-table v-loading="loading" :data="tableData" style="width: 100%;" highlight-current-row :header-cell-style="{ color: '#4A4A4A', fontSize: '14px', fontWeight: '500' }">
-                  <el-table-column prop="priority" label="优先级" min-width="7%" align="center">
+                  <el-table-column prop="priority" label="优先级" min-width="90" align="right">
                     <template v-slot="scope">
                       <div class="div_priority" :style="{background: priorityColors[scope.row.priority%priorityColors.length]}">{{ 'P'+scope.row.priority }}</div>
                       <!-- <div :class="[{ active: isActive=='h' }, { active1: isActive=='l' },{ active1: isActive=='l' }]" /> -->
@@ -561,11 +561,14 @@ export default {
   min-height: calc(100vh - 209px);
 }
 .div_priority {
-  color: #ffffff;
-  width:fit-content;
-  padding: 0 12px;
+  display: inline-block;
+  width: 38px;
+  text-align: center;
+  line-height: 24px;
+  font-size: 14px;
+  color: #fff;
   border-radius: 4px;
-  margin: auto;
+  margin-right: 30px;
 }
 .div_requirement_name {
   display: inline-block;

src/views/quality/components/requireDrawer.vue

@@ -3,7 +3,7 @@
     <div class="_font">{{ Statistics.total }}</div>
     <div style="height: calc(100vh - 200px); overflow: scroll; overflow-x: hidden;">
       <el-table :data="tableData" style="width: 100%;" :header-cell-style="{ 'color':'rgba(74,74,74,1)','font-size':'14px','font-weight':'500' }" class="integration-num">
-        <el-table-column label="优先级" min-width="100">
+        <el-table-column label="优先级" min-width="100" align="right">
           <template slot-scope="scope">
             <div class="div_priority" :style="{background: priorityColors[scope.row.priority % priorityColors.length]}">{{ 'P'+scope.row.priority }}</div>
           </template>
@@ -179,11 +179,14 @@ export default {
 }
 
 .div_priority {
-  color: #ffffff;
-  width:fit-content;
-  padding: 0 12px;
+  display: inline-block;
+  width: 38px;
+  text-align: center;
+  line-height: 24px;
+  font-size: 14px;
+  color: #fff;
   border-radius: 4px;
-  margin-left: 4px;
+  margin-right: 30px;
 }
 .drawer-id {
   color: rgb(167, 174, 188);

src/views/workbench/bugTableList.vue

@@ -12,7 +12,7 @@
       :header-cell-style="{ color: '#4A4A4A', fontSize: '14px', fontWeight: '500' }"
       row-key="id"
     >
-      <el-table-column label="优先级" prop="priorityCode" min-width="100" sortable align="center">
+      <el-table-column label="优先级" prop="priorityCode" min-width="90" sortable align="right">
         <template slot-scope="scope" style="text-align: center;">
           <span class="div_priority" :class="[{'priority_color': scope.row.priorityLevel === 'High'},{'priority_color1': scope.row.priorityLevel === 'Medium'},{'priority_color3': scope.row.priorityLevel === 'Low'}]">
             {{ scope.row.priorityLevel.substring(0, 1) }}
@@ -216,13 +216,14 @@ export default {
   color:rgba(102,102,102,1);
 }
 .div_priority {
+  display: inline-block;
+  width: 38px;
   text-align: center;
-  color: #ffffff;
-  padding: inherit;
+  line-height: 24px;
+  font-size: 14px;
+  color: #fff;
   border-radius: 4px;
-  margin-right: 14%;
-  width: 35px;
-  display: inline-block;
+  margin-right: 30px;
 }
 .bugNameSty:hover {
   cursor: pointer;

src/views/workbench/team/components/needsList.vue

@@ -20,7 +20,7 @@
       show-overflow-tooltip="true"
       :header-row-style="{height: '50px'}"
     >
-      <el-table-column label="优先级" fixed prop="priority" width="100" sortable align="center">
+      <el-table-column label="优先级" fixed prop="priority" width="90" sortable align="right">
         <template slot-scope="scope" style="text-align: center;">
           <span class="div_priority" :class="scope.row.priorityName">
             {{ scope.row.priorityName }}
@@ -311,12 +311,14 @@ export default {
   color: rgba(245,108,108,1);
 }
 .div_priority {
+  display: inline-block;
+  width: 38px;
   text-align: center;
-  color: #ffffff;
-  padding: inherit;
+  line-height: 24px;
+  font-size: 14px;
+  color: #fff;
   border-radius: 4px;
-  width: 40px;
-  display: inline-block;
+  margin-right: 30px;
 }
 .table-project-name {
   cursor: pointer;

src/views/workbench/team/components/projectList.vue

@@ -24,7 +24,7 @@
       show-overflow-tooltip="true"
       :header-row-style="{height: '50px'}"
     >
-      <el-table-column label="优先级" prop="priority" width="100" sortable align="center">
+      <el-table-column label="优先级" prop="priority" width="90" sortable align="right">
         <template slot-scope="scope" style="text-align: center;">
           <span class="div_priority" :class="scope.row.priorityStr">
             {{ scope.row.priorityStr }}
@@ -253,12 +253,14 @@ export default {
 	}
 }
 .div_priority {
+  display: inline-block;
+  width: 38px;
   text-align: center;
-  color: #ffffff;
-  padding: inherit;
+  line-height: 24px;
+  font-size: 14px;
+  color: #fff;
   border-radius: 4px;
-  width: 40px;
-  display: inline-block;
+  margin-right: 30px;
 }
 .table-project-name {
   cursor: pointer;

src/views/workbench/team/components/taskList.vue

@@ -35,7 +35,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="优先级" prop="priority" width="90" sortable align="center">
+      <el-table-column label="优先级" prop="priority" width="90" sortable align="right">
         <template slot-scope="scope" style="text-align: center;">
           <span class="div_priority" :class="scope.row.priorityString">
             {{ scope.row.priorityString }}
@@ -492,12 +492,14 @@ export default {
   background-color: #FFFFFF !important;
 }
 .div_priority {
+  display: inline-block;
+  width: 38px;
   text-align: center;
-  color: #ffffff;
-  padding: inherit;
+  line-height: 24px;
+  font-size: 14px;
+  color: #fff;
   border-radius: 4px;
-  width: 40px;
-  display: inline-block;
+  margin-right: 30px;
 }
 .plan-checked {
   padding-left: 21px;