Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-23 c127500c5925ca9ef7265e29aedad9ab25eedd22

Merge remote-tracking branch 'origin/master'

 src/api/platform/report.js

@@ -58,8 +58,8 @@
// 审核
export function audit(data) {
  return request({
    url: '/report/auditing/',
    method: 'get',
    url: '/report/auditing',
    method: 'post',
    data: data
  })
}

 src/views/system/point/index.vue

@@ -121,22 +121,46 @@
          <el-input v-model="form.pointName" placeholder="请输入点位名称" />
        </el-form-item>
        <el-form-item label="重点标签" prop="importantTag">
          <el-select v-model="form.importantTag" placeholder="重点标签" clearable>
          <el-switch
            style="display: block"
            v-model="form.importantTag"
            active-color="#13ce66"
            inactive-color="#409EFF"
            active-text="重点点位"
            inactive-text="普通点位">
          </el-switch>
          <!-- <el-select v-model="form.importantTag" placeholder="重点标签" clearable>
            <el-option label="重点点位" :value="true" />
            <el-option label="普通点位" :value="false" />
          </el-select>
          </el-select> -->
        </el-form-item>
        <el-form-item label="省厅标签" prop="provinceTag">
          <el-select v-model="form.provinceTag" placeholder="省厅标签" clearable>
          <el-switch
            style="display: block"
            v-model="form.provinceTag"
            active-color="#13ce66"
            inactive-color="#409EFF"
            active-text="省厅点位"
            inactive-text="普通点位">
          </el-switch>
          <!-- <el-select v-model="form.provinceTag" placeholder="省厅标签" clearable>
            <el-option label="省厅点位" :value="true" />
            <el-option label="普通点位" :value="false" />
          </el-select>
          </el-select> -->
        </el-form-item>
        <el-form-item label="重点指挥图像标签" prop="importantCommandImageTag">
          <el-select v-model="form.importantCommandImageTag" placeholder="重点指挥图像标签" clearable>
          <el-switch
            style="display: block"
            v-model="form.importantCommandImageTag"
            active-color="#13ce66"
            inactive-color="#409EFF"
            active-text="重点指挥图像点位"
            inactive-text="普通点位">
          </el-switch>
          <!-- <el-select v-model="form.importantCommandImageTag" placeholder="重点指挥图像标签" clearable>
            <el-option label="重点指挥图像点位" :value="true" />
            <el-option label="普通点位" :value="false" />
          </el-select>
          </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>-->

 src/views/system/report/index.vue

@@ -237,7 +237,7 @@
</template>

<script>
import { listReport, getReport, delReport, addReport, updateReport, auditing, importReport } from "@/api/platform/report";
import { listReport, getReport, delReport, addReport, updateReport, auditing, audit, importReport } from "@/api/platform/report";
import { pointSelectData } from "@/api/platform/point";

export default {
@@ -485,7 +485,7 @@
        auditOpinion: this.auditingForm.auditOpinion,
        auditingResult: this.auditingForm.auditingResult
      }
      auditing(this.auditingForm).then(response => {
      audit(this.auditingForm).then(response => {
        this.$modal.msgSuccess("审核成功");
        this.auditingOpen = false
        this.getList();