From 5e19b759566b2bf0aed0771206cea54aaba0874e Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期二, 28 十一月 2023 11:28:37 +0800
Subject: [PATCH] bug修改
---
xcx/robePages/safeManage/approveHidden.vue | 1 +
web/src/views/SecureManage/NipCheck/components/ScoreDetails.vue | 2 +-
web/src/views/SecureManage/NipCheck/NipTips.vue | 7 +++++--
xcx/robePages/safeManage/addHidden.vue | 2 +-
web/src/components/uploadImage.vue | 8 ++++++--
web/src/views/SecureManage/NipCheck/components/ScoreMarket.vue | 5 +++++
6 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/web/src/components/uploadImage.vue b/web/src/components/uploadImage.vue
index b37dbec..870d7ec 100644
--- a/web/src/components/uploadImage.vue
+++ b/web/src/components/uploadImage.vue
@@ -1,5 +1,5 @@
<template>
- <div class="upload_index" style="height:132px">
+ <div class="upload_index" style="height:132px;width:100%">
<transition-group name="el-zoom-in-center" class="upload_index">
<div v-for="(item) in fileList" :key="item.id" class="file_lists_style" @mouseenter="showClose(item)" @mouseleave="setClose">
<div :class="{close_icon:close == item.id, close_icons:close != item.id}">
@@ -19,7 +19,8 @@
<el-upload
:key="5762"
ref="upload"
- class="upload_images"
+ class="upload_images"
+ :class="{'noshow':disabled===true}"
:action="action"
:http-request="requestUpload"
:show-file-list="false"
@@ -208,6 +209,9 @@
position: relative;
border: 2px dashed #39B5FE;
}
+ .noshow{
+ display: none;
+ }
.avatar_uploader_icon{
font-size: 28px;
diff --git a/web/src/views/SecureManage/NipCheck/NipTips.vue b/web/src/views/SecureManage/NipCheck/NipTips.vue
index 21f07f7..07d4fc9 100644
--- a/web/src/views/SecureManage/NipCheck/NipTips.vue
+++ b/web/src/views/SecureManage/NipCheck/NipTips.vue
@@ -38,7 +38,7 @@
<el-table-column label="操作" align="center" width="250">
<template #default="{ row }">
<el-button class="table_btn" size="mini" v-if="showButton('update')" @click="updateProp(row)">修改</el-button>
- <el-button class="delete_btn" size="mini" v-if="showButton('delete')" @click="deleteInfo(row)">删除</el-button>
+ <!-- <el-button class="delete_btn" size="mini" v-if="showButton('delete')" @click="deleteInfo(row)">删除</el-button> -->
<el-button class="table_btn" size="mini" v-if="showButton('update')&&row.auditStatus!==1" @click="checkHidden(row)">审核</el-button>
</template>
</el-table-column>
@@ -161,7 +161,7 @@
dangerLocation: [{
required: true,
message: '请输入隐患地点',
- trigger: 'blur'
+ trigger: 'change'
}],
title: [{
required: true,
@@ -192,6 +192,7 @@
optionsType:[],//设备类型
optionsDevice:[],//设备名称
optionsUser:[],//负责人
+ dictId:null,
}
},
watch: {
@@ -309,6 +310,7 @@
this.$api.Safety.detailsHiddenInfo({id: row.id}).then(res=>{
if(res.statusMsg === 'ok'){
this.ruleForm = res.data
+ this.dictId = res.data.dictId
res.data.imgEntities.map(item=>{
this.imageList.push({
id: this.imageList.length + 1,
@@ -377,6 +379,7 @@
arrTitle.push({imgPath:item.name})
})
params.imgEntities = arrTitle
+ params.dictId = this.dictId
this.$api.Safety.updateHiddenInfo(params).then((res) => {
if(res.statusMsg === 'ok') {
this.asyncVisible = false;
diff --git a/web/src/views/SecureManage/NipCheck/components/ScoreDetails.vue b/web/src/views/SecureManage/NipCheck/components/ScoreDetails.vue
index fe8acde..11224b1 100644
--- a/web/src/views/SecureManage/NipCheck/components/ScoreDetails.vue
+++ b/web/src/views/SecureManage/NipCheck/components/ScoreDetails.vue
@@ -279,7 +279,7 @@
params.endTime = this.search.time&&this.search.time[1]
delete params.time
this.functionLoading();
- this.$api.Safety.exportMarketFiles(params).then(res => {
+ this.$api.Safety.exportIntegralFiles(params).then(res => {
downFiles(res, '积分明细信息', 'xls')
this.loadingView.close()
})
diff --git a/web/src/views/SecureManage/NipCheck/components/ScoreMarket.vue b/web/src/views/SecureManage/NipCheck/components/ScoreMarket.vue
index 57960a2..7afe167 100644
--- a/web/src/views/SecureManage/NipCheck/components/ScoreMarket.vue
+++ b/web/src/views/SecureManage/NipCheck/components/ScoreMarket.vue
@@ -52,6 +52,11 @@
</template>
</el-table-column>
<el-table-column prop="createTime" label="时间" align="center" width="150"></el-table-column>
+ <el-table-column prop="userType" label="人员类型" align="center" >
+ <template #default="{row}">
+ <div>{{optionsType[row.userType-1]&&optionsType[row.userType - 1].label}}</div>
+ </template>
+ </el-table-column>
<el-table-column prop="realName" label="人员姓名" align="center" ></el-table-column>
<el-table-column prop="integralWater" label="积分分值" align="center" >
<template #default="{row}">
diff --git a/xcx/robePages/safeManage/addHidden.vue b/xcx/robePages/safeManage/addHidden.vue
index 4e5f9e5..0d331b7 100644
--- a/xcx/robePages/safeManage/addHidden.vue
+++ b/xcx/robePages/safeManage/addHidden.vue
@@ -42,7 +42,7 @@
borderBottom>
<u--textarea v-model="formCheck.title" placeholder="请输入隐患标题" height="100"></u--textarea>
</u-form-item>
- <div>{{value}}</div>
+ <!-- <div>{{value}}</div> -->
</view>
</u-form>
<view class="submit_bnt">
diff --git a/xcx/robePages/safeManage/approveHidden.vue b/xcx/robePages/safeManage/approveHidden.vue
index dd28690..c773cc1 100644
--- a/xcx/robePages/safeManage/approveHidden.vue
+++ b/xcx/robePages/safeManage/approveHidden.vue
@@ -52,6 +52,7 @@
v-model="formCheck.level"
placeholder="请选择隐患等级"
disabledColor="#FFFFFF"
+ disabled
border="none">
</u-input>
<u-icon
--
Gitblit v1.9.3