qinzhipeng_v@didiglobal.com 4 years ago
parent
commit
1ae172525c

BIN
src/assets/home_images/WX20200914-141851@2x.png


+ 36 - 17
src/views/projectManage/components/demand.vue

@@ -48,7 +48,7 @@
                   <div style="height: 200px; overflow: hidden; overflow-y: auto;">
                     <div v-for="(item, index) in memberIDAP" :key="index" class="Layout_space_between involveApp-top-bottom cursorPo" @click="changeTaskName(scope.row, item, 1)">
                       <span class="item-detail">{{ item.deptName }}</span>
-                      <span style="min-width:80px">{{ item.name }}</span>
+                      <span class="item-details" style="min-width:80px">{{ item.name }}</span>
                       <span class="item-detail">{{ item.idap }}</span>
                     </div>
                   </div>
@@ -62,7 +62,7 @@
                   <div style="height: 200px; overflow: hidden; overflow-y: auto;">
                     <div v-for="(item, index) in memberIDAP" :key="index" class="Layout_space_between involveApp-top-bottom cursorPo" @click="changeTaskName(scope.row, item, 2)">
                       <span class="item-detail">{{ item.deptName }}</span>
-                      <span style="min-width:80px">{{ item.name }}</span>
+                      <span class="item-details" style="min-width:80px">{{ item.name }}</span>
                       <span class="item-detail">{{ item.idap }}</span>
                     </div>
                   </div>
@@ -71,21 +71,24 @@
               </el-tooltip>
             </div>
 
-            <div class="Layout_space_between">
+            <div class="Layout_space_between" style="margin-bottom: 10px;">
               <span v-if="scope.row.isDirectlyFromDpm === 0 || scope.row.isDirectlyFromDpm === 1">
                 <el-tooltip class="item" effect="dark" :content="scope.row.relatedDpmTaskInfo.taskId + scope.row.relatedDpmTaskInfo.name" placement="top">
-                  <img class="cursorPo" src="@/assets/home_images/WX20200914-141851@2x.png" @click="jump(scope.row.dpmUrl)">
+                  <img class="cursorPo img-logo" src="@/assets/home_images/WX20200914-141851@2x.png" @click="jump(scope.row.dpmUrl)">
                 </el-tooltip>
                 <i v-if="scope.row.isDirectlyFromDpm === 0" class="el-icon-circle-close sty-icon cursorPo" @click="delete_dpl(scope.row.id)" />
               </span>
               <el-popover v-if="scope.row.isDirectlyFromDpm === -1" placement="bottom" title="关联望岳任务" width="400" trigger="click">
                 <div class="blueStr" />
                 <div v-for="(item, index) in dplOption" :key="index" class="Layout_space_between involveApp-top-bottom cursorPo" @click="setRelation(item, scope.row.id)">
-                  <span>{{ item.moduleInfoName }}</span>
-                  <span>{{ item.name }}</span>
-                  <span>{{ item.taskId }}</span>
+                  <span class="item-detail">{{ item.moduleInfoName }}</span>
+                  <span class="item-details">{{ item.name }}</span>
+                  <span class="item-detail">{{ item.taskId }}</span>
                 </div>
-                <el-button v-if="scope.row.isDirectlyFromDpm === -1" slot="reference" size="mini" type="text" @click.native="getDplList(scope.row.id)">关联望岳</el-button>
+                <div slot="reference" class="btn-dpl" @click.native="getDplList(scope.row.id)">
+                  关联望岳
+                </div>
+                <!-- <el-button v-if="scope.row.isDirectlyFromDpm === -1" slot="reference" size="mini" type="text" @click.native="getDplList(scope.row.id)">关联望岳</el-button> -->
               </el-popover>
 
               <div v-if="locking" v-show="scope.row.vVisible" class="iconEdit">
@@ -96,12 +99,12 @@
                 <i v-show="scope.row.isScheduleLocked === 0" class="el-icon-circle-plus-outline cursorPo lineHeight" @click="clickAddScheduling(2,scope.row)" />
                 <el-popover v-if="scope.row.isDirectlyFromDpm === 0 || scope.row.isDirectlyFromDpm === 1" placement="bottom" title="同步排期至望岳" width="400" trigger="click">
                   <div class="blueStr" />
-                  <div class="synchronization">是否需要同步当前任务的排期到望岳<span style="color:#D98A38;"> {{ taskDpl }}</span> ?</div>
-                  <div class="synchronization">以下任务与该望岳任务也关联,排期将一并同步,请知悉!</div>
+                  <div class="synchronization">是否需要同步当前任务的排期到望岳<span style="color: rgba(230,162,60,100%);"> {{ taskDpl }}</span> ?</div>
+                  <div v-if="taskDataList.length > 0" class="synchronization">以下任务与该望岳任务也关联,排期将一并同步,请知悉!</div>
                   <div v-for="(item, index) in taskDataList" :key="index" class="Layout_space_between involveApp-top-bottom">
-                    <span>{{ item.taskId }}</span>
-                    <span>{{ item.name }}</span>
-                    <span>{{ item.moduleInfoName }}</span>
+                    <span class="item-detail">{{ item.taskId }}</span>
+                    <span class="item-details" style="min-width:200px">{{ item.name }}</span>
+                    <span class="item-detail">{{ item.moduleInfoName }}</span>
                   </div>
                   <div align="right" style="margin-top:20px;">
                     <el-button size="mini" @click="$refs.Simulation.click()">取 消</el-button>
@@ -463,8 +466,13 @@ export default {
 <style lang="scss" scoped>
 .item-detail {
     min-width:110px;
-    color: #8492a6;
-    font-size: 13px;
+    color: #999999;
+    font-size: 12px;
+    overflow:hidden
+  }
+  .item-details {
+    color: #333333;
+    font-size: 12px;
     overflow:hidden
   }
 .templatName {
@@ -545,13 +553,17 @@ export default {
   margin: 0 20px;
   padding: 0;
 }
+.img-logo {
+    display: inline-block;
+    width: 60px;
+  }
 >>>.el-table, .el-table__expanded-cell{
   background:rgba(248,248,248,0.6);
 }
 .sty-icon {
   position: absolute;
   left: 63px;
-  bottom: 13px;
+  bottom: 30px;
   background: #eee;
   border-radius: 50%;
 }
@@ -559,7 +571,6 @@ export default {
   font-size:10px;
   font-family:MicrosoftYaHei;
   line-height:12px;
-  padding: 0 5px;
   color:rgba(64,158,255,1);
   opacity:1;
 }
@@ -621,6 +632,14 @@ export default {
   color: #333333;
   opacity: 1;
 }
+.btn-dpl {
+  color: #fff;
+  font-size: 12px;
+  background: #409EFF;
+  opacity: 1;
+  border-radius: 5px;
+  padding: 0 6px;
+}
 </style>
 <style>
  .el-popover__title {

+ 5 - 1
src/views/projectManage/requirement/requirementDetail.vue

@@ -8,7 +8,7 @@
             <span>
               <span class="title-id">REQUIREMENT-{{ form_query.id }} </span>
               <el-tooltip v-if="form_query.isDirectlyFromDpm === 1" class="item" effect="dark" :content="form_query.relatedDpmRequirementInfo.requirementDisplayId + form_query.relatedDpmRequirementInfo.name" placement="top">
-                <img class="cursorPo" src="@/assets/home_images/WX20200914-141851@2x.png" @click="dpmUrl(form_query.dpmUrl)">
+                <img class="cursorPo img-logo" src="@/assets/home_images/WX20200914-141851@2x.png" @click="dpmUrl(form_query.dpmUrl)">
               </el-tooltip>
             </span>
             <el-tooltip class="item" effect="dark" :content="form_query.name" placement="bottom">
@@ -856,6 +856,10 @@ export default {
 }
 </script>
 <style scoped lang="scss">
+.img-logo {
+    display: inline-block;
+    width: 60px;
+  }
 .cursorPo:hover {
       color:#409EFF;
       cursor: pointer;