Compare commits

..

No commits in common. "78106a56db3a533d56eb962c356f7570083ada11" and "7e88642740ef20044f0e7ea3062a4974f7d04ee7" have entirely different histories.

3 changed files with 17 additions and 96 deletions

View File

@ -2,7 +2,7 @@
<template> <template>
<view class="content"> <view class="content">
<view style="width: 100%; height: 44px;"></view> <view style="width: 100%; height: 44px;"></view>
<view class="top-heder" style="margin-top: 1rem"> <view class="top-heder">
<view class="t-left" @click="getfan()"> <view class="t-left" @click="getfan()">
<uni-icons type="left" size="18"></uni-icons> <uni-icons type="left" size="18"></uni-icons>
</view> </view>
@ -48,18 +48,14 @@
<view class="s-hui">岗位{{item.roleName}}</view> <view class="s-hui">岗位{{item.roleName}}</view>
<view class="s-hui">电话{{ item.mobile || item.username }}</view> <view class="s-hui">电话{{ item.mobile || item.username }}</view>
</view> </view>
<view> <view class="bottom-box" @click="gettel(item)">
<view class="bottom-box" @click="gettel(item)"> <uni-icons type="phone-filled" color="#0D2E8D" size="18"></uni-icons>
<uni-icons type="phone-filled" color="#0D2E8D" size="18"></uni-icons> <text>电话</text>
<text>电话</text> <!-- @click="getdelete(item.id)" -->
<!-- @click="getdelete(item.id)" --> <!-- <text>删除</text> -->
<!-- <text>删除</text> -->
</view>
<view class="bottom-box" style="margin-top: 1rem" @click="toInfo(item)">
<text>查看详情</text>
</view>
</view> </view>
</view> </view>
</view> </view>
</checkbox-group> </checkbox-group>
@ -174,14 +170,6 @@ export default {
// this.getindex() // this.getindex()
}, },
methods: { methods: {
toInfo(item){
request({
url: '/company/staff/getByUserId?id=' + item.id,
method: 'get'
}).then(res => {
console.log(res)
})
},
gettel(num) { gettel(num) {
const value = num.mobile || num.username const value = num.mobile || num.username
uni.makePhoneCall({ uni.makePhoneCall({

View File

@ -13,10 +13,9 @@
<view class="sou" @click="getList()">搜索</view> <view class="sou" @click="getList()">搜索</view>
</view> </view>
<view class="tap"> <view class="tap">
<view class="tap-box msg-box" v-for="(item,index) in tapList" :key="index" @click="tapqh(index)"> <view class="tap-box" v-for="(item,index) in tapList" :key="index" @click="tapqh(index)">
<view class="xhuihui" :class="{'xzhei':tapindex == index}">{{ item.text }}</view> <view class="xhuihui" :class="{'xzhei':tapindex == index}">{{ item.text }}</view>
<view class="gang" v-if="tapindex == index"></view> <view class="gang" v-if="tapindex == index"></view>
<view class="msg-num">{{countMap.get(index+"")}}</view>
</view> </view>
</view> </view>
@ -187,7 +186,6 @@ export default {
}, },
beginButtonShow: [1, 3, 4], beginButtonShow: [1, 3, 4],
cancelButtonShow: [2], cancelButtonShow: [2],
countMap: []
} }
}, },
onLoad() { onLoad() {
@ -221,14 +219,6 @@ export default {
tabBar, tabBar,
}, },
methods: { methods: {
async getCount(){
await request({
url: '/system/info/getCountByType?partnerId=' + this.partnerId,
method: 'get'
}).then(res => {
this.countMap = new Map(Object.entries(res.data))
})
},
confirms(e) { confirms(e) {
this.takingData.workNodeId = e.value[0].value this.takingData.workNodeId = e.value[0].value
this.show = false this.show = false
@ -322,8 +312,6 @@ export default {
let total = res.total let total = res.total
this.totalPages = Math.ceil(total / this.pageSize); this.totalPages = Math.ceil(total / this.pageSize);
} }
await this.getCount()
}, },
getfan() { getfan() {
uni.navigateBack() uni.navigateBack()
@ -474,16 +462,14 @@ export default {
font-family: Source Han Sans CN-Regular, Source Han Sans CN; font-family: Source Han Sans CN-Regular, Source Han Sans CN;
font-weight: 400; font-weight: 400;
color: #666666; color: #666666;
margin-left: 0.5rem;
} }
.gang { .gang {
width: 32px; width: 24px;
height: 4px; height: 4px;
background: #0D2E8D; background: #0D2E8D;
border-radius: 4px; border-radius: 4px;
margin: 2px auto; margin: 2px auto;
margin-left: 1rem;
} }
.xzhei { .xzhei {
@ -640,24 +626,4 @@ export default {
white-space: pre-line; /* 保留换行符,但允许文本换行 */ white-space: pre-line; /* 保留换行符,但允许文本换行 */
word-break: break-all; /* 长单词或 URL 会在必要时断开 */ word-break: break-all; /* 长单词或 URL 会在必要时断开 */
} }
.msg-box {
position: relative;
margin-right: 40rpx;
.msg-num {
position: absolute;
right: -29rpx;
color: white;
background: #d74a43;
width: 35rpx;
height: 35rpx;
line-height: 35rpx;
text-align: center;
font-weight: 800;
font-size: 11px;
border-radius: 50%;
top: -20rpx;
}
}
</style> </style>

View File

@ -59,10 +59,6 @@
</view> </view>
</view> </view>
<view class="circle-notification" v-if="ifSend">
+
</view>
<view style="width: 100%; height: 50px;"></view> <view style="width: 100%; height: 50px;"></view>
<tabBar ref="tarBar" :msg="msg"></tabBar> <tabBar ref="tarBar" :msg="msg"></tabBar>
</view> </view>
@ -109,7 +105,6 @@ export default {
} }
], ],
tapindex: 0, tapindex: 0,
ifSend: false
} }
}, },
@ -127,23 +122,21 @@ export default {
}, },
onLoad(data) { onLoad(data) {
this.partnerId = uni.getStorageSync('partnerId') this.partnerId = uni.getStorageSync('partnerId')
if (data && data.index) { if (data && data.index){
this.tapindex = parseInt(data.index) this.tapindex = parseInt(data.index)
this.getwarnMsglist() this.getwarnMsglist()
} else { }else {
this.getlistindex() this.getlistindex()
this.getIfSend()
} }
// this.interval = setInterval(() => { // this.interval = setInterval(() => {
// this.getlistindex() // this.getlistindex()
// }, 3000); // }, 3000);
}, },
onShow() { onShow() {
if (this.tapindex === 1) { if (this.tapindex === 1){
this.getwarnMsglist() this.getwarnMsglist()
} else { }else {
this.getlistindex() this.getlistindex()
this.getIfSend()
} }
// this.getlistindex() // this.getlistindex()
// this.imgs = this.$baseUrl // this.imgs = this.$baseUrl
@ -154,25 +147,17 @@ export default {
tabBar, tabBar,
}, },
methods: { methods: {
getIfSend() { clearAll(){
request({
url: '/system/inspectionNews/ifSend',
method: 'get'
}).then(res => {
this.ifSend = res.data
})
},
clearAll() {
let that = this let that = this
uni.showModal({ uni.showModal({
title: '确认', title: '确认',
content: '确认全部已读吗?', content: '确认全部已读吗?',
success: function (res) { success: function (res) {
if (res.confirm) { if (res.confirm){
request({ request({
url: '/warnMsg/warnMsg/readAll', url: '/warnMsg/warnMsg/readAll',
method: 'get' method: 'get'
}).then(res => { }).then(res=>{
that.getwarnMsglist() that.getwarnMsglist()
}) })
} }
@ -525,27 +510,9 @@ export default {
border-radius: 4px; border-radius: 4px;
margin: 2px auto; margin: 2px auto;
} }
.clear-icon{
.clear-icon {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
border-radius: 50%; border-radius: 50%;
} }
.circle-notification {
display: flex;
width: 50px; /* 圆形的直径 */
height: 50px; /* 圆形的直径 */
border-radius: 50%; /* 使元素变为圆形 */
background-color: #007bff; /* 背景颜色,可以根据需要更改 */
color: white; /* 文字颜色,可以根据需要更改 */
align-items: center; /* 垂直居中内容 */
justify-content: center; /* 水平居中内容 */
text-align: center; /* 让文本在每一行都居中 */
font-size: 25px; /* 文字大小,根据需要调整 */
position: fixed; /* 固定位置 */
bottom: 10rem; /* 从底部距离 */
right: 2rem; /* 从右边距离 */
z-index: 1000;
}
</style> </style>