Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-24 8dc5f14cb31b82de76e7d5be262d1a9c5e6e994e

Merge remote-tracking branch 'origin/master'

 src/api/platform/resource-security.js

New file
@@ -0,0 +1,28 @@
import request from '@/utils/request'

// 查询platform列表
export function listSecurity(query) {
  return request({
    url: '/platform/resourceSecurity/list',
    method: 'get',
    params: query
  })
}

// 查询platform详细
export function getSecurity(id) {
  return request({
    url: '/platform/resourceSecurity/' + id,
    method: 'get'
  })
}

// 修改platform
export function updateSecurity(data) {
  return request({
    url: '/platform/resourceSecurity',
    method: 'put',
    data: data
  })
}


 src/views/screen/components/screen-examine/components/video-chart.vue

@@ -141,69 +141,18 @@
      this.dataList.push(item11)

      let item12 = { value: 0, name: "", id: 0, routerUrl: "" }
      item12.value = this.videoList.keyCommandImageInspection
      item12.name = "重点指挥图像巡检结果"
      item12.value = this.videoList.keyCommandImageOnline
      item12.name = "重点指挥图像在线率"
      item12.id = 13
      item12.routerUrl = ""
      this.dataList.push(item12)

      let item13 = { value: 0, name: "", id: 0, routerUrl: "" }
      item13.value = this.videoList.keyCommandImageDirectoryTree
      item13.name = "重点指挥图像目录树"
      item13.value = this.videoList.imageResourceSecurity
      item13.name = "图像资源安全管理"
      item13.id = 14
      item13.routerUrl = ""
      this.dataList.push(item13)

      let item14 = { value: 0, name: "", id: 0, routerUrl: "" }
      item14.value = this.videoList.onlineInspectionPlatform
      item14.name = "平台部署及运行率"
      item14.id = 15
      item14.routerUrl = ""
      this.dataList.push(item14)

      let item15 = { value: 0, name: "", id: 0, routerUrl: "" }
      item15.value = this.videoList.videoTransmissionAssetsAccuracy
      item15.name = "资产准确率"
      item15.id = 16
      item15.routerUrl = ""
      this.dataList.push(item15)

      let item16 = { value: 0, name: "", id: 0, routerUrl: "" }
      item16.value = this.videoList.videoTransmissionAssetsWeakPasswordScore
      item16.name = "资产弱口令得分比率"
      item16.id = 17
      item16.routerUrl = ""
      this.dataList.push(item16)

      let item17 = { value: 0, name: "", id: 0, routerUrl: "" }
      item17.value = this.videoList.videoTransmissionDangerousAssetsScore
      item17.name = "危险资产得分比重"
      item17.id = 18
      item17.routerUrl = ""
      this.dataList.push(item17)

      let item18 = { value: 0, name: "", id: 0, routerUrl: "" }
      item18.value = this.videoList.videoTransmissionBoundaryIntegrityDetection
      item18.name = "边界完整性检测扣分项"
      item18.id = 19
      item18.routerUrl = ""
      this.dataList.push(item18)

      let item19 = { value: 0, name: "", id: 0, routerUrl: "" }
      item19.value = this.videoList.keyCommandImageOnline
      item19.name = "月运行率"
      item19.id = 20
      item19.routerUrl = ""
      this.dataList.push(item19)

      let item20 = { value: 0, name: "", id: 0, routerUrl: "" }
      item20.value = this.videoList.operatingRate
      item20.name = "重点指挥图像在线率"
      item20.id = 21
      item20.routerUrl = ""
      this.dataList.push(item20)


    },
  }
};

 src/views/screen/newPage/index.vue

@@ -86,9 +86,8 @@
            overflow: hidden;
            overflow-x: auto;
            margin-top: -9px;
            height: 90%;
          ">
          <div style="width: 750px">
          <div style="width: 780px">
            <CarChart class="wrapper-item" :carList="carList"></CarChart>
          </div>
        </div>
@@ -100,7 +99,6 @@
        <div style="
            overflow: auto;
            margin-top: -9px;
            height: 90%;
          ">
          <div style="width: 1100px">
            <VideoChart class="wrapper-item" :videoList="videoList"></VideoChart>

 src/views/system/check/result/index.vue

@@ -204,7 +204,7 @@

        },
        yAxis: {
          min: 60
          min: 0
        },
        series: [
          {

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

@@ -28,10 +28,6 @@
          v-hasPermi="['platform:score:add']">新增</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="['platform:score: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="['platform:score:remove']">删除</el-button>
      </el-col>

 src/views/system/data-manage/data-detail/index.vue

@@ -1,6 +1,6 @@
<template>
  <div class="app-container">
    <el-card class="box-card">
    <el-card class="box-card" v-show="index !== 'image_resource_security'">
      <el-row style="display: flex; flex-direction: row; align-items: center" justify="space-between">
        <div v-for="card in cardList" style="display: flex;flex-direction: row; margin-right: 50px" :key="card.label">
          <div>
@@ -22,36 +22,41 @@
      </el-row>
    </el-card>

    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="卡口编号" prop="bayonetNumber">
        <el-input v-model="queryParams.bayonetNumber" placeholder="请输入卡口编号" clearable
          @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="卡口名称" prop="bayonetName">
        <el-input v-model="queryParams.bayonetName" placeholder="请输入卡口名称" clearable @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
    <!--    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
    <!--      <el-form-item label="卡口编号" prop="bayonetNumber">-->
    <!--        <el-input v-model="queryParams.bayonetNumber" placeholder="请输入卡口编号" clearable-->
    <!--          @keyup.enter.native="handleQuery" />-->
    <!--      </el-form-item>-->
    <!--      <el-form-item label="卡口名称" prop="bayonetName">-->
    <!--        <el-input v-model="queryParams.bayonetName" placeholder="请输入卡口名称" clearable @keyup.enter.native="handleQuery" />-->
    <!--      </el-form-item>-->
    <!--      <el-form-item>-->
    <!--        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>-->
    <!--        <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>-->
    <!--      </el-form-item>-->
    <!--    </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"
          v-hasPermi="['platform:platform:add']">新增</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="['platform:platform: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="['platform:platform:remove']">删除</el-button>
      </el-col>
    <el-row :gutter="10" class="mb8" v-show="index === 'image_resource_security'">
      <!--      <el-col :span="1.5">-->
      <!--        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"-->
      <!--          v-hasPermi="['platform:platform:add']">新增</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="['platform:platform: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="['platform:platform: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="['platform:platform:export']">导出</el-button>-->
      <!--      </el-col>-->
      <el-col :span="1.5">
        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
          v-hasPermi="['platform:platform:export']">导出</el-button>
                   v-hasPermi="['platform:platform:export']">导入
        </el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
@@ -62,9 +67,11 @@
      <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-edit" @click="handleUpdate(scope.row)"
            v-hasPermi="['platform:platform:edit']">修改</el-button>
                     v-hasPermi="['platform:platform:edit']">修改
          </el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
            v-hasPermi="['platform:platform:remove']">删除</el-button>
                     v-hasPermi="['platform:platform:remove']">删除
          </el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -150,7 +157,8 @@
        ],
      },
      tableHead: [],
      cardList: []
      cardList: [],
      index: null
    };
  },
  beforeRouteEnter(to, from, next) {
@@ -158,11 +166,12 @@
    next();
  },
  created() {
    this.index = this.$route.query.index;
    if (this.$route.query.type === '1') {
      let data = videoData.table.filter(item => item.index === this.$route.query.index)[0]
      this.tableHead = data.columns;
      this.cardList = data.card;
    };
    }
    if (this.$route.query.type === '2') {
      let data = carData.table.filter(item => item.index === this.$route.query.index)[0]
      this.tableHead = data.columns;
@@ -179,8 +188,15 @@
      this.cardList = data.card;
    }
    this.getList();
    if (this.index === 'image_resource_security') {
      this.getSecurityCard()
    }
  },
  methods: {
    /** 查询图像资源安全当月配置信息 */
    getSecurityCard() {

    },
    /** 查询卡口过车数据一致性列表 */
    getList() {
      let url = this.$route.query.url;
@@ -272,7 +288,8 @@
      }).then(() => {
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).catch(() => { });
      }).catch(() => {
      });
    },
    /** 导出按钮操作 */
    handleExport() {

 src/views/system/data-manage/data-detail/list.js

@@ -1968,8 +1968,59 @@
          ]
        }
      ]
    },
    {
      title: "视频图像资源安全管理",
      index: 'image_resource_security',
      columns: [
        {
          label: "ip",
          align: "center",
          prop: "ip"
        },
        {
          label: "部门",
          align: "center",
          prop: "deptName"
        },
        {
          label: "报警类型",
          align: "center",
          prop: "alarmCategory"
        },
        {
          label: "报警级别",
          align: "center",
          prop: "alarmLevel"
        },
        {
          label: "次数",
          align: "center",
          prop: "num"
        },
        {
          label: "报警时间",
          align: "center",
          prop: "alarmTime"
        },
      ],
      card: [
        {
          icon: 'el-icon-truck',
          dataList: [
            {
              value: 1999,
              label: '过车数据总量'
            },
            {
              value: 1999,
              label: '不唯一数据量'
            },
          ]
    }
  ]
    },
  ]
};

export const carData = {

 src/views/system/report/index.vue

@@ -412,6 +412,7 @@
    },
    // 表单重置
    reset() {
      this.daterangeCreateTime = [];
      this.form = {
        id: null,
        unitId: null,
@@ -423,9 +424,9 @@
        reportContent: null,
        reportMaterials: null,
        deleted: null,
        errorType: null
        errorType: null,
      };
      this.resetForm("form");
      // this.resetForm("form");
    },
    /** 搜索按钮操作 */
    handleQuery() {
@@ -450,14 +451,14 @@
    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      this.addOrImport = 'add'
      this.addOrImport = 'add';
      this.open = true;
      this.title = "添加报备";
    },
    /** 导入按钮操作 */
    handleImport() {
      this.reset();
      this.addOrImport = 'import'
      this.addOrImport = 'import';
      this.open = true;
      this.title = "导入报备";
    },
@@ -473,6 +474,7 @@
        this.daterangeCreateTime = [response.data.beginCreateTime, response.data.endCreateTime]
        this.form = response.data;
        this.form.errorType = this.form.errorType.split(',');
        this.addOrImport = 'add';
        this.open = true;
        this.title = "修改报备";
      });
@@ -500,6 +502,7 @@
    },
    /** 提交按钮 */
    submitForm() {
      this.form.pointId = this.form.pointId ? this.form.pointId : this.form.serialNumber;
      this.$refs["form"].validate(valid => {
        if (valid) {
          this.form.beginCreateTime = this.daterangeCreateTime[0]

 src/views/system/work-order/index.vue

@@ -12,9 +12,7 @@
      </el-form-item>
      <el-form-item label="故障类型" prop="errorTypeList">
        <el-select v-model="queryParams.errorTypeList" multiple placeholder="故障类型" clearable @clear="handleQuery">
          <el-option v-for="dict in dict.type.error_type"
                     :value="dict.value"
                     :label="dict.label"/>
          <el-option v-for="dict in dict.type.error_type" :value="dict.value" :key="dict.value" :label="dict.label" />
        </el-select>
      </el-form-item>
      <el-form-item label="工单状态" prop="status">
@@ -44,7 +42,7 @@
      </el-col>
    </el-row>

    <el-row v-if="workOrderList && workOrderList.length > 0" :gutter="20" v-loading="loading">
    <el-row :gutter="20" v-loading="loading">
      <el-col :xl="6" :lg="8" :md="12" :sm="24" v-for="item in workOrderList" :key="item.id">
        <div class="my-col">
          <div style="padding-left: 10px; padding-top: 8px">
@@ -130,7 +128,7 @@

      </el-col>
    </el-row>
    <el-empty v-else description="暂无数据"></el-empty>
    <el-empty v-if="empty" description="暂无数据"></el-empty>

    <pagination
      v-show="total>0"
@@ -240,9 +238,7 @@
      >
        <el-form-item label="故障类型" prop="errorType">
          <el-select v-model="batchAuditingWorkOrder.errorTypes" multiple placeholder="故障类型">
            <el-option v-for="(item, index) in errorTypeOptions" :label="item.dictLabel" :value="item.dictValue"
                       :key="index"
            ></el-option>
            <el-option v-for="dict in dict.type.error_type" :value="dict.value" :key="dict.value" :label="dict.label" />
          </el-select>
        </el-form-item>
        <el-form-item label="审核说明" prop="auditingRemark">
@@ -381,7 +377,6 @@
  getYwAuditingList
} from '@/api/platform/work-order'
import { addReport } from '@/api/platform/report'
import { getDicts } from '@/api/system/dict/data'

export default {
  name: 'Work-order',
@@ -389,8 +384,8 @@
  components: {},
  data() {
    return {
      empty: false,
      openShowCurrent: null,
      errorTypeOptions: [],
      ywConditions: [],
      batchAuditingVisible: false,
      batchAuditingWorkOrder: {
@@ -653,6 +648,7 @@
    },
    /** 查询运维工单列表 */
    getList() {
      this.empty = false;
      this.loading = true
      this.queryParams.params = {}
      this.queryParams['start'] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[0] : null
@@ -669,6 +665,9 @@
        this.workOrderList = response.data
        this.total = response.total
        this.loading = false
        if (this.total === 0) {
          this.empty = true
        }
      })
    },
    // 取消按钮