xiangpei
2024-09-02 573fbbca995594ae5776d33fce2bfee70523f096
数据中心bug修改
6个文件已修改
145 ■■■■■ 已修改文件
src/api/platform/data-center.js 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/data-manage/data-detail/index.vue 117 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/data-manage/data-detail/list.js 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/report/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/work-order/distribute/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/work-order/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/platform/data-center.js
@@ -1,11 +1,11 @@
import request from '@/utils/request'
// 数据中心接口
export function dataCenter(url, params) {
export function dataCenter(url, data) {
  return request({
    url: '/data/center/' + url,
    method: 'get',
    params: params
    method: 'post',
    data: data
  })
}
src/views/system/data-manage/data-detail/index.vue
@@ -8,10 +8,13 @@
              <i :class="card.icon"></i>
            </div>
          </div>
          <div v-for="data, index in card.dataList" class="dashboard-item" :key="data.label">
            <div style="color: #5C9BF8;margin-bottom: 20px;font-size: 20px">{{ platformList.count[index] }}</div>
          <div v-if="card.dataList && card.dataList.length > 0">
            <div v-if="data" v-for="(data, index) in card.dataList" class="dashboard-item" :key="data.label">
              <div style="color: #5C9BF8;margin-bottom: 20px;font-size: 20px">{{ tableData.count[index] }}</div>
            <div>{{ data.label }}</div>
          </div>
          </div>
        </div>
        <!--        <el-col :span="1">-->
        <!--          <div class="dashboard-item">-->
@@ -22,26 +25,32 @@
      </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.keyword" placeholder="关键词搜索" clearable
          @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="时间范围" prop="timeRange">
        <el-date-picker
          v-model="queryParams.timeRange"
          type="daterange"
          range-separator="至"
          start-placeholder="开始日期"
          end-placeholder="结束日期">
        </el-date-picker>
      </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" v-show="index === 'image_resource_security'">
      <el-container>
        <el-main>
          <h2>视频图像资源安全管理</h2>
          <el-row :gutter="20">
            <el-col :xl="3" :lg="3" :md="6" :sm="6" :xs="12" v-for="(item, index) in imageResourceSecurity" :key="index"
            <el-col :xl="3" :lg="3" :md="6" :sm="6" :xs="12" v-if="imageResourceSecurity && imageResourceSecurity.length > 0" v-for="(item, index) in imageResourceSecurity" :key="index"
              class="col-margin">
              <el-card style="
                min-width: 150px;
@@ -73,9 +82,12 @@
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <el-table v-loading="loading" :data="platformList.list">
      <el-table-column :prop="item.prop" :label="item.label" v-for="(item, index) in tableHead" :key="index" />
    <div v-if="tableData.list && tableData.list.length >0">
      <el-table v-loading="loading" :data="tableData.list">
        <el-table-column :prop="item.prop" :label="item.label" v-for="(item, index) in tableHead" :key="index" v-if="item"/>
    </el-table>
    </div>
    <el-empty v-else description="暂无数据"></el-empty>
    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
      @pagination="getList" />
@@ -103,7 +115,7 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="cancel">取 消</el-button>
        <el-button @click="cancelR">取 消</el-button>
        <el-button type="primary" @click="submitForm">确 定</el-button>
      </div>
    </el-dialog>
@@ -137,8 +149,27 @@
import { getToken } from "@/utils/auth";
export default {
  name: "Platform",
  // watch: {
  //   tableData: {
  //     immediate: true,
  //     deep: true,
  //     handler(newVal) {
  //       if(newVal && newVal.list) {
  //         this.list = newVal.detail;
  //       }
  //     }
  //   }
  // },
  // computed: {
  //   startTime() {
  //     var date = new Date();
  //     var s1 = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + (date.getDate()-1);
  //     return s1;
  //   }
  // },
  data() {
    return {
      list: [],
      // 导入参数
      upload: {
        // 是否显示弹出层
@@ -171,8 +202,9 @@
      showSearch: true,
      // 总条数
      total: 0,
      // 卡口过车数据一致性表格数据
      platformList: [],
      tableData: {
        list: []
      },
      // 弹出层标题
      title: "",
      // 是否显示弹出层
@@ -181,9 +213,8 @@
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        regionCode: null,
        bayonetName: null,
        bayonetNumber: null,
        keyword: '',
        timeRange: [],
      },
      // 表单参数
      form: {},
@@ -205,26 +236,35 @@
          { required: true, message: "请输入视频传输网危险资产比例", trigger: "blur" },
          { type: "number", message: "视频传输网危险资产比例必须为数字", trigger: "blur" }
        ],
        boundaryIntegrity: [
          { required: true, message: "请输入视频传输网边界完整性检测扣分项", trigger: "blur" },
          { type: "number", message: "视频传输网边界完整性检测扣分项必须为数字", trigger: "blur" }
        ]
      },
      tableHead: [],
      cardList: [],
      index: null
    };
  },
  beforeRouteEnter(to, from, next) {
    console.log(to);
    next();
  },
  created() {
  mounted() {
    // 获取当前日期
    const today = new Date();
    // 将日期减去一天
    const yesterday = new Date(today.getTime() - 24 * 60 * 60 * 1000);
    // 获取年、月、日
    const year = yesterday.getFullYear();
    let month = (yesterday.getMonth() + 1).toString().padStart(2, '0'); // 月份是从0开始的,所以加1
    let day = yesterday.getDate().toString().padStart(2, '0');
    // 拼接成 yyyy-MM-dd 格式
    let yesterday1 =  `${year}-${month}-${day}`;
    this.queryParams.timeRange = [yesterday1, yesterday1]
    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;
      console.log(this.cardList, "wcnm")
    }
    if (this.$route.query.type === '2') {
      let data = carData.table.filter(item => item.index === this.$route.query.index)[0]
@@ -265,7 +305,7 @@
      });
    },
    // 取消按钮
    cancel() {
    cancelR() {
      this.resourceOpen = false;
      this.reset("resourceForm");
    },
@@ -282,14 +322,19 @@
      if (this.index === 'image_resource_security') {
        this.getSecurityCard()
      }
      if (this.queryParams.timeRange && this.queryParams.timeRange.length > 0) {
        this.queryParams.startTime = this.queryParams.timeRange[0]
        this.queryParams.endTime = this.queryParams.timeRange[1]
      }
      dataCenter(url, this.queryParams).then(response => {
        this.platformList = response.data;
        response.data.list = response.data.list && response.data.list.length >0 ? response.data.list : []
        this.tableData = response.data;
        this.total = response.total;
        this.loading = false;
      });
    },
    // 取消按钮
    cancel() {
    cancelImport() {
      this.open = false;
      this.reset();
    },
src/views/system/data-manage/data-detail/list.js
@@ -15,11 +15,6 @@
          prop: 'platformIp',
        },
        {
          label: '当前是否在线',
          align: 'center',
          prop: 'currentOnline'
        },
        {
          label: '今日离线时长(秒)',
          align: 'center',
          prop: 'todayOutlineSed'
@@ -27,7 +22,7 @@
        {
          label: '日期',
          align: 'center',
          prop: 'create_date'
          prop: 'createDate'
        },
      ],
      card: [
src/views/system/report/index.vue
@@ -35,7 +35,8 @@
          v-hasPermi="['system:report:add']">单次报备</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport">批量报备</el-button>
        <el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
                   v-hasPermi="['system:report:add']">批量报备</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
@@ -87,7 +88,7 @@
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
            v-hasPermi="['system:report:edit']" v-if="scope.row.status === 2 || scope.row.status === 0">修改</el-button>
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAuditing(scope.row)"
            v-hasPermi="['system:report:edit']" v-if="scope.row.status === 0 || scope.row.status === 2">审核</el-button>
            v-hasPermi="['system:report:auditing']" v-if="scope.row.status === 0 || scope.row.status === 2">审核</el-button>
          <el-button size="mini" type="text" icon="el-icon-s-check" @click="handleAuditingRecord(scope.row.id)"
            v-hasPermi="['system:report:record']">审核记录</el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -380,9 +381,9 @@
      if (item.result === 0) {
        return '审核中'
      } else if (item.status === 1) {
        return '审核通过'
        return '通过'
      } else if (item.status === 2) {
        return '审核未通过'
        return '未通过'
      }
    },
    auditingCancel() {
src/views/system/work-order/distribute/index.vue
@@ -146,13 +146,13 @@
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="工单来源" prop="source">
        <el-form-item label="故障点位" prop="source">
          <el-select
            v-model="form.source"
            filterable
            remote
            reserve-keyword
            placeholder="请选择来源"
            placeholder="国标码/点位名称搜索"
            :remote-method="remoteGetPoints"
            @change="setPointId"
            :loading="selectLoading">
src/views/system/work-order/index.vue
@@ -247,7 +247,7 @@
      </div>
    </el-dialog>
    <el-dialog title="运维批量审核" :visible.sync="batchAuditingVisible" width="500px" append-to-body>
    <el-dialog title="工单批量审核" :visible.sync="batchAuditingVisible" width="500px" append-to-body>
      <el-form ref="batchAuditingWorkOrder" :model="batchAuditingWorkOrder" label-width="80px"
               :rules="batchAuditingRules"
      >