wangchengming/voltage_Safety_Vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
wangchengming 2025-07-23 20:46:04 +08:00
parent 2e3a28b8f0
commit ead55b6a7e
18 changed files with 67 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/api/siteMessage.js
View File

@ -6,9 +6,9 @@ export function getSiteMessagePage(query) {
url: '/siteMessage/pageList',
method: 'get',
params: query,
headers: {
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
}
// headers: {
// 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
// }
})
}
@ -16,11 +16,8 @@ export function getSiteMessagePage(query) {
export function updateSiteMessageStatus(query) {
return request({
url: '/siteMessage/getSiteMessage',
method: 'get',
pamras: query,
headers: {
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
}
method: 'POST',
data: query
})
}
@ -28,10 +25,7 @@ export function updateSiteMessageStatus(query) {
export function oneClickClear(query) {
return request({
url: '/siteMessage/oneClickClear',
method: 'get',
pamras: query,
headers: {
'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
}
method: 'POST',
data: query
})
}

37
src/layout/components/Navbar.vue
View File

@ -137,7 +137,7 @@ const activeIndex = ref(0)
// 消息列表查询条件
const tableParamsQuery = ref({
readFlag: 0,
pageNum: 1,
pageIndex: 1,
pageSize: 10
})
const messageDateList = ref([])
@ -178,7 +178,7 @@ const handleChageTab = (index) => {
}
// 查看更多
const handleLoadMore = () => {
tableParamsQuery.value.pageNum = tableParamsQuery.value.pageNum + 1
tableParamsQuery.value.pageIndex = tableParamsQuery.value.pageIndex + 1
tableParamsQuery.value.readFlag = activeIndex.value
if (activeIndex.value == 0) getMessage()
else getReadMessage()
@ -187,12 +187,12 @@ const handleLoadMore = () => {
const InitDot = () => {
const search = {
readFlag: 0,
pageNum: 1,
pageIndex: 1,
pageSize: 1
}
getSiteMessagePage(search).then(res => {
if (res.code == 200) {
isShowDot.value = res.rows.length > 0 ? true : false
isShowDot.value = res.data.list.length > 0 ? true : false
} else {
isShowDot.value = false
}
@ -200,10 +200,10 @@ const InitDot = () => {
}
// 查询未读消息
const InitMessage = () => {
tableParamsQuery.value.pageNum = 1
tableParamsQuery.value.pageIndex = 1
getSiteMessagePage(tableParamsQuery.value).then(res => {
if (res.code == 200) {
messageDateList.value = res.rows
messageDateList.value = res.data.list
}
})
}
@ -211,13 +211,13 @@ const InitMessage = () => {
const getMessage = () => {
getSiteMessagePage(tableParamsQuery.value).then(res => {
if (res.code == 200) {
if (res.rows.length > 0) {
messageDateList.value = messageDateList.value.concat(res.rows);
if (res.data.list.length > 0) {
messageDateList.value = messageDateList.value.concat(res.data.list);
}
else {
proxy.$modal.msgSuccess(`没有更多了...`)
if (tableParamsQuery.value.pageNum != 1) {
tableParamsQuery.value.pageNum = tableParamsQuery.value.pageNum - 1
if (tableParamsQuery.value.pageIndex != 1) {
tableParamsQuery.value.pageIndex = tableParamsQuery.value.pageIndex - 1
}
}
}
@ -225,10 +225,10 @@ const getMessage = () => {
}
// 查询已读消息
const InitReadMessage = () => {
tableParamsQuery.value.pageNum = 1
tableParamsQuery.value.pageIndex = 1
getSiteMessagePage(tableParamsQuery.value).then(res => {
if (res.code == 200) {
messageDateList.value = res.rows;
messageDateList.value = res.data.list;
}
})
}
@ -236,13 +236,13 @@ const InitReadMessage = () => {
const getReadMessage = () => {
getSiteMessagePage(tableParamsQuery.value).then(res => {
if (res.code == 200) {
if (res.rows.length > 0) {
messageDateList.value = messageDateList.value.concat(res.rows);
if (res.data.list.length > 0) {
messageDateList.value = messageDateList.value.concat(res.data.list);
}
else {
proxy.$modal.msgSuccess(`没有更多了...`)
if (tableParamsQuery.value.pageNum != 1) {
tableParamsQuery.value.pageNum = tableParamsQuery.value.pageNum - 1
if (tableParamsQuery.value.pageIndex != 1) {
tableParamsQuery.value.pageIndex = tableParamsQuery.value.pageIndex - 1
}
}
}
@ -261,7 +261,7 @@ const handleClearAll = () => {
}
// 跳转
const handleOpenLink = (messageId, msgType) => {
updateSiteMessageStatus({ id: messageId }).then(res => {
updateSiteMessageStatus({ id: messageId, readFlag: 1 }).then(res => {
if (res.code == 200) {
// 新用户注册审核提醒 esc
if (msgType == 10) router.push('/system/userApproval')
@ -273,6 +273,7 @@ const handleOpenLink = (messageId, msgType) => {
if (msgType == 40) router.push('/safetyReview/examinerEscTask')
// 工具过期 esc
if (msgType == 50) router.push('/ppeTool')
closeMessage()
} else {
proxy.$modal.msgError(`操作失败...`)
}
@ -280,7 +281,7 @@ const handleOpenLink = (messageId, msgType) => {
}
// 标记已读
const handleReadMessage = (messageId) => {
updateSiteMessageStatus({ id: messageId }).then(res => {
updateSiteMessageStatus({ id: messageId, readFlag: 1 }).then(res => {
if (res.code == 200) {
if (activeIndex.value == 0) InitMessage()
else InitReadMessage()

4
src/router/index.js
View File

@ -450,7 +450,7 @@ export const dynamicRoutes = [
path: '/databaseLibaryForm',
component: Layout,
hidden: true,
permissions: ['safetyReview:examinerTasks:add'],
permissions: ['databaseLibary:edit', 'databaseLibary:orgUpdate'],
children: [
{
path: ':Id(\\d+)?',
@ -492,7 +492,7 @@ export const dynamicRoutes = [
path: '/system/userApprovalDetail',
component: Layout,
hidden: true,
permissions: ['system:userApproval:approval'],
permissions: ['system:userApproval:viewDetail'],
children: [
{
path: ':userId(\\d+)',

30
src/views/login.vue
View File

@ -81,7 +81,7 @@ import systemLogo2 from '@/assets/images/systemLogo2.png'
// 初始化
onMounted(() => {
getCode();
// getCode();
getCookie();
// 设置初始值
carouselHeight.value = window.innerHeight; // 屏幕高度
@ -107,8 +107,8 @@ const router = useRouter()
const { proxy } = getCurrentInstance()
const loginForm = ref({
username: "admin",
password: "admin123",
username: "",
password: "",
rememberMe: false,
code: "",
uuid: ""
@ -172,23 +172,23 @@ function handleLogin() {
}).catch(() => {
loading.value = false
// 重新获取验证码
if (captchaEnabled.value) {
getCode()
}
// if (captchaEnabled.value) {
// getCode()
// }
})
}
})
}
const getCode = () => {
getCodeImg().then(res => {
captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled
if (captchaEnabled.value) {
codeUrl.value = "data:image/gif;base64," + res.img
loginForm.value.uuid = res.uuid
}
})
}
// const getCode = () => {
// getCodeImg().then(res => {
// captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled
// if (captchaEnabled.value) {
// codeUrl.value = "data:image/gif;base64," + res.img
// loginForm.value.uuid = res.uuid
// }
// })
// }
const getCookie = () => {
const username = Cookies.get("username")

9
src/views/qualification/escApproval/approvalDetail.vue
View File

@ -136,14 +136,7 @@
@click.stop="handleCardPreview(beforeConditionInfo.certificatePhoto)" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="资质申请表单">
<img :src="beforeConditionInfo.qualificationForm.split('.').pop() == 'pdf' ? pdfIcon : baseUrl + beforeConditionInfo.qualificationForm"
class="avatar viewFile"
@click.stop="handleCardPreview(beforeConditionInfo.qualificationForm)" />
</el-form-item>
</el-col>
</el-col>
</el-row>
</div>
<div v-if="detailForm.qualificationId == 'ES'">

7
src/views/qualification/escTask/components/LableApply.vue
View File

@ -63,9 +63,10 @@
<el-button type="primary" text class="replayTextBtn" v-if="scope.row.state == 9"
v-hasPermi="['qualification:lableApplyForm']" @click="handleReplay(scope.row)">重新申请</el-button>
<el-divider direction="vertical" class="verticalLine" v-if="scope.row.state == 9" />
<router-link :to="'/lable/viewDetail/' + scope.row.id" custom
v-slot="{ href }">
<a v-hasPermi="['qualification:viewDetail']" class="replayTextBtn" :href="href" target="_blank">查看</a>
<router-link :to="'/lable/viewDetail/' + scope.row.id" custom v-slot="{ href }">
<el-button type="primary" text class="replayTextBtn" v-hasPermi="['qualification:viewDetail']">
<a class="replayTextBtn" :href="href" target="_blank">查看</a>
</el-button>
</router-link>
<el-divider direction="vertical" class="verticalLine" v-if="scope.row.state == 1" />
<el-button type="primary" text class="deleteTextBtn" v-if="scope.row.state == 1"

7
src/views/qualification/escTask/components/QualificationApply.vue
View File

@ -67,9 +67,10 @@
<el-button type="primary" text class="replayTextBtn" v-if="scope.row.state == 9"
v-hasPermi="['qualification:qualificationApply']" @click="handleReplay(scope.row)">重新申请</el-button>
<el-divider direction="vertical" class="verticalLine" v-if="scope.row.state == 9" />
<router-link :to="'/qualification/viewDetail/' + scope.row.id"
custom v-slot="{ href }">
<a v-hasPermi="['qualification:viewDetail']" class="replayTextBtn" :href="href" target="_blank">查看</a>
<router-link :to="'/qualification/viewDetail/' + scope.row.id" custom v-slot="{ href }">
<el-button type="primary" text class="replayTextBtn" v-hasPermi="['qualification:viewDetail']">
<a class="replayTextBtn" :href="href" target="_blank">查看</a>
</el-button>
</router-link>
<el-divider direction="vertical" class="verticalLine" v-if="scope.row.state == 1" />
<el-button type="primary" text class="deleteTextBtn" v-if="scope.row.state == 1"

8
src/views/qualification/escTask/components/QualificationApplyForm.vue
View File

@ -109,13 +109,7 @@
<myFileUpload ref="certificatePhotoRef"
@set-form-file="handleSetCertificatePhoto" />
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="资质申请表单" prop="beforeCondition.qualificationForm">
<myFileUpload ref="qualificationFormRef"
@set-form-file="handleSetQualificationForm" />
</el-form-item>
</el-col> -->
</el-col>
</el-row>
</div>
<div v-if="ruleForm.qualificationId == 'ES'">

8
src/views/qualification/escTask/components/QualificationReApplyForm.vue
View File

@ -108,13 +108,7 @@
<myFileUpload ref="certificatePhotoRef"
@set-form-file="handleSetCertificatePhoto" />
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="资质申请表单" prop="beforeCondition.qualificationForm">
<myFileUpload ref="qualificationFormRef"
@set-form-file="handleSetQualificationForm" />
</el-form-item>
</el-col> -->
</el-col>
</el-row>
</div>
<div v-if="ruleForm.qualificationId == 'ES'">

7
src/views/qualification/myQualifications/components/LableApply.vue
View File

@ -34,9 +34,10 @@
<el-button type="primary" text class="replayTextBtn" v-if="scope.row.state == 9"
v-hasPermi="['qualification:lableApplyForm']" @click="handleReplay(scope.row)">重新申请</el-button>
<el-divider direction="vertical" class="verticalLine" v-if="scope.row.state == 9" />
<router-link :to="'/lable/viewDetail/' + scope.row.id"
custom v-slot="{ href }">
<a v-hasPermi="['qualification:viewDetail']" class="replayTextBtn" :href="href" target="_blank">查看</a>
<router-link :to="'/lable/viewDetail/' + scope.row.id" custom v-slot="{ href }">
<el-button type="primary" text class="replayTextBtn" v-hasPermi="['qualification:viewDetail']">
<a class="replayTextBtn" :href="href" target="_blank">查看</a>
</el-button>
</router-link>
<el-divider direction="vertical" class="verticalLine" v-if="scope.row.state == 1" />
<el-button type="primary" text class="deleteTextBtn" v-if="scope.row.state == 1"

6
src/views/qualification/myQualifications/components/QualificationApply.vue
View File

@ -36,8 +36,10 @@
@click="handleReplay(scope.row)">重新申请</el-button>
<el-divider direction="vertical" class="verticalLine" v-if="scope.row.state == 9" />
<router-link :to="'/qualification/viewDetail/' + scope.row.id" custom v-slot="{ href }">
<a v-hasPermi="['qualification:viewDetail']" class="replayTextBtn" :href="href"
target="_blank">查看</a>
<el-button type="primary" text class="replayTextBtn" v-hasPermi="['qualification:viewDetail']">
<a class="replayTextBtn" :href="href"
target="_blank">查看</a>
</el-button>
</router-link>
<el-divider direction="vertical" class="verticalLine" v-if="scope.row.state == 1" />
<el-button type="primary" text class="deleteTextBtn" v-if="scope.row.state == 1"

7
src/views/qualification/myQualifications/components/QualificationApplyForm.vue
View File

@ -88,12 +88,7 @@
<el-form-item label="电工证照片" prop="beforeCondition.certificatePhoto">
<myFileUpload ref="certificatePhotoRef" @set-form-file="handleSetCertificatePhoto" />
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="资质申请表单" prop="beforeCondition.qualificationForm">
<myFileUpload ref="qualificationFormRef" @set-form-file="handleSetQualificationForm" />
</el-form-item>
</el-col> -->
</el-col>
</el-row>
</div>
<div v-if="ruleForm.qualificationId == 'ES'">

9
src/views/qualification/myQualifications/components/QualificationDetailForm.vue
View File

@ -136,14 +136,7 @@
@click.stop="handleCardPreview(beforeConditionInfo.certificatePhoto)" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="资质申请表单">
<img :src="beforeConditionInfo.qualificationForm.split('.').pop() == 'pdf' ? pdfIcon : baseUrl + beforeConditionInfo.qualificationForm"
class="avatar viewFile"
@click.stop="handleCardPreview(beforeConditionInfo.qualificationForm)" />
</el-form-item>
</el-col>
</el-col>
</el-row>
</div>
<div v-if="detailForm.qualificationId == 'ES'">

5
src/views/qualification/myQualifications/components/QualificationReApplyForm.vue
View File

@ -89,11 +89,6 @@
<myFileUpload ref="certificatePhotoRef" @set-form-file="handleSetCertificatePhoto" />
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="资质申请表单" prop="beforeCondition.qualificationForm">
<myFileUpload ref="qualificationFormRef" @set-form-file="handleSetQualificationForm" />
</el-form-item>
</el-col> -->
</el-row>
</div>
<div v-if="ruleForm.qualificationId == 'ES'">

7
src/views/qualification/trainApproval/approvalDetail.vue
View File

@ -137,13 +137,6 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="资质申请表单">
<img :src="beforeConditionInfo.qualificationForm.split('.').pop() == 'pdf' ? pdfIcon : baseUrl + beforeConditionInfo.qualificationForm"
class="avatar viewFile"
@click.stop="handleCardPreview(beforeConditionInfo.qualificationForm)" />
</el-form-item>
</el-col>
</el-row>
</div>
<div v-if="detailForm.qualificationId == 'ES'">

7
src/views/qualification/trainApproval/approvalForm.vue
View File

@ -137,13 +137,6 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="资质申请表单">
<img :src="beforeConditionInfo.qualificationForm.split('.').pop() == 'pdf' ? pdfIcon : baseUrl + beforeConditionInfo.qualificationForm"
class="avatar viewFile"
@click.stop="handleCardPreview(beforeConditionInfo.qualificationForm)" />
</el-form-item>
</el-col>
</el-row>
</div>
<div v-if="detailForm.qualificationId == 'ES'">

2
src/views/system/section/index.vue
View File

@ -18,7 +18,7 @@
</el-form>
<div class="optionBtn">
<el-button type="primary" class="qualificationApplyBtn" @click="handleAdd"
v-hasPermi="['system:locality:add']">
v-hasPermi="['system:section:add']">
<img :src="addIcon" class="custom-icon" />
新增
</el-button>

4
src/views/system/userApproval/index.vue
View File

@ -76,9 +76,9 @@
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<template #default="scope">
<el-button type="primary" text class="replayTextBtn" v-if="scope.row.status != 2"
<el-button type="primary" text class="replayTextBtn" v-if="scope.row.status != 2" v-hasPermi="['system:userApproval:viewDetail']"
@click="handleView(scope.row)">查看</el-button>
<el-button type="primary" v-if="scope.row.status == 2" text class="replayTextBtn"
<el-button type="primary" v-if="scope.row.status == 2" v-hasPermi="['system:userApproval:approval']" text class="replayTextBtn"
@click="handleApproval(scope.row)">审批</el-button>
</template>
</el-table-column>