Merge remote-tracking branch 'origin/master'

fuliqi

2024-03-18 f18ff6df94830a0147f372f031fa94ab5402ead8

 src/views/system/publish/index.vue

@@ -9,9 +9,9 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="考核范围" prop="timeRange">
      <el-form-item label="考核范围" prop="examineRange">
        <el-select
          v-model="queryParams.timeRange"
          v-model="queryParams.examineRange"
          placeholder="考核范围"
          clearable
          style="width: 170px"
@@ -39,6 +39,7 @@
          />
        </el-select>
      </el-form-item>

      <el-form-item label="考核状态" prop="state">
        <el-select
          v-model="queryParams.state"
@@ -69,7 +70,6 @@
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['system:publish:add']"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -80,7 +80,6 @@
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['system:publish:edit']"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -91,18 +90,7 @@
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['system:publish:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['system:publish:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
@@ -110,9 +98,9 @@
    <el-table v-loading="loading" :data="publishList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="考核名" align="center" prop="examineName" />
      <el-table-column label="考核范围" align="center" prop="timeRange" >
      <el-table-column label="考核范围" align="center" prop="examineRange" >
        <template slot-scope="scope">
          <dict-tag :options="dict.type.platform_examine_range" :value="scope.row.timeRange"/>
          <dict-tag :options="dict.type.platform_examine_range" :value="scope.row.examineRange"/>
        </template>
      </el-table-column>
      <el-table-column label="考核频率" align="center" prop="frequency">
@@ -120,30 +108,44 @@
        <dict-tag :options="dict.type.platform_examine_frequency" :value="scope.row.frequency"/>
      </template>
      </el-table-column>
      <el-table-column label="报警分数阈值" align="center" prop="alarmScore" />
      <el-form-item label="报警分数阈值" prop="alarmScore">
        <el-input v-model="form.alarmScore" placeholder="请输入分数" />
      </el-form-item>
      <el-table-column label="考核状态" align="center" prop="state">
      <template slot-scope="scope">
        <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.state"/>
      </template>
      </el-table-column>
      <el-table-column label="创建人" align="center" prop="createUser" />
      <el-table-column label="创建时间" align="center" prop="createTime" />
      <el-table-column label="修改人" align="center" prop="updateUser" />
      <el-table-column label="修改时间" align="center" prop="updateTime" />
      <el-table-column label="修改人" align="center" prop="updateUserName" />
      <el-table-column label="修改时间" align="center" prop="updateTime" width="170px" />
      <el-table-column label="审核状态" align="center" prop="auditState">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.platform_audit_state" :value="scope.row.auditState"/>
        </template>
      </el-table-column>
      <el-table-column label="审核人" align="center" prop="auditUser" />
      <el-table-column label="审核时间" align="center" prop="auditTime" width="170px"/>
      <el-table-column label="审核意见" align="center" prop="auditDescription" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-s-check"
            @click="handleAudit(scope.row)"
          >审核</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:publish:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:publish:remove']"
          >删除</el-button>
        </template>
      </el-table-column>
@@ -156,16 +158,16 @@
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />

  <div>
    <!-- 添加或修改考核发布对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
        <el-form-item label="考核名" prop="examineName">
          <el-input v-model="form.examineName" placeholder="请输入考核名" />
        </el-form-item>

        <el-form-item label="考核模板" prop="templateId">
          <el-select v-model="queryParams.templateId" @change="handleQuery" clearable placeholder="考核模板">
          <el-select v-model="form.templateId" placeholder="考核模板">
            <el-option
              v-for="item in templateList"
              :key="item.id"
@@ -174,9 +176,9 @@
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="考核范围" prop="timeRange">
        <el-form-item label="考核范围" prop="examineRange">
          <el-select
            v-model="queryParams.timeRange"
            v-model="form.examineRange"
            placeholder="考核范围"
            clearable
            style="width: 170px"
@@ -185,28 +187,31 @@
              v-for="dict in dict.type.platform_examine_range"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
              :value="parseInt(dict.value)"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="考核频率" prop="frequency">
          <el-select
            v-model="queryParams.frequency"
            placeholder="考核频率"
            clearable
            style="width: 170px"
          >
        <el-form-item label="考核频率">
            <el-select
              v-model="form.frequency"
              placeholder="考核频率"
              clearable
              style="width: 170px"
            >
            <el-option
              v-for="dict in dict.type.platform_examine_frequency"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
              :value="parseInt(dict.value)"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="报警分数阈值" prop="alarmScore">
          <el-input v-model="form.alarmScore" placeholder="请输入分数" style="width: 170px"/>
        </el-form-item>
        <el-form-item label="考核状态" prop="state">
          <el-select
            v-model="queryParams.state"
            v-model="form.state"
            placeholder="考核状态"
            clearable
            style="width: 170px"
@@ -215,7 +220,7 @@
              v-for="dict in dict.type.sys_normal_disable"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
              :value="parseInt(dict.value)"
            />
          </el-select>
        </el-form-item>
@@ -228,15 +233,103 @@
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>

    <!-- 审核考核发布对话框 -->
    <el-dialog :title="title" :visible.sync="auditOpen" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
        <el-form-item label="考核名" prop="examineName">
          <el-input v-model="form.examineName" placeholder="请输入考核名" disabled/>
        </el-form-item>
        <el-form-item label="考核模板" prop="templateId">
          <el-select v-model="form.templateId" placeholder="考核模板" disabled>
            <el-option
              v-for="item in templateList"
              :key="item.id"
              :label="item.value"
              :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="考核范围" prop="examineRange" >
          <el-select
            v-model="form.examineRange"
            placeholder="考核范围"
            clearable
            style="width: 170px"
            disabled
          >
            <el-option
              v-for="dict in dict.type.platform_examine_range"
              :key="dict.value"
              :label="dict.label"
              :value="parseInt(dict.value)"
            />
          </el-select>
        </el-form-item>

        <el-form-item label="考核频率" prop="frequency" >
          <el-select
            v-model="form.frequency"
            placeholder="考核频率"
            clearable
            style="width: 170px"
            disabled
          >
            <el-option
              v-for="dict in dict.type.platform_examine_frequency"
              :key="dict.value"
              :label="dict.label"
              :value="parseInt(dict.value)"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="报警分数阈值" prop="alarmScore">
          <el-input v-model="form.alarmScore" placeholder="请输入分数" style="width: 170px"  disabled/>
        </el-form-item>
        <el-form-item label="考核状态" prop="state">
          <el-select
            v-model="form.state"
            placeholder="考核状态"
            clearable
            style="width: 170px"
            disabled
          >
            <el-option
              v-for="dict in dict.type.sys_normal_disable"
              :key="dict.value"
              :label="dict.label"
              :value="parseInt(dict.value)"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="描述" prop="description">
          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" disabled/>
        </el-form-item>
        <el-form-item label="审核结果" prop="auditState" >
          <el-radio-group v-model="form.auditState">
            <el-radio :label="1">通过</el-radio>
            <el-radio :label="2">驳回</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="审核说明" prop="auditDescription" >
          <el-input v-model="form.auditDescription" type="textarea" show-word-limit maxlength="100" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
  </div>
  </div>
</template>

<script>
import { listPublish, getPublish, delPublish, addPublish, updatePublish } from "@/api/platform/publish";

import { templateSelect } from "@/api/platform/check-template";
export default {
  name: "Publish",
  dicts: ['sys_normal_disable','platform_examine_range','platform_examine_frequency'],
  dicts: ['sys_normal_disable','platform_examine_range','platform_examine_frequency','platform_audit_state'],
  data() {
    return {
      // 遮罩层
@@ -257,6 +350,7 @@
      title: "",
      // 是否显示弹出层
      open: false,
      auditOpen: false,
      // 查询参数
      queryParams: {
        pageNum: 1,
@@ -264,7 +358,7 @@
        examineName: null,
        frequency: null,
        state: null,
        timeRange: null,
        examineRange: null,
      },
      // 考核模板
      templateList: [],
@@ -280,10 +374,10 @@
    this.getTemplateSelect();
  },
  methods: {
    /** 考核模板下拉列表 */
    getTemplateSelect() {
      // 考核模板下拉列表
      unitSelect().then((res) => {
        this.unitList = res.data;
      templateSelect().then((res) => {
        this.templateList = res.data;
      })
    },
    /** 查询考核发布列表 */
@@ -298,6 +392,7 @@
    // 取消按钮
    cancel() {
      this.open = false;
      this.auditOpen = false;
      this.reset();
    },
    // 表单重置
@@ -305,7 +400,7 @@
      this.form = {
        examineName: null,
        templateId: null,
        timeRange: null,
        examineRange: null,
        frequency: null,
        state: null,
        createTime: null,
@@ -348,6 +443,16 @@
        this.title = "修改考核发布";
      });
    },
    /** 修改按钮操作 */
    handleAudit(row) {
      this.reset();
      const id = row.id || this.ids
      getPublish(id).then(response => {
        this.form = response.data;
        this.auditOpen = true;
        this.title = "审核考核发布";
      });
    },
    /** 提交按钮 */
    submitForm() {
      this.$refs["form"].validate(valid => {
@@ -356,12 +461,14 @@
            updatePublish(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.auditOpen = false;
              this.getList();
            });
          } else {
            addPublish(this.form).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.auditOpen = false;
              this.getList();
            });
          }