Merge branch 'master' into dev-threejs

ZhangXianQiang

2024-04-29 44d9a94ceafae734add7d09628fd2ac132f0ee83

Merge branch 'master' into dev-threejs

 src/api/system/dept.js

@@ -65,3 +65,11 @@
    method: 'get'
  })
}

// 获取级联数据
export function cascader() {
  return request({
    url: '/system/dept/cascader',
    method: 'get'
  })
}

 src/views/system/calculate/order/index.vue

@@ -10,18 +10,6 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="考核频率" prop="frequency">
        <el-select v-model="queryParams.frequency" clearable @clear="handleQuery" placeholder="考核频率">
          <el-option
            label="月度考核"
            value="1">
          </el-option>
          <el-option
            label="季度考核"
            value="2">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="考核时间">
        <el-date-picker
          v-model="daterangeCheckTime"
@@ -74,15 +62,13 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-card class="box-card" v-for="(item) in checkResultList">
    <el-card class="box-card" v-for="item in checkResultList" :key="item.id">
      <div slot="header" class="clearfix">
        <span>{{ checkUnitName }}</span>
        <span>{{ item.contractName }}</span>
        <el-button style="float: right; padding: 3px 6px" type="text" @click="handleDetail(item)">详情</el-button>
        <el-button style="float: right; padding: 3px 0" type="text" @click="handleDetail(item)">打分</el-button>
      </div>
      <div class="text item">考核<span class="time">{{ examineName }}</span></div>
      <div class="text item">考核频率<span class="time">{{ "季度考核" }}</span></div>
      <div class="text item">考核分数<span class="time">{{ item.checkScore }}</span></div>
      <div class="text item">考核<span class="time">{{ item.unitName }}</span></div>
      <div class="text item">考核分数<span class="time">{{ item.score }}</span></div>
      <div class="text item">考核时间
        <span class="time">{{ item.checkTime }}</span>
        <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish != 1"  v-hasPermi="['result:contract:publish']">确认发布</el-button>
@@ -90,37 +76,6 @@
      </div>
    </el-card>

    <!-- <el-table v-loading="loading" :data="checkResultList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="考核对象" align="center" prop="checkUnitName" />
      <el-table-column label="考核" align="center" prop="examineName" />
      <el-table-column label="考核范围":formatter="examineRangeFormatter" align="center" prop="examineRange" />
      <el-table-column label="考核频率" :formatter="frequencyFormatter" align="center" prop="frequency" />
      <el-table-column label="考核分数" falign="center" prop="checkScore" />
      <el-table-column label="考核时间" align="center" prop="checkTime" />
      <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-view"
            @click="handleDetail(scope.row)"
          >详情</el-button>
         <el-button
           type="text"
           size="mini"
           icon="el-icon-edit"
           @click="handleSetManualScore(scope.row)"
         >人工打分</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
          >删除</el-button>
        </template>
      </el-table-column>
    </el-table>

    <pagination
      v-show="total>0"
@@ -128,7 +83,7 @@
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    /> -->
    />

    <el-dialog :title="manualScoreTitle" :visible.sync="manualScoreOpen" width="500px" append-to-body>
      <el-input v-model="manualScoreForm.manualScore" type="number" placeholder="请为该单位打分"/>
@@ -140,36 +95,26 @@

    <el-dialog :title="detailTitle" :visible.sync="detailOpen" width="700px" append-to-body>
      <el-descriptions class="margin-top" :column="3" border>
<!--        <template slot="extra">-->
<!--          <el-button type="primary" size="small">操作</el-button>-->
<!--        </template>-->
        <el-descriptions-item>
          <template slot="label">
            <i class="el-icon-user"></i>
            考核对象
          </template>
          {{checkUnitName}}
          {{detail.unitName}}
        </el-descriptions-item>
        <el-descriptions-item>
          <template slot="label">
            <i class="el-icon-s-management"></i>
            考核名称
            合同名称
          </template>
          {{examineName}}
        </el-descriptions-item>
        <el-descriptions-item>
          <template slot="label">
            <i class="el-icon-timer"></i>
            考核频率
          </template>
          <el-tag size="small">{{detail.frequency === 1 ? '月度考核' : '季度考核'}}</el-tag>
          {{detail.contractName}}
        </el-descriptions-item>
        <el-descriptions-item>
          <template slot="label">
            <i class="el-icon-medal"></i>
            综合分数
          </template>
          <el-tag type="danger" size="small">{{detail.checkScore}}</el-tag>
          <el-tag type="danger" size="small">{{detail.score}}</el-tag>
        </el-descriptions-item>
      </el-descriptions>
        <el-table
@@ -217,8 +162,6 @@
      detail:{

      },
      checkUnitName: '成都x运维',
      examineName: '成都x运维考核',
      tableData: [{
        name: '视频平均在线率',
        content: '97%',
@@ -461,6 +404,6 @@
    clear: both
  }
  .box-card {
    width: 480px;
    width: 350px;
  }
</style>

 src/views/system/point/index.vue

@@ -2,26 +2,15 @@
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
      <el-form-item label="点位名称" prop="pointName">
        <el-input
          v-model="queryParams.pointName"
          placeholder="请输入点位名称"
          clearable
          @keyup.enter.native="handleQuery"
        />
        <el-input v-model="queryParams.pointName" placeholder="请输入点位名称" clearable @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="点位开始时间" prop="startTime">
        <el-date-picker clearable
          v-model="queryParams.startTime"
          type="date"
          value-format="yyyy-MM-dd"
        <el-date-picker clearable v-model="queryParams.startTime" type="date" value-format="yyyy-MM-dd"
          placeholder="请选择点位开始时间">
        </el-date-picker>
      </el-form-item>
      <el-form-item label="点位结束时间" prop="endTime">
        <el-date-picker clearable
          v-model="queryParams.endTime"
          type="date"
          value-format="yyyy-MM-dd"
        <el-date-picker clearable v-model="queryParams.endTime" type="date" value-format="yyyy-MM-dd"
          placeholder="请选择点位结束时间">
        </el-date-picker>
      </el-form-item>
@@ -32,65 +21,41 @@
    </el-form>

    <el-row :gutter="10" class="mb8">
<!--      <el-col :span="1.5">-->
<!--        <el-button-->
<!--          type="primary"-->
<!--          plain-->
<!--          icon="el-icon-plus"-->
<!--          size="mini"-->
<!--          @click="handleAdd"-->
<!--        >新增</el-button>-->
<!--      </el-col>-->
      <!--      <el-col :span="1.5">-->
      <!--        <el-button-->
      <!--          type="primary"-->
      <!--          plain-->
      <!--          icon="el-icon-plus"-->
      <!--          size="mini"-->
      <!--          @click="handleAdd"-->
      <!--        >新增</el-button>-->
      <!--      </el-col>-->
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['point:edit']"
        >修改</el-button>
        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
          v-hasPermi="['point:edit']">修改</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['point:remove']"
        >删除</el-button>
        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
          v-hasPermi="['point:remove']">删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-top"
          size="mini"
          @click="handleImportPoint"
          v-hasPermi="['point:import']"
        >导入点位</el-button>
        <el-button type="warning" plain icon="el-icon-top" size="mini" @click="handleImportPoint"
          v-hasPermi="['point:import']">导入点位</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-receiving"
          size="mini"
          @click="handleEditBatch"
          v-hasPermi="['point:edit']"
        >批量修改</el-button>
        <el-button type="danger" plain icon="el-icon-receiving" size="mini" @click="handleEditBatch"
          v-hasPermi="['point:edit']">批量修改</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="pointList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="点位类型" align="center" prop="pointType" />
      <el-table-column label="标签" align="center" prop="tag" >
        <span>{{important}}</span>
      <el-table-column label="点位名称" prop="pointName" width="200" />
      <el-table-column label="标签" align="center" width="90">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.point_tag" :value="scope.row.pointTags" />
        </template>
      </el-table-column>
      <el-table-column label="点位开始时间" align="center" prop="startTime" width="180">
        <template slot-scope="scope">
@@ -113,33 +78,18 @@
      </el-table-column>
      <el-table-column label="运维状态" align="center" prop="status" />
      <el-table-column label="备注" align="center" prop="remark" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['point:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['point:remove']"
          >删除</el-button>
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
            v-hasPermi="['point:edit']">修改</el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
            v-hasPermi="['point:remove']">删除</el-button>
        </template>
      </el-table-column>
    </el-table>

    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
      @pagination="getList" />

    <!-- 添加运维点位对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -147,50 +97,35 @@
        <el-form-item label="点位名称" prop="pointName">
          <el-input v-model="form.pointName" placeholder="请输入点位名称" />
        </el-form-item>
        <el-form-item label="点位标签" prop="tag">
          <el-select v-model="form.tag"  placeholder="点位标签">
            <el-option label="普通点位" value="普通点位"/>
            <el-option label="重点点位" value="重点点位"/>
        <el-form-item label="点位标签" prop="pointTag">
          <el-select v-model="form.pointTag" placeholder="点位标签" multiple clearable>
            <el-option v-for="dict in dict.type.point_tag" :key="dict.value" :label="dict.label" :value="dict.value" />
          </el-select>
        </el-form-item>
        <el-form-item label="点位所在地" prop="region">
          <el-cascader v-model="form.region" :options="regionList" placeholder="点位所在地" :props="props" collapse-tags></el-cascader>
        </el-form-item>
        <!--        <el-form-item label="点位所在地" prop="region">-->
        <!--          <el-cascader v-model="form.region" :options="regionList" placeholder="点位所在地" :props="props" collapse-tags></el-cascader>-->
        <!--        </el-form-item>-->
        <el-form-item label="设备类型" prop="category">
          <el-select v-model="form.category"  placeholder="设备类型">
            <el-option label="人脸识别" value="2"/>
            <el-option label="视频监控" value="1"/>
            <el-option label="车辆监控" value="3"/>
          <el-select v-model="form.category" placeholder="设备类型">
            <el-option label="人脸识别" value="2" />
            <el-option label="视频监控" value="1" />
            <el-option label="车辆监控" value="3" />
          </el-select>
        </el-form-item>
        <el-form-item label="监管部门" prop="category">
          <el-select v-model="form.deptName"  placeholder="监管部门">
            <el-option label="省厅" value="省厅"/>
            <el-option label="自贡荣县公安局" value="自贡荣县公安局"/>
            <el-option label="自贡富顺公安局" value="自贡富顺公安局"/>
          </el-select>
        <el-form-item label="监管部门" prop="deptId">
          <el-cascader v-model="form.deptId" :options="deptOptions" :show-all-levels="false" clearable
            :props="{ checkStrictly: true }">
          </el-cascader>
        </el-form-item>
        <el-form-item label="运维单位" prop="unitId">
          <el-select v-model="form.unitId"  placeholder="运维单位">
            <el-option
              v-for="item in unitList"
              :key="item.id"
              :label="item.value"
              :value="item.id">
          <el-select v-model="form.unitId" placeholder="运维单位">
            <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="点位时区" prop="timezone">
          <el-date-picker
            @change="dateChange"
            v-model="form.timezone"
            type="daterange"
            align="right"
            unlink-panels
            range-separator="至"
            start-placeholder="开始日期"
            end-placeholder="结束日期"
          >
          <el-date-picker @change="dateChange" v-model="form.timezone" type="daterange" align="right" unlink-panels
            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
          </el-date-picker>
        </el-form-item>
      </el-form>
@@ -204,29 +139,18 @@
    <el-dialog title="批量修改运维单位" :visible.sync="batchOpen" width="600px" append-to-body>
      <el-form ref="form" :model="batchEditForm" :rules="batchRules" label-width="120px">
        <el-form-item label="点位选择" prop="ids">
          <el-cascader @change="cos" v-model="batchEditForm.ids" :options="regionList" placeholder="请选择区域" :props="props" collapse-tags></el-cascader>
          <el-cascader @change="cos" v-model="batchEditForm.ids" :options="regionList" placeholder="请选择区域"
            :props="props" collapse-tags></el-cascader>
        </el-form-item>
        <el-form-item label="运维单位" prop="unitId">
          <el-select v-model="batchEditForm.unitId"  placeholder="选择运维单位">
            <el-option
              v-for="item in unitList"
              :key="item.id"
              :label="item.value"
              :value="item.id">
          <el-select v-model="batchEditForm.unitId" placeholder="选择运维单位">
            <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="运维时间段" prop="timezone">
          <el-date-picker
            @change="dateChange"
            v-model="batchEditForm.timezone"
            type="daterange"
            align="right"
            unlink-panels
            range-separator="至"
            start-placeholder="开始日期"
            end-placeholder="结束日期"
          >
          <el-date-picker @change="dateChange" v-model="batchEditForm.timezone" type="daterange" align="right"
            unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
          </el-date-picker>
        </el-form-item>
      </el-form>
@@ -242,12 +166,15 @@
<script>
import { listPoint, getPoint, delPoint, addPoint, batchEdit, updatePoint } from "@/api/platform/point";
import { unitSelect } from "@/api/platform/unit";
import { getCascader } from '../../../api/platform/region'
import { getCascader } from '@/api/platform/region'
import { cascader } from '@/api/system/dept'

export default {
  name: "Point",
  dicts: ['point_tag'],
  data() {
    return {
      deptOptions: [],
      // 批量修改表单
      batchEditForm: {
        ids: [],
@@ -264,7 +191,6 @@
      editingIndex: null,
      // 遮罩层
      loading: true,
      important: '重点点位',
      // 选中数组
      ids: [],
      // 非单个禁用
@@ -286,7 +212,7 @@
      // 运维单位
      unitList: [],
      // 运维时区
      timezone:[],
      timezone: [],
      // 查询参数
      queryParams: {
        pageNum: 1,
@@ -300,7 +226,7 @@
      // 表单参数
      form: {},
      // 批量表单内容
      formList:[],
      formList: [],
      // 临时表单数据
      tempForm: {},
      // 临时表单数据列表
@@ -310,10 +236,10 @@
        pointName: [
          { required: true, message: "点位名称不能为空", trigger: "blur" }
        ],
        region: [
          { required: true, message: "点位所在地不能为空", trigger: "change" }
        pointTag: [
          { required: true, message: "点位标签不能为空", trigger: "change" }
        ],
        deptName: [
        deptId: [
          { required: true, message: "监管部门不能为空", trigger: "change" }
        ],
        category: [
@@ -331,7 +257,8 @@
  created() {
    this.getList();
    this.getUnitSelect();
    this.getCascader();
    // this.getCascader();
    this.getDeptCascader();
  },
  methods: {
    // 点位导入
@@ -364,6 +291,12 @@
    getCascader() {
      getCascader().then(res => {
        this.regionList = res.data;
      })
    },
    // 获取部门级联
    getDeptCascader() {
      cascader().then(res => {
        this.deptOptions = res.data;
      })
    },
    // 点位项修改完成
@@ -426,12 +359,13 @@
        startTime: null,
        endTime: null,
        unitId: null,
        deptId: [],
        status: null,
        remark: null,
        createTime: null,
        updateTime: null,
        deleted: null,
        pointDetail: ""
        pointTag: []
      };
      this.resetForm("form");
    },
@@ -463,38 +397,48 @@
      const id = row.id || this.ids
      getPoint(id).then(response => {
        this.form = response.data;
        this.form.pointTag = response.data.pointTags;
        this.form.deptId = response.data.deptIds
        this.form.timezone = [this.form.startTime, this.form.endTime]
        if (this.form.pointDetail) {
          this.tempFormList = JSON.parse(this.form.pointDetail)
        }
        this.form.category = this.form.category + ''
        this.open = true;
        this.title = "修改运维点位";
      });
    },
    /** 提交按钮 */
    submitForm() {
      if (this.tempFormList) {
        this.form.pointDetail = JSON.stringify(this.tempFormList)
      }
      if (this.form.id != null) {
        updatePoint(this.form).then(response => {
          this.$modal.msgSuccess("修改成功");
          this.open = false;
          this.getList();
        });
      } else {
        addPoint(this.form).then(response => {
          this.$modal.msgSuccess("新增成功");
          this.open = false;
          this.reset()
          this.getList();
        });
      }
      this.$refs['form'].validate(valid => {
        if (valid) {
          if (this.form.deptId && this.form.deptId.length > 0) {
            this.form.deptId = this.form.deptId[this.form.deptId.length - 1]
          }
          let temp = {
            ...this.form,
            category: parseInt(this.form.category)
          };
          if (temp.id != null) {
            updatePoint(temp).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.getList();
            });
          } else {
            addPoint(temp).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.reset()
              this.getList();
            });
          }
        } else {
          console.log("error")
        }
      })
    },
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除运维点位编号为"' + ids + '"的数据项？').then(function() {
      this.$modal.confirm('是否确认删除运维点位编号为"' + ids + '"的数据项？').then(function () {
        return delPoint(ids);
      }).then(() => {
        this.getList();

 src/views/system/score/default/index.vue

@@ -49,7 +49,7 @@
      <el-table-column label="考核规则" align="center" prop="ruleName" width="120" :show-overflow-tooltip="true" />
      <el-table-column label="考核指标" align="center" prop="num" width="120" />
      <el-table-column label="考核扣分" align="center" prop="score" width="120" />
      <el-table-column label="创建人" align="center" prop="createUser" />
      <el-table-column label="创建时间" align="center" prop="createTime" />
      <el-table-column label="审核状态" align="center" prop="auditingStatus">
        <template slot-scope="scope">
          <el-tag
@@ -60,6 +60,7 @@
      <el-table-column label="审核人" align="center" prop="auditingUser" />
      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">详情</el-button>
          <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleAuditing(scope.row)"
            v-hasPermi="['default:audit']" v-if="scope.row.auditingStatus === '待审核'">审核</el-button>
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -146,6 +147,31 @@
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>

    <!-- 详情 -->
    <el-dialog title="运维考核详情" :visible.sync="openView" width="800px" append-to-body>
      <el-form ref="form" :model="view" label-width="150px" size="mini">
        <el-row>
          <el-col>
            <el-form-item label="考核单位：">{{ view.unitName }}</el-form-item>
            <el-form-item label="考核合同：">{{ view.contractName }} </el-form-item>
            <el-form-item label="考核规则：">{{ view.ruleName }} </el-form-item>
            <el-form-item label="考核指标：">{{ view.num }} </el-form-item>
            <el-form-item label="考核扣分：">{{ view.score }} </el-form-item>
            <el-form-item label="创建人：">{{ view.createUser }} </el-form-item>
            <el-form-item label="创建时间：">{{ view.createTime }} </el-form-item>
            <el-form-item label="审核状态：">{{ view.auditingStatus }} </el-form-item>
            <el-form-item label="审核备注：">{{ view.remark }} </el-form-item>
            <el-form-item label="审核人：">{{ view.auditingUser }} </el-form-item>
            <el-form-item label="审核时间：">{{ view.auditingTime }} </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="openView = false">关 闭</el-button>
      </div>
    </el-dialog>

  </div>
</template>

@@ -158,6 +184,8 @@
  name: "Auditing",
  data() {
    return {
      view: {},
      openView: false,
      needNum: false,
      options: [],
      auditingOpen: false,
@@ -241,6 +269,11 @@
    this.getUnitSelect();
  },
  methods: {
    /** 详细按钮操作 */
    handleView(row) {
      this.openView = true;
      this.view = row;
    },
    /**
     * 选择规则
     */