From 32a95699e59c5c65e18c08643266c9cbfa380ee4 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 07 六月 2024 09:56:05 +0800
Subject: [PATCH] 优化设备明细、检验任务附件权限
---
src/view/notice.vue | 255 ++++++++++++++++----------------------------------
1 files changed, 84 insertions(+), 171 deletions(-)
diff --git a/src/view/notice.vue b/src/view/notice.vue
index 691e041..00bc85e 100644
--- a/src/view/notice.vue
+++ b/src/view/notice.vue
@@ -4,103 +4,43 @@
title="娑堟伅閫氱煡"
:visible.sync="drawer"
:direction="direction"
- :before-close="handleClose" style="height: 100vh;z-index: 9999999;">
- <div class="head">
- <div class="head-search">
- <label>娑堟伅绫诲瀷锛�</label>
- <el-select v-model="type" placeholder="璇烽�夋嫨" style="width: 150px;" size="small" @change="handleType">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </div>
- <el-dropdown style="margin-right: 20px;" v-if="list.length>0" @command="handleDropdownAll">
- <span class="el-dropdown-link">
- <span class="more">···</span>
- </span>
- <el-dropdown-menu slot="dropdown">
- <el-dropdown-item command="1">
- <i class="el-icon-check"></i>
- <span>鏍囪鎵�鏈夋秷鎭负宸茶</span>
- </el-dropdown-item>
- <el-dropdown-item command="2">
- <i class="el-icon-delete"></i>
- <span>鍒犻櫎鎵�鏈夊凡璇绘秷鎭�</span>
- </el-dropdown-item>
- </el-dropdown-menu>
- </el-dropdown>
- </div>
- <div class="notice-content" @scroll="scrollFn" v-loading="loading">
- <div class="notice-content-item" v-for="(m,i) in list" :key="i">
- <div class="btns" v-if="m">
- <el-dropdown style="margin-right: 20px;" trigger="click" @command="e=>handleDropdown(e,m)" v-if="m.messageType==2||m.messageType==3">
- <span class="el-dropdown-link">
- <span class="more" style="line-height: 26px;display: inline-block;">···</span>
- </span>
- <el-dropdown-menu slot="dropdown" v-if="m.messageType==2">
- <el-dropdown-item v-for="(n,j) in dropdownList0" :key="j" :command="n.value">
- {{ n.label }}
- </el-dropdown-item>
- </el-dropdown-menu>
- <el-dropdown-menu slot="dropdown" v-if="m.messageType==3">
- <el-dropdown-item v-for="(n,j) in dropdownList1" :key="j" :command="n.value">
- {{ n.label }}
- </el-dropdown-item>
- </el-dropdown-menu>
- </el-dropdown>
- <i class="el-icon-close" style="cursor: pointer;" @click="handleDel(m)"></i>
- </div>
- <div class="content">
- <img :src="`../../static/img/notice-${m.messageType}.svg`" alt="" style="width: 50px;margin-right: 18px;">
- <div class="content-info">
- <h4 style="font-weight: normal;margin-bottom: 4px;display: flex;align-items: center;justify-content: space-between;">
- <span>{{ m.theme }}<el-tag :type="!m.messageStatus?'danger':'success'" size="small" v-if="m.messageType==1||m.messageType==2||m.messageType==3" style="margin-left: 8px;">{{ !m.messageStatus?'鏈鐞�':'宸插鐞�' }}</el-tag></span>
- <span class="time" style="color: #999999;font-size: 12px;">{{ m.createTime }}</span>
- </h4>
- <p style="color: #999999;font-size: 14px;margin-bottom: 6px;cursor: pointer;" class="ellipsis-multiline" @click="goNoticeDetail(m)">{{ m.content }}</p>
- <p style="font-size: 12px;color: #999999;display: flex;align-items: center;justify-content: space-between;">
- <span>鍙戦�佷汉锛歿{m.createUser}}</span>
- <span>鏀朵欢浜猴細{{ m.consigneeUser }}</span>
+ :before-close="handleClose" style="height: 100vh;z-index: 9999999;" size="450px">
+ <div class="notice-content" v-loading="loading">
+ <scroll-pagination @load="refresh" :finishLoding="finishLoding" :list="list">
+ <div
+ class="notice-content-item"
+ v-for="(m,i) in list"
+ :key="i"
+ :class="{readStyle:m.viewStatus}"
+ @click="goNoticeDetail(m)">
+ <img :src="`../../static/img/notice-${m.viewStatus?1:0}-${m.messageType}.svg`" alt="" style="margin-right: 6px;">
+ <div class="notice-content-item-left">
+ <p>{{ m.theme }}</p>
+ <p style="width: 100%;display: flex;align-items: center;justify-content: space-between;">
+ <span>鍙戦�佷汉锛歿{ m.createUser }}</span>
+ <span>{{ m.createTime }}</span>
</p>
</div>
</div>
- <div class="new-notice" v-if="!m.viewStatus">
- <span>new</span>
- </div>
- </div>
- <div v-if="list.length<1&&!loading&&!isLoding" style="color:#909399;font-size:14px;text-align: center;margin-top:200px" >鏆傛棤鏁版嵁</div>
- <div v-if="list.length>0">
- <el-button
- v-if="isLoding"
- type="text"
- style="display: flex; margin: 0 auto; color: #909399"
- ><i class="el-icon-loading" style="font-size:20px"></i
- ></el-button>
- <el-button
- type="text"
- v-if="finishLoding"
- style="display: flex; margin: 0 auto; color: #909399"
- >宸茬粡娌℃湁鏇村鍟</el-button
- >
- </div>
+ </scroll-pagination>
+ <!-- <div v-if="list.length<1&&!loading" style="color:#909399;font-size:14px;text-align: center;margin-top:200px" >鏆傛棤鏁版嵁</div> -->
</div>
</el-drawer>
</div>
</template>
<script>
-
+import ScrollPagination from '../components/tool/scroll-paging.vue'
export default {
+ components: {
+ ScrollPagination
+ },
data(){
return{
drawer:false,
direction:'rtl',
options:[],
type:'0',
- list:[],
dropdownList0:[
{
label:'閫氳繃',
@@ -129,29 +69,52 @@
value:4
},
],
+ list:[
+ // {
+ // messageType:1,
+ // theme:'娴嬭瘯鏍囬',
+ // createTime: '2019-08-30 15:46:17',
+ // createUser:'<USERNAME>',
+ // viewStatus:false,
+ // },
+ // {
+ // messageType:2,
+ // theme:'娴嬭瘯鏍囬',
+ // createTime: '2019-08-30 15:46:17',
+ // createUser:'<USERNAME>',
+ // viewStatus:true,
+ // },
+ ],
currentPage:1,
- pageSize: 16, // 涓�椤�16鏉�
+ pageSize: 8, // 涓�椤�7鏉�
total: null,
- loading: false, // 缁勪欢loading鐨勫睍绀�,榛樿涓簍rue
- isLoding: false, // 鍔犺浇涓紝loading鍥炬爣,榛樿涓簍rue
- finishLoding: false // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
+ loading: true, // 缁勪欢loading鐨勫睍绀�,榛樿涓簍rue
+ finishLoding: false, // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
+ keyMap:{}
}
},
mounted(){
this.getTypeDicts();
this.currentPage = 1;
+ this.keyMap = {};
this.list = [];
this.refresh();
},
methods:{
refresh(){
- if(this.currentPage>1){
- this.isLoding = true
- }else{
+ const key = `_${this.currentPage}`
+ const value = this.keyMap[key]
+ // 濡傛灉value瀛樺湪锛岃〃绀虹紦瀛樻湁鍊硷紝閭ｄ箞闃绘璇锋眰
+ if(value) {
+ return
+ }
+ // value涓嶅瓨鍦紝琛ㄧず绗竴娆¤姹�,璁剧疆鍗犱綅
+ this.keyMap[key] = 'temp'
+ if(this.currentPage==1){
this.loading = true
}
if(this.list.length==0){
- window.addEventListener("scroll", this.throttle(this.scrollFn, 20000));
+ this.finishLoding = false
}
let type = this.type==0?null:this.type;
this.$axios.get(this.$api.informationNotification.page+'?size='+this.pageSize+'¤t='+this.currentPage+(type?'&messageType='+type:'')).then(res => {
@@ -170,9 +133,9 @@
if(this.total==this.list.length){
this.finishLoding = true;
}
+ this.currentPage++
}
this.loading = false
- this.isLoding = false;
})
},
open(){
@@ -191,7 +154,9 @@
},
goNoticeDetail(row){
this.$axios.put(this.$api.informationNotification.triggerModificationStatusToRead+'/'+row.id).then(res => {
- this.drawer = false;
+ row.num = Math.random(100);
+ localStorage.setItem("noticeInfo", JSON.stringify(row))
+ this.$bus.$emit("change", JSON.stringify(row));
this.$parent.addTab({
v: "娑堟伅璇︽儏",
i: "el-icon-s-tools",
@@ -200,9 +165,12 @@
p: "abcd"
},29);
this.list = [];
+ this.keyMap = {};
this.currentPage = 1;
this.refresh();
+ this.$emit('goNoticeDetail')
})
+ this.drawer = false;
},
handleDropdown(e,row){
switch(e){
@@ -225,6 +193,7 @@
}
this.$message.success('鍒犻櫎鎴愬姛')
this.list = [];
+ this.keyMap = {};
this.currentPage = 1;
this.refresh()
}).catch(e => {
@@ -232,40 +201,9 @@
})
}).catch(() => {})
},
- // 婊氬姩瑙﹀簳鍔犺浇
- scrollFn() {
- let clientHeight = document.documentElement.clientHeight - 18; //鍙鍖哄煙
- let scrollHeight = document.body.scrollHeight; // 婊氬姩鏂囨。楂樺害
- let scrollTop = parseInt(document.documentElement.scrollTop); // 宸叉粴鍔ㄧ殑楂樺害
- let height = 300;
- if (
- scrollTop + clientHeight >= scrollHeight - height &&
- scrollHeight != 0
- ) {
- if (!this.finishLoding&&this.currentPage*this.pageSize<this.total) {
- this.currentPage = this.currentPage + 1;
- this.refresh();
- }
- } else {
- return false;
- }
- },
- throttle(fn, wait) {
- // 灏佽鍑芥暟杩涜鑺傛祦
- var timer = null;
- return function () {
- var context = this;
- var args = arguments;
- if (!timer) {
- timer = setTimeout(function () {
- fn.apply(context, args);
- timer = null;
- }, wait);
- }
- };
- },
handleType(){
this.list = [];
+ this.keyMap = {};
this.currentPage = 1;
this.refresh();
},
@@ -280,13 +218,11 @@
}
this.$message.success('鎿嶄綔鎴愬姛')
this.list = [];
+ this.keyMap = {};
this.currentPage = 1;
this.refresh();
})
}
- },
- destroyed() {
- window.removeEventListener("scroll", this.throttle(), false);
},
}
</script>
@@ -324,66 +260,43 @@
cursor: pointer;
}
.notice-content{
- height: calc(100% - 60px);
+ height: 100%;
overflow-y: auto;
box-sizing: border-box;
padding: 0 16px;
}
.notice-content-item{
- position: relative;
width: 100%;
- padding: 8px;
+ padding: 9px;
border-radius: 8px;
box-sizing: border-box;
- border: 1px solid #EEEEEE;
margin-bottom: 10px;
overflow: hidden;
-}
-.btns{
- position: absolute;
- right: 20px;
- top: 4px;
- z-index: 4;
-}
-.notice-content-item .btns{
- opacity: 0;
-}
-.time{
- opacity: 1;
-}
-.notice-content-item:hover{
- box-shadow: 4px 4px 8px 0px rgba(51,51,51,0.04);
-}
-.notice-content-item:hover .btns{
- opacity: 1;
-}
-.notice-content-item:hover .time{
- opacity: 0;
-}
-.content{
+ background: #FBF2ED;
display: flex;
align-items: center;
+ cursor: pointer;
}
-.content-info{
- flex: 1;
+.notice-content-item-left{
+ width: 100%;
}
-.new-notice{
- position: absolute;
- left: 0;
- top: 0;
- width: 0;
- height: 0;
- border-top: 14px solid red;
- border-right: 14px solid transparent;
- border-bottom: 14px solid transparent;
- border-left: 14px solid red;
+.notice-content-item-left p:nth-child(1){
+ font-size: 14px;
+ color: #FF7756;
+ line-height: 18px;
+ margin-bottom: 8px;
}
-.new-notice span{
- position: absolute;
+.notice-content-item-left p:nth-child(2){
+ color: #FFAB97;
font-size: 12px;
- top: -13px;
- left: -17px;
- color: #fff;
- transform: rotate(-45deg) scale(0.8);
+}
+.readStyle{
+ background: #E9F6F2;
+}
+.readStyle .notice-content-item-left p:nth-child(1){
+ color: #198D8A;
+}
+.readStyle .notice-content-item-left p:nth-child(2){
+ color: #90CBCD;
}
</style>
--
Gitblit v1.9.3