Merge branch 'dev-220309' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-220309

src/assets/scss/modules/search.scss

@@ -228,7 +228,7 @@
                 }
                 .notice-list {
                     // @include toe;
-                    width: 92%;
+                    width: calc(100% - 70px);
                     // height: 24px;
                     // overflow: hidden;
                     a {

src/assets/scss/modules/visual/personCategory.scss

@@ -89,7 +89,7 @@
         }
 
         .item_right {
-          width: 160px;
+          width: 110px;
           display: flex;
           flex-direction: column;
           align-items: space-between;

src/views/modules/shequ/cpts/scroll-notice.vue

@@ -41,7 +41,7 @@ export default {
       let len = this.list.length;
       let beyond = this.beyond;
       return {
-        paddingLeft: beyond ? this.parentClientWidth + "px" : "",
+        // paddingLeft: beyond ? this.parentClientWidth + "px" : "",
         animation: beyond
           ? `move_left_right ${len * 5}s linear 0s infinite`
           : "",
@@ -118,7 +118,7 @@ export default {
       transform: translateX(0%);
     }
     to {
-      transform: translateX(-80%);
+      transform: translateX(-100%);
     }
   }
 }

src/views/modules/visual/basicinfo/personCategory/index.vue

@@ -49,7 +49,7 @@
               <div class="item_left">较上月</div>
               <div class="item_right">
                 <div class="item_right_row">
-                  <div class="item_right_title">新人员增加</div>
+                  <div class="item_right_title">增加</div>
                   <div>
                     <span v-if=" item.immigration!==0">{{ "+" }}</span>
                     <span>{{  item.immigration }}</span>
@@ -58,7 +58,7 @@
                 </div>
 
                 <div class="item_right_row row2">
-                  <div class="item_right_title">原人员减少</div>
+                  <div class="item_right_title">减少</div>
                   <div>
                     <span v-if=" item.emigration!==0">{{ "-" }}</span>
                     <span>{{  item.emigration }}</span>

src/views/modules/warning/components/screen-table/index.vue

@@ -60,10 +60,7 @@
           </div>
           <screen-loading v-if="visibleLoading">加载中</screen-loading>
           <div class="no-data" v-if="tableData.length == 0 && !visibleLoading">
-            <img
-              src="@/assets/img/modules/visual/noData.png"
-              class="no-data-img"
-            />
+            暂无数据
           </div>
         </div>
       </div>
@@ -377,14 +374,13 @@ export default {
       // 暂无数据
       .no-data {
         width: 100%;
-        height: calc(100% - 50px);
+        height: calc(100vh - 650px);
         display: flex;
         align-items: center;
         justify-content: center;
-        &-img {
-          width: 249px;
-          height: 172px;
-        }
+        font-size: 20px;
+        color: #999999;
+        text-align: center;
       }
     }
   }