Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

Lou

2024-02-23 e8e3b23975184a333cf8a53c3c6e3bc15e8b1d93

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

 src/views/article/article.vue

@@ -1,10 +1,9 @@
<template>
    <basic-container>
        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" ref="crud" @row-del="rowDel"
            v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave"
            :before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
            @refresh-change="refreshChange" @on-load="onLoad">
      v-model="form" :permission="permissionList" @row-update="rowUpdate" @row-save="rowSave" :before-open="beforeOpen"
      @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
            <template slot="menuLeft">
                <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
                    除
@@ -22,12 +21,10 @@
                <el-button icon="el-icon-circle-plus-outline" :size="size" :type="type" @click.stop="openDilog(row, 1)">
                    创建议题
                </el-button> -->
                <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type"
                    @click.stop="updateFb(row)">
        <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
                    撤销
                </el-button>
                <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type"
                    @click.stop="updateFb(row)">
        <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
                    发布
                </el-button>
            </template>
@@ -140,8 +137,7 @@
                selection: true,
                excelBtn: true,
                dialogClickModal: false,
                column: [
                    {
          column: [{
                        overHidden: true,
                        label: "文章标题",
                        prop: "title",
@@ -221,25 +217,25 @@
                            trigger: "blur",
                        },],
                    },
                    {
                        label: "发布时间",
                        prop: "dateTime",
                        type: "daterange",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
                        searchSpan: 6,
                        searchRange: true,
                        hide: true,
                        addDisplay: false,
                        editDisplay: false,
                        viewDisplay: false,
                        search: true,
                        rules: [{
                            required: true,
                            message: "请选择发布时间",
                            trigger: "blur",
                        },],
                    },
            // {
            //   label: "发布时间",
            //   prop: "dateTime",
            //   type: "daterange",
            //   format: "yyyy-MM-dd",
            //   valueFormat: "yyyy-MM-dd",
            //   searchSpan: 6,
            //   searchRange: true,
            //   hide: true,
            //   addDisplay: false,
            //   editDisplay: false,
            //   viewDisplay: false,
            //   search: true,
            //   rules: [{
            //     required: true,
            //     message: "请选择发布时间",
            //     trigger: "blur",
            //   }, ],
            // },
                    {
                        width: 100,
                        label: "发布时间",
@@ -247,6 +243,10 @@
                        type: "date",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd HH:mm:ss",
              search: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
                    },
                    {
                        width: 100,

 src/views/publicSecurity/keynotePlaceManage.vue

@@ -54,7 +54,7 @@
                <div class="icon">{{ refreshNum }}</div>
                基础信息
            </div>
            <div class="basic-info">
            <div class="basic-info" v-loading="drawerLoading">
                <div class="info-item">
                    <div class="info-name">场所名称</div>
                    <div class="info-value">{{ rowDetail.placeName }}</div>
@@ -77,7 +77,8 @@
                检查记录
            </div>

            <div class="question-list" v-for="(tItem, tIndex) in rowDetail.qTypeList" :key='tIndex'>
            <div class="question-list" v-for="(tItem, tIndex) in rowDetail.qTypeList" :key='tIndex'
                v-loading="drawerLoading">
                <div class="question-type" @click="flodQL(tIndex)">
                    <div class="type-name">
                        {{ CNNum[tIndex] }}、{{ tItem.questionName }}
@@ -203,7 +204,7 @@
            form: {},
            query: {},
            loading: true,

            drawerLoading: false,
            page: {
                pageSize: 10,
                currentPage: 1,
@@ -355,7 +356,8 @@
            auditBasePopup: false,
            questionTypeList: [],
            CNNum: ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二', '十三', '十四', '十五'],
            nineTypeList: []
            nineTypeList: [],
            radio: '1',
        }
    },

@@ -473,6 +475,8 @@
        },

        getDetail (rowData) {
            this.drawerLoading = true
            this.isDetail = true
            getTaskPlaceSelfCheckInfo({ taskId: rowData.taskId }).then(res => {
                let row = res.data.data
                if (row.taskPlaceRecordVOList) {
@@ -514,7 +518,7 @@
                // 九小类型转换
                row.nineTypeName = this.switchNineType(row.nineType)
                this.rowDetail = row
                this.isDetail = true
                this.drawerLoading = false
            })

        },
@@ -846,6 +850,30 @@
    background: transparent !important;
}

:deep(.el-radio__input.is-disabled+span.el-radio__label) {
    color: #000;
}

:deep(.el-radio__input.is-checked+.el-radio__label) {
    color: #409EFF !important;
}

:deep(.el-radio__input.is-checked .el-radio__inner::after) {
    background-color: #FFF;
}

:deep(.el-radio__input.is-checked .el-radio__inner) {
    background-color: #409EFF;
}

:deep(.avue-crud__img) {
    height: 30px !important;
}

:deep(.el-radio) {
    margin-right: 20px;
}

.avue-upload__icon {
    line-height: 6;
}