叶松
2023-11-28 5e19b759566b2bf0aed0771206cea54aaba0874e
bug修改
已修改6个文件
25 ■■■■ 文件已修改
web/src/components/uploadImage.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/SecureManage/NipCheck/NipTips.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/SecureManage/NipCheck/components/ScoreDetails.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/SecureManage/NipCheck/components/ScoreMarket.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
xcx/robePages/safeManage/addHidden.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
xcx/robePages/safeManage/approveHidden.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
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;
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()
        })
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}">
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">
xcx/robePages/safeManage/approveHidden.vue
@@ -52,6 +52,7 @@
                        v-model="formCheck.level"
                        placeholder="请选择隐患等级"
                        disabledColor="#FFFFFF"
                        disabled
                        border="none">
                    </u-input>
                    <u-icon