Merge remote-tracking branch 'origin/master'

fuliqi

2024-04-30 7d312ba048cd9767286c6bc5b8c3f7e94c160c9f

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/system/result/detail/index1.vue

 src/api/platform/check-result.js

@@ -3,12 +3,20 @@
// 查询考核结果列表
export function listCheckResult(query) {
  return request({
    url: '/check/result/list',
    method: 'get',
    url: '/check/result/list?pageNum=' + query.pageNum + '&pageSize=' + query.pageSize,
    method: 'post',
    data: query
  })
}

// 查询考核结果详情
export function resultRecord(id) {
  return request({
    url: '/check/result/record/list?resultId=' + id,
    method: 'get'
  })
}

// 查询考核结果详细
export function getCheckResult(id) {
  return request({

 src/api/platform/contract-score.js

@@ -3,7 +3,7 @@
// 查询违规审核列表
export function listAuditing(data) {
  return request({
    url: '/contract/score/list',
    url: '/contract/score/list?pageNum=' + data.pageNum + '&pageSize=' + data.pageSize,
    method: 'post',
    data: data
  })

 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

@@ -1,25 +1,16 @@
<template>
  <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="checkUnitId">
        <el-input
          v-model="queryParams.checkUnitName"
          placeholder="请输入考核对象"
          clearable
          @clear="handleQuery"
          @keyup.enter.native="handleQuery"
        />
      <el-form-item label="考核对象" prop="unitId">
        <el-select v-model="queryParams.unitId" @change="handleQuery" clearable 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="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-form-item label="发布状态" prop="unitId">
        <el-select v-model="queryParams.publish" @change="handleQuery" clearable placeholder="发布状态">
          <el-option label="未发布" :value="0" />
          <el-option label="已发布" :value="1" />
        </el-select>
      </el-form-item>
      <el-form-item label="考核时间">
@@ -74,53 +65,24 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-card class="box-card" v-for="(item) in checkResultList">
      <div slot="header" class="clearfix">
        <span>{{ checkUnitName }}</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.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>
        <el-button size="small" round style="float: right;" @click="handlePublish(item)" v-show="item.publish == 1"  v-hasPermi="['result:contract:publish']">已发布</el-button>
      </div>
    </el-card>
    <el-row v-loading="loading">
      <el-col :span="8" v-for="(item, index) in checkResultList" :key="index">
        <el-card class="box-card">
          <div slot="header" class="clearfix">
            <span>{{ item.contractName }}</span>
            <el-button style="float: right; padding: 3px 6px" type="text" @click="handleDetail(item)">详情</el-button>
          </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>
            <el-button size="small" round style="float: right;" disabled v-show="item.publish == 1"  v-hasPermi="['result:contract:publish']">已发布</el-button>
          </div>
        </el-card>
      </el-col>
    </el-row>

    <!-- <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 +90,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 +102,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
@@ -177,18 +129,24 @@
          show-summary
          style="width: 100%">
          <el-table-column
            prop="name"
            prop="ruleName"
            label="规则名"
            width="180">
            :show-overflow-tooltip="true"
            width="300">
          </el-table-column>
          <el-table-column
            prop="content"
            label="指标"
            width="180">
           label="扣减方式"
            align="center"
            prop="deductCategory"
            width="180px">
          </el-table-column>
          <el-table-column
            prop="num"
            label="指标">
          </el-table-column>
          <el-table-column
            prop="score"
            label="得分">
            label="扣分">
          </el-table-column>
        </el-table>
    </el-dialog>
@@ -206,7 +164,8 @@
</template>

<script>
import { listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/check-result";
import { resultRecord, listCheckResult, getCheckResult, delCheckResult, addCheckResult, updateCheckResult,manualScore, publishCheckResult } from "@/api/platform/check-result";
import { unitSelect } from "@/api/platform/unit";

export default {
  name: "CheckResult",
@@ -217,25 +176,7 @@
      detail:{

      },
      checkUnitName: '成都x运维',
      examineName: '成都x运维考核',
      tableData: [{
        name: '视频平均在线率',
        content: '97%',
        score: '-5'
      }, {
        name: '一机一档24小时未修复',
        content: '5个',
        score: '-0.5'
      }, {
        name: '存储故障',
        content: '5小时',
        score: '-0.3'
      }, {
        name: '时钟不同步24小时未修复',
        content: '3个',
        score: '-0.5'
      }],
      tableData: [],
      manualScoreOpen: false,
      manualScoreForm: {},
      manualScoreTitle: '',
@@ -270,36 +211,29 @@
      form: {},
      // 表单校验
      rules: {
      }
      },
      unitList: []
    };
  },
  created() {
    this.getList();
    this.getUnitSelect();
  },
  methods: {
    frequencyFormatter(row) {
      if (row.frequency === "1") {
        return "月度考核"
      }
      if (row.frequency === "2") {
        return "季度考核"
      }
    },
    examineRangeFormatter(row) {
      if (row.examineRange === "1") {
        return "分局考核"
      }
      if (row.examineRange === "2") {
        return "市局考核"
      }
    getUnitSelect() {
      // 运维单位下拉列表
      unitSelect().then((res) => {
        this.unitList = res.data;
      })
    },
    /** 查询考核结果列表 */
    getList() {
      this.loading = true;
      if (null != this.daterangeCheckTime && '' != this.daterangeCheckTime) {
        this.queryParams["start"] = this.daterangeCheckTime[0];
        this.queryParams["end"] = this.daterangeCheckTime[1];
        this.queryParams["createStartTime"] = this.daterangeCheckTime[0];
        this.queryParams["createEndTime"] = this.daterangeCheckTime[1];
      }
      console.log("this.queryParams", this.queryParams)
      listCheckResult(this.queryParams).then(response => {
        this.checkResultList = response.rows;
        this.total = response.total;
@@ -350,11 +284,12 @@
      this.manualScoreOpen = true;
    },
    handleDetail(row) {
      resultRecord(row.id).then(res => {
        this.tableData = res.rows;
      })
      this.detail = row;
      this.detail.carOnlineRate =  '97%';
      this.detailTitle = '考核结果';
      this.detailTitle = '考核结果详情';
      this.detailOpen = true;

    },
    handlePublish(row) {
      let text = row.publish == 1 ? '取消发布' : '发布';
@@ -369,13 +304,13 @@
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.daterangeCheckTime = [];
      this.resetForm("queryForm");
      this.queryParams = {};
      this.handleQuery();
    },
    // 多选框选中数据
@@ -432,9 +367,9 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('system/checkResult/export', {
      this.download('check/result/export', {
        ...this.queryParams
      }, `checkResult_${new Date().getTime()}.xlsx`)
      }, `合同考核结果_${new Date().getTime()}.xlsx`)
    },

  }
@@ -461,6 +396,7 @@
    clear: both
  }
  .box-card {
    width: 480px;
    width: 400px;
    margin-bottom: 20px;
  }
</style>

 src/views/system/contract/index.vue

@@ -33,7 +33,7 @@
          <el-collapse-item  v-for="(item, index) in ruleData" :key="index" :title="item.ruleName" :name="index">
            <div class="inline-input-container" v-for="(item, index) in item.children" :key="index">
              <b>{{ item.ruleDesc }}</b> <br v-if="item.ruleDesc"/>
              <el-tooltip class="item" v-for="(item, index) in item.children" :key="index" effect="dark" :content="item.deductCategory == '分数乘以数量' ? '扣' + item.calcFraction  + '乘以数量 ' : item.deductCategory == '除以数量后乘以分数' ? '扣' + item.calcFraction + '分/' +  item.calcUnit + '小时' : item.deductCategory + ' ' + item.calcFraction" placement="top">
              <el-tooltip class="item" v-for="(item, index) in item.children" :key="index" effect="dark" :content="item.deductCategory == '分数乘以数量' ? '扣' + item.calcFraction  + '分*数量 ' : item.deductCategory == '除以数量后乘以分数' ? '扣' + item.calcFraction + '分/' +  item.calcUnit + '小时' : '扣' + item.calcFraction + '分'" placement="top">
                <span>{{ item.ruleCondition }}<br/></span>
                <!-- {{ item.deductCategory }} {{ item.calcFraction }}{{ item.calcUnit ? "/" + item.calcUnit : ''  }} -->
            </el-tooltip>

 src/views/system/point/index.vue

@@ -2,28 +2,7 @@
  <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-form-item>
      <el-form-item label="点位开始时间" prop="startTime">
        <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"
          placeholder="请选择点位结束时间">
        </el-date-picker>
        <el-input v-model="queryParams.pointName" placeholder="请输入点位名称" clearable @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -32,74 +11,40 @@
    </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>
      <el-table-column label="点位开始时间" align="center" prop="startTime" width="180">
      <el-table-column label="点位名称" prop="pointName" width="200" />
      <el-table-column label="标签" align="center" width="90">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="点位结束时间" align="center" prop="endTime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
          <dict-tag :options="dict.type.point_tag" :value="scope.row.pointTags" />
        </template>
      </el-table-column>
      <el-table-column label="运维单位" align="center" prop="unitName" />
@@ -111,35 +56,19 @@
          <div v-else-if="scope.row.category === 3">人脸识别</div>
        </template>
      </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,51 +76,34 @@
        <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>
        <el-form-item label="点位备注" prop="remark">
          <el-input type="textarea" v-model="form.remark"/>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -204,30 +116,14 @@
    <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>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -242,29 +138,27 @@
<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: [],
        unitId: null,
        timezone: null,
        startTime: null,
        endTime: null
      },
      // 批量修改弹窗
      batchOpen: false,
      props: { multiple: true },
      regionList: [],
      // 正在修改第几个
      editingIndex: null,
      // 遮罩层
      loading: true,
      important: '重点点位',
      // 选中数组
      ids: [],
      // 非单个禁用
@@ -285,35 +179,26 @@
      editOpen: false,
      // 运维单位
      unitList: [],
      // 运维时区
      timezone:[],
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        pointName: null,
        startTime: null,
        endTime: null,
        unitId: null,
        status: null,
      },
      // 表单参数
      form: {},
      // 批量表单内容
      formList:[],
      // 临时表单数据
      tempForm: {},
      // 临时表单数据列表
      tempFormList: [],
      form: {
      },
      // 表单校验
      rules: {
        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 +216,8 @@
  created() {
    this.getList();
    this.getUnitSelect();
    this.getCascader();
    // this.getCascader();
    this.getDeptCascader();
  },
  methods: {
    // 点位导入
@@ -357,42 +243,24 @@
    handleEditBatch() {
      this.batchOpen = true;
    },
    removeRegion(item) {
      this.tempFormList = this.tempFormList.filter(data => data !== item)
    },

    // 获取区县级联
    getCascader() {
      getCascader().then(res => {
        this.regionList = res.data;
      })
    },
    // 点位项修改完成
    editFinishItem(index) {
      this.editingIndex = null;
      let form = this.tempFormList[index];
      form.startTime = form.timezone[0];
      form.endTime = form.timezone[1];
      this.formList[index] = form;
    // 获取部门级联
    getDeptCascader() {
      cascader().then(res => {
        this.deptOptions = res.data;
      })
    },
    // 点位项修改
    editPointItem(index) {
      if (this.editingIndex !== index && this.editingIndex !== null) {
        this.$modal.msgWarning("请先完成上一个修改");
      } else {
        this.editingIndex = index;
        this.tempFormList[index] = this.formList[index];
      }
    },

    // 时间选择发生变化
    dateChange() {
      this.tempForm.startTime = this.tempForm.timezone[0];
      this.tempForm.endTime = this.tempForm.timezone[1];
    },
    // 继续添加点位
    nextAdd() {
      let item = {}
      // this.formList.push(item);
      this.tempFormList.push(item);
    },
    getUnitSelect() {
      // 运维单位下拉列表
@@ -414,24 +282,19 @@
      this.open = false;
      this.reset();
    },
    updateCancel() {
      this.editOpen = false;
      this.reset();
    },
    // 表单重置
    reset() {
      this.form = {
        id: null,
        pointName: null,
        startTime: null,
        endTime: null,
        unitId: null,
        deptId: [],
        status: null,
        remark: null,
        createTime: null,
        updateTime: null,
        deleted: null,
        pointDetail: ""
        pointTag: []
      };
      this.resetForm("form");
    },
@@ -463,38 +326,47 @@
      const id = row.id || this.ids
      getPoint(id).then(response => {
        this.form = response.data;
        this.form.timezone = [this.form.startTime, this.form.endTime]
        if (this.form.pointDetail) {
          this.tempFormList = JSON.parse(this.form.pointDetail)
        }
        this.form.pointTag = response.data.pointTags;
        this.form.deptId = response.data.deptIds
        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/report/index.vue

@@ -60,7 +60,8 @@
            <div class="info-item">
              <div class="info-label">上报材料</div>
              <div class="info-list">
                <div class="list-item" v-for="file in formatFileList(scope.row.reportMaterials)" :key="file" @click="showFile(file)">
                <div class="list-item" v-for="file in formatFileList(scope.row.reportMaterials)" :key="file"
                  @click="showFile(file)">
                  <div class="item-icon">
                    <i class="el-icon-document"></i>
                  </div>
@@ -141,7 +142,7 @@
          <editor v-model="form.reportContent" :min-height="192" />
        </el-form-item>
        <el-form-item label="上报材料" prop="reportMaterials">
          <file-upload v-model="form.reportMaterials" />
          <file-upload v-model="form.reportMaterials" :fileType='fileType' />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -211,6 +212,8 @@
  name: "Report",
  data() {
    return {
      fileType: ["doc", "xls", "xlsx", "ppt", "txt", "pdf", "png", "jpg"],

      // 点位list
      pointList: [],
      // 遮罩层

 src/views/system/result/detail/index1.vue

@@ -1,5 +1,5 @@
<template>
  <div style="padding: 0px 10px" >
  <div style="padding: 0px 10px">
    <div>
      <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
        style="margin-bottom: 10px">
@@ -84,7 +84,7 @@
</template>

<script>
import { listScore, getScore, delScore, addScore, updateScore, publishScore,detailScore } from "@/api/platform/check-score";
import { listScore, getScore, delScore, addScore, updateScore, publishScore, detailScore } from "@/api/platform/check-score";
import { areaSelect } from '@/api/system/dept';
import * as echarts from 'echarts';
let lineChart = null;
@@ -108,7 +108,7 @@
        pageNum: 1,
        pageSize: 10,
        deptId: null,
        examineTag:0
        examineTag: 0
      },
      queryParamsList: {
        pageNum: 1,
@@ -254,7 +254,7 @@
          data: dataList.map((item) => item[0]),
        },
        yAxis: {

          min: 'dataMin'
        },
        series: [
          {

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

@@ -44,12 +44,13 @@

    <el-table v-loading="loading" :data="auditingList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="考核单位" align="center" prop="unitName" width="180" />
      <el-table-column label="考核合同" align="center" prop="contractName" width="180" />
      <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="unitName"/>
      <el-table-column label="考核合同" align="center" prop="contractName"/>
      <el-table-column label="考核规则" align="center" prop="ruleName" :show-overflow-tooltip="true" />
      <el-table-column label="扣减方式" align="center" prop="deductCategory"/>
      <el-table-column label="考核指标" align="center" prop="num"/>
      <el-table-column label="考核扣分" align="center" prop="score"/>
      <el-table-column label="创建时间" align="center" prop="createTime" width="180px"/>
      <el-table-column label="审核状态" align="center" prop="auditingStatus">
        <template slot-scope="scope">
          <el-tag
@@ -60,6 +61,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)"
@@ -120,7 +122,14 @@
                  <el-cascader ref="cascader" v-model="form.ruleIdsArray" :options="options" @change="handleChange">
                    <template slot-scope="{ data }">
                      <el-tooltip class="item" :disabled="data.label.length < 16 && !data.deductCategory" effect="dark"
                        :content="data.label.length < 16 ? data.deductCategory ? data.deductCategory + ' ' + data.calcFraction + (data.calcUnit ? '/' + data.calcUnit : '') : '' : (data.deductCategory ? data.label + ' ' + data.deductCategory + ' ' + data.calcFraction + (data.calcUnit ? '/' + data.calcUnit : '') : data.label)"
                        :content="
                          data.label.length < 16 ?   
                            data.deductCategory ?   
                                data.deductCategory == '分数乘以数量' ? '扣' + data.calcFraction  + '分*数量 ' : data.deductCategory == '除以数量后乘以分数' ? '扣' + data.calcFraction + '分/' +  data.calcUnit + '小时' : '扣' + data.calcFraction + '分' :   
                                '' :   
                            (data.deductCategory ?   
                                data.label + ' ' + (data.deductCategory == '分数乘以数量' ? '扣' + data.calcFraction  + '分*数量 ' : data.deductCategory == '除以数量后乘以分数' ? '扣' + data.calcFraction + '分/' +  data.calcUnit + '小时' : '扣' + data.calcFraction + '分') :   
                                data.label)"
                        placement="left">
                        <span>{{ data.label }}</span>
                      </el-tooltip>
@@ -146,6 +155,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 +192,8 @@
  name: "Auditing",
  data() {
    return {
      view: {},
      openView: false,
      needNum: false,
      options: [],
      auditingOpen: false,
@@ -241,6 +277,11 @@
    this.getUnitSelect();
  },
  methods: {
    /** 详细按钮操作 */
    handleView(row) {
      this.openView = true;
      this.view = row;
    },
    /**
     * 选择规则
     */
@@ -248,6 +289,7 @@
      let item = this.$refs['cascader'].getCheckedNodes()[0].data;
      this.calcObj = item;
      this.form.contractId = item.contractId;
      this.form.deductCategory = item.deductCategory == '分数乘以数量' ? '扣' + item.calcFraction  + '分*数量 ' : item.deductCategory == '除以数量后乘以分数' ? '扣' + item.calcFraction + '分/' +  item.calcUnit + '小时' : '扣' + item.calcFraction + '分';
      if (item.deductCategory == "扣指定分数") {
        this.needNum = false;
        this.form.score = item.calcFraction;
@@ -366,6 +408,7 @@
      this.daterangeAuditingTime = [];
      this.daterangeCreateTime = [];
      this.resetForm("queryForm");
      this.queryParams = {};
      this.handleQuery();
    },
    // 多选框选中数据

 vue.config.js

@@ -35,9 +35,15 @@
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
        target: `http://localhost:8080`,
        // target: `http://192.168.3.64:8080`,
        // target: `http://localhost:8080`,

        // 付立麒
        target: `http://192.168.3.64:8080`,

        // 龚焕茏
        // target: `http://192.168.3.87:8080`,
        
        // 向培
        // target: `http://192.168.3.88:8085`,
        changeOrigin: true,
        pathRewrite: {