Browse Source

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

shibei_master
jiangyy 3 years ago
parent
commit
a1722fb289
  1. 2
      src/assets/scss/modules/search.scss
  2. 4
      src/views/modules/shequ/cpts/scroll-notice.vue
  3. 14
      src/views/modules/warning/components/screen-table/index.vue

2
src/assets/scss/modules/search.scss

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

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

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

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

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

Loading…
Cancel
Save