update: ui调整

src/components/tag/tag-config-options.vue

@@ -2724,7 +2724,7 @@ export default {
  }
  .tag013check {
    width: 180px;
-   margin-left: 0;
+   margin-left: 0 !important;
    margin-right: 20px;
    .el-checkbox__label {
       overflow: hidden;

src/view/manualTag/manual-tag-value-edit.vue

@@ -76,7 +76,7 @@
     ></vue-gic-export-excel>
     <!--表格字段-->
     <dm-table-filed :visible.sync="tableFiledVisible" projectName="member-tag" pageName="memberTag" :max="20" :defaultDisabled="['memberName']" :checkedFields="checkFields" @submit="onSubmiTableFiled" />
-    <i id="aniIcon" class="iconfont icon-shougongbiaoqian aniIcon" :style="{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }"></i>
+    <i id="aniIcon" class="iconfont icon-biaoqian aniIcon" :style="{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }"></i>
     <delete-tag-dialog :visible.sync="deleteTagDialog.visible" :data="deleteTagDialog.deleteData" @submit="delTagApi" />
   </div>
 </template>
@@ -642,10 +642,23 @@ export default {
     0% {
       opacity: 1;
     }
+    40% {
+      opacity: 1;
+      right: 50px;
+      bottom: 360px;
+      transform: scale(0.5);
+    }
+    50% {
+      opacity: 0.5;
+      right: 50px;
+      bottom: 360px;
+      transform: scale(1.2);
+    }
     100% {
-      right: 30px;
-      bottom: 380px;
-      font-size: 12px;
+      opacity: 0.5;
+      right: 50px;
+      bottom: 360px;
+      transform: scale(0);
     }
   }
   .tip {

src/view/memberGroup/card-item.vue

@@ -51,6 +51,7 @@ export default {
     color: #2f54eb;
     font-size: 22px;
     white-space: nowrap;
+    font-family: DINAlternate-Bold, DINAlternate;
     span {
       font-size: 14px;
       color: #303133;

src/view/memberGroup/edit-tag.vue

@@ -24,7 +24,7 @@
         <el-button ref="animationStart" type="primary" @click="handleSave" style="margin-bottom: 14px">确 定</el-button>
       </span>
     </el-dialog>
-    <i id="aniIcon" class="iconfont icon-shougongbiaoqian aniIcon" :style="{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }"></i>
+    <i id="aniIcon" class="iconfont icon-biaoqian aniIcon" :style="{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }"></i>
   </div>
 </template>
 
@@ -193,18 +193,30 @@ export default {
   z-index: 99999;
   color: #2F54EB;
   font-size: 26px;
-  animation: toTrash 2s infinite;
+  animation: toTrash 3s;
   opacity: 0;
 }
 @keyframes toTrash {
   0% {
     opacity: 1;
   }
+  40% {
+    opacity: 1;
+    right: 55px;
+    bottom: 285px;
+    transform: scale(0.5);
+  }
+  50% {
+    opacity: 0.5;
+    right: 55px;
+    bottom: 285px;
+    transform: scale(1.2);
+  }
   100% {
-    right: 30px;
-    bottom: 300px;
-    font-size: 12px;
-    opacity: 0;
+    opacity: 0.5;
+    right: 55px;
+    bottom: 285px;
+    transform: scale(0);
   }
 }
 </style>

src/view/memberGroup/group-list.vue

@@ -18,11 +18,9 @@
       <ul class="lists" v-show="activeType == '3'">
         <li v-for="(list, i) in groupLists" :key="i" :class="['member-list', { 'active-li': i == currentLevelIndex }]" @click="handleChangeLevel(i, list)">
           <div class="wrap">
-            <el-tooltip class="item" effect="dark" :content="list.aliasName | aliasTips" placement="top-start" :open-delay="300">
-              <span>{{ list.aliasName }}</span>
-            </el-tooltip>
+            <span>{{ list.aliasName }}</span>
             <span>({{ levelNums(list.aliasName) }})</span>
-            </div>
+          </div>
         </li>
       </ul>
       <ul class="lists" v-show="activeType == '2'">
@@ -531,6 +529,7 @@ export default {
   }
   .wrap span{
     padding-left: 6px;
+    color: #303133;
   }
   li:hover {
     background-color: #EBEFFE;

src/view/memberGroup/memberGroupEdit.vue

@@ -236,12 +236,17 @@ import {
   isShowSystemTag
 } from '@/request/api';;
 let fixBeginTime = +new Date() + (1000 * 60 * 60 * 24);
-const shortTimeFn = (text, timestamp) => {
+const shortTimeFn = (text, day, type) => {
   return {
     text,
     onClick(picker) {
-      const curDate = new Date();
-      curDate.setTime(curDate.getTime() + timestamp);
+      let curDate = new Date();
+      if (type == 'day') {
+        curDate.setDate(day + curDate.getDate());
+      } else {
+        curDate.setMonth(day + curDate.getMonth());
+        curDate = new Date(+new Date(curDate) - 24 * 60 * 60 * 1000);
+      }
       picker.$emit('pick', curDate);
     }
   }
@@ -311,11 +316,11 @@ export default {
           return time.getTime() < Date.now() - 8.64e7 || time.getTime() > y;
         },
         shortcuts: [
-          shortTimeFn('一天', 0),
-          shortTimeFn('一周', 6 * 24 * 60 * 60 * 1000),
-          shortTimeFn('一个月', 29 * 24 * 60 * 60 * 1000),
-          shortTimeFn('三个月', 89 * 24 * 60 * 60 * 1000),
-          shortTimeFn('六个月', 179 * 24 * 60 * 60 * 1000),
+          shortTimeFn('一天', 0, 'day'),
+          shortTimeFn('一周', 6, 'day'),
+          shortTimeFn('一个月', 1, 'month'),
+          shortTimeFn('三个月', 3, 'month'),
+          shortTimeFn('六个月', 6, 'month'),
         ]
       },
       fixedTimeOptions: {

src/view/memberGroup/memberGroupList.vue

@@ -1620,6 +1620,8 @@ export default {
       }
     }
     .look-self {
+      display: inline-block;
+      margin-top: 10px;
       i {
         font-size: 14px;
         margin-left: 5px;

src/view/platformTag/tag-container-active.vue

@@ -55,7 +55,7 @@
       </el-table-column>
     </el-table>
     <delete-tag-dialog :visible.sync="deleteTagDialog.visible" :data="deleteTagDialog.deleteData" @submit="doDelete" />
-    <i id="activeAniIcon" class="iconfont icon-shougongbiaoqian activeAniIcon" :style="{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }"></i>
+    <i id="activeAniIcon" class="iconfont icon-biaoqian activeAniIcon" :style="{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }"></i>
   </div>
 </template>
 
@@ -257,11 +257,23 @@ export default {
   0% {
     opacity: 1;
   }
+  40% {
+    opacity: 1;
+    right: 38px;
+    bottom: 345px;
+    transform: scale(0.5);
+  }
+  50% {
+    opacity: 0.5;
+    right: 37px;
+    bottom: 345px;
+    transform: scale(1.2);
+  }
   100% {
-    right: 30px;
-    bottom: 380px;
-    font-size: 12px;
-    opacity: 0;
+    opacity: 0.5;
+    right: 37px;
+    bottom: 345px;
+    transform: scale(0);
   }
 }
 </style>

src/view/platformTag/tag-container.vue

@@ -75,7 +75,7 @@
       </el-table-column>
     </el-table>
     <delete-tag-dialog :visible.sync="deleteTagDialog.visible" :data="deleteTagDialog.deleteData" @submit="doDelete" />
-    <i id="tagAniIcon" class="iconfont icon-shougongbiaoqian tagAniIcon" :style="{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }"></i>
+    <i id="tagAniIcon" class="iconfont icon-biaoqian tagAniIcon" :style="{ right: `${animationPos.x}px`, bottom: `${animationPos.y}px` }"></i>
   </div>
 </template>
 
@@ -326,11 +326,23 @@ export default {
   0% {
     opacity: 1;
   }
+  40% {
+    opacity: 1;
+    right: 38px;
+    bottom: 345px;
+    transform: scale(0.5);
+  }
+  50% {
+    opacity: 0.5;
+    right: 37px;
+    bottom: 345px;
+    transform: scale(1.2);
+  }
   100% {
-    right: 30px;
-    bottom: 380px;
-    font-size: 12px;
-    opacity: 0;
+    opacity: 0.5;
+    right: 37px;
+    bottom: 345px;
+    transform: scale(0);
   }
 }
 </style>

static/css/index.less

@@ -75,7 +75,7 @@
 
 .cre-dialog {
   .el-dialog__body {
-    padding: 10px 20px 20px;
+    padding: 10px 20px 24px;
   }
   .cre-btn {
     padding-top: 20px;