瀏覽代碼

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

wangziqian 5 年之前
父節點
當前提交
0dde30ffb6

二進制
src/assets/extraUrgent.png


二進制
src/assets/urgent.png


+ 1 - 1
src/views/projectManage/iteration/components/requiredTable.vue

@@ -103,7 +103,7 @@
       <el-table-column label="需求名称" min-width="250" show-overflow-tooltip>
         <template v-slot="scope">
           <div class="table-project-name" @click="clickRequiredName(scope.row.id)">
-            <span class="id">{{ scope.row.requirementDisplayId }} <img v-if="scope.row.type === 1" :src="extraUrgent" style="padding: 0 10px;"></span>
+            <span class="id">{{ scope.row.requirementDisplayId }} <img v-if="scope.row.type === 1" :src="extraUrgent" style="height: 17px;padding: 0 10px;"></span>
             <span class="public_Jump">{{ scope.row.name }}</span>
             <div /></div></template>
       </el-table-column>

+ 1 - 1
src/views/projectManage/projectList/components/needsList.vue

@@ -21,7 +21,7 @@
       <el-table-column label="需求名称" width="250" align="left" show-overflow-tooltip>
         <template slot-scope="scope">
           <div class="table-project-name" @click="needs_link(scope.row.id)">
-            <span class="id">{{ scope.row.requirementDisplayId }} <img v-if="scope.row.type === 1" :src="extraUrgent" style="padding: 0 10px;"></span>
+            <span class="id">{{ scope.row.requirementDisplayId }} <img v-if="scope.row.type === 1" :src="extraUrgent" style="height: 17px;padding: 0 10px;"></span>
             <span class="name">{{ scope.row.name }}</span>
           </div>
         </template>

+ 1 - 1
src/views/projectManage/requirement/list/index.vue

@@ -94,7 +94,7 @@
         </el-table-column>
         <el-table-column prop="name" label="需求名称" min-width="250" show-overflow-tooltip align="left">
           <template v-slot="scope">
-            <span style="font-size: 12px;color: rgba(167,174,188,1);">{{ scope.row.requirementDisplayId }}<img v-if="scope.row.type === 1" :src="extraUrgent" style="padding: 0 10px;"></span><br>
+            <span style="font-size: 12px;color: rgba(167,174,188,1);">{{ scope.row.requirementDisplayId }}<img v-if="scope.row.type === 1" :src="extraUrgent" style="height: 17px; padding: 0 10px;"></span><br>
             <span class="stylus-hover" @click="getToRequirementDetails(scope.row.id)">{{ scope.row.name }}</span>
           </template>
         </el-table-column>

+ 2 - 2
src/views/projectManage/requirement/requirementDetail.vue

@@ -3,7 +3,7 @@
     <el-container>
       <el-header class="main-header" :class="{'paddingLeft': form_query.type === 1}">
         <div class="top-page-title">
-          <img v-if="form_query.type === 1" :src="urgent" style="padding: 0 10px;">
+          <img v-if="form_query.type === 1" :src="urgent" style="height: 32px;padding: 0 10px;">
           <div class="header-title">
             <span class="title-id">REQUIREMENT-{{ form_query.id }}</span>
             <el-tooltip class="item" effect="dark" :content="form_query.name" placement="bottom">
@@ -124,7 +124,7 @@
           </div>
           <section class="main-section">
             <div class="allTips">
-              <div class="tips"><i class="el-icon-warning-outline" />每个任务仅支持一次提测和一次准出,请合理拆解后任务再排期</div><br>
+              <div class="tips"><i class="el-icon-warning-outline" /> 每个任务仅支持一次提测和一次准出,请合理拆解后任务再排期</div><br>
               <div class="allTips">
                 <div v-if="BackToTheLatest" class="Scheduling" @click="GetRequireScheduleHistory"><i class="el-icon-refresh" /> 回到最新</div>
                 <div align="left" class="Scheduling" @click="scheduleHiHide"><div class="el-icon-document" /> 排期变更记录</div>

+ 1 - 1
src/views/projectManage/taskList/taskViewDetail.vue

@@ -131,7 +131,7 @@
           <section class="main-section">
             <div class="allTips">
               <div class="tips">
-                <i class="el-icon-warning-outline" />每个任务仅支持一次提测和一次准出,请合理拆解后任务再排期<br>
+                <i class="el-icon-warning-outline" /> 每个任务仅支持一次提测和一次准出,请合理拆解后任务再排期<br>
                 <i v-if="tips" class="el-icon-warning-outline" style="color:#e88792;" />
                 <span v-if="tips" style="color:#e88792;">当前任务归属的需求计划排期呈锁定状态,当前任务的排期无法同步到需求计划中去,请将归属需求的排期解锁!</span>
               </div>

+ 1 - 1
src/views/projectManage/version/list/index.vue

@@ -55,7 +55,7 @@
                   </el-table-column>
                   <el-table-column prop="requirementName" label="需求名称" min-width="33%">
                     <template v-slot="scope">
-                      <div class="biz-id">REQUIREMENT-{{ scope.row.requirementId }}  <img v-if="scope.row.type === 1" :src="extraUrgent" style="padding: 0 10px;"></div>
+                      <div class="biz-id">REQUIREMENT-{{ scope.row.requirementId }}  <img v-if="scope.row.type === 1" :src="extraUrgent" style="height: 17px;padding: 0 10px;"></div>
                       <div>
                         <el-tooltip class="item" effect="dark" placement="bottom" :content="scope.row.requirementName" :disabled="scope.row.requirementName.length < 16">
                           <div style="cursor: pointer;" @click="getToRequirementDetails(scope.row.requirementId)">

+ 1 - 1
src/views/workbench/team/components/needsList.vue

@@ -27,7 +27,7 @@
       <el-table-column label="需求名称" min-width="250" align="left" show-overflow-tooltip>
         <template slot-scope="scope">
           <div class="table-project-name" @click="needs_link(scope.row.id)">
-            <span class="id">{{ scope.row.requirementDisplayId }} <img v-if="scope.row.type === 1" :src="extraUrgent" style="padding: 0 10px;"></span>
+            <span class="id">{{ scope.row.requirementDisplayId }} <img v-if="scope.row.type === 1" :src="extraUrgent" style="height: 17px;padding: 0 10px;"></span>
             <span class="name">{{ scope.row.name }}</span>
           </div>
         </template>