fuliqi
2024-11-06 23abf3c8d6ca9577608a3d5ab207d0da67e6e752
搜索样式功能统一、一些搜索bug
16个文件已修改
161 ■■■■■ 已修改文件
src/views/screen/components/map3.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/check/template/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/contract/contract-result/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/contract/contract/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/contract/score/index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/data-manage/data-detail/index.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/monitor/car/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/monitor/face/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/monitor/recovery/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/monitor/video/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/platform/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/point/index.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/report/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/work-order/distribute/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/work-order/index.vue 75 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/work-order/threshold/index.vue 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/screen/components/map3.vue
@@ -417,7 +417,8 @@
          },
          formatter: function (params) {
            return `{style|${params.data.name} \n 视频:${params.data.number} \n 车辆:${params.data.number} \n 人脸:${params.data.number}}`
            return `{style|${params.data.name} :${params.data.number}}`
            // return `{style|${params.data.name} \n 视频:${params.data.number} \n 车辆:${params.data.number} \n 人脸:${params.data.number}}`
          },
          rich: {
            style: {
src/views/system/check/template/index.vue
@@ -3,7 +3,7 @@
    <el-form style="margin-left :20px" :model="queryParams" ref="queryForm" size="small" :inline="true"
             v-show="showSearch" label-width="68px">
      <el-form-item label="考核类型" prop="examineCategory">
        <el-select v-model="queryParams.examineCategory" placeholder="考核类型" clearable @keyup.enter.native="handleQuery">
        <el-select v-model="queryParams.examineCategory" placeholder="考核类型" clearable @change="handleQuery">
          <el-option
            v-for="dict in dict.type.platform_examine_category"
            :key="dict.value"
@@ -13,7 +13,7 @@
        </el-select>
      </el-form-item>
      <el-form-item label="考核标签" prop="examineTag">
        <el-select v-model="queryParams.examineTag" placeholder="考核标签" clearable @keyup.enter.native="handleQuery">
        <el-select v-model="queryParams.examineTag" placeholder="考核标签" clearable @change="handleQuery">
          <el-option
            v-for="dict in dict.type.platform_examine_tag"
            :key="parseInt(dict.value)"
src/views/system/contract/contract-result/index.vue
@@ -43,6 +43,7 @@
          range-separator="-"
          start-placeholder="开始日期"
          end-placeholder="结束日期"
          @change="handleQuery"
        ></el-date-picker>
      </el-form-item>
      <el-form-item>
@@ -306,6 +307,9 @@
      if (null != this.daterangeCheckTime && "" != this.daterangeCheckTime) {
        this.queryParams["createStartTime"] = this.daterangeCheckTime[0];
        this.queryParams["createEndTime"] = this.daterangeCheckTime[1];
      }else {
        this.queryParams["createStartTime"] = null;
        this.queryParams["createEndTime"] = null;
      }
      console.log("this.queryParams", this.queryParams);
      listCheckResult(this.queryParams).then((response) => {
src/views/system/contract/contract/index.vue
@@ -11,7 +11,7 @@
        />
      </el-form-item>
      <el-form-item label="合同状态">
        <el-select v-model="queryParams.status" @change="getList">
        <el-select v-model="queryParams.status" @change="getList" clearable>
          <el-option label="全部" value=""></el-option>
          <el-option label="有效" value="ACTIVE"></el-option>
          <el-option label="未生效" value="NOT_START"></el-option>
src/views/system/contract/score/index.vue
@@ -8,13 +8,13 @@
        </el-select>
      </el-form-item>
      <el-form-item label="审核时间">
        <el-date-picker v-model="daterangeAuditingTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
        <el-date-picker v-model="daterangeAuditingTime" style="width: 240px" value-format="yyyy-MM-dd"
          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="handleQuery"></el-date-picker>
      </el-form-item>
      <el-form-item label="创建时间">
        <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
        <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="handleQuery"></el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
src/views/system/data-manage/data-detail/index.vue
@@ -76,11 +76,11 @@
    </el-row>
    <div style="display: flex;position: relative">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
        <el-form-item label="关键词" prop="bayonetNumber">
          <el-input v-model="queryParams.keyword" placeholder="关键词搜索" clearable @input="handleQuery"/>
        <el-form-item label="关键字" prop="bayonetNumber">
          <el-input v-model="queryParams.keyword" placeholder="国标码/设备名/ip搜索" clearable @keyup.enter.native="handleQuery" @clear="handleQuery"/>
        </el-form-item>
        <el-form-item :label="this.optionsName" prop="option" v-show = "this.optionsStatus">
          <el-select  v-model="queryParams.option" size="small" clearable>
          <el-select  v-model="queryParams.option" size="small" clearable @change="handleQuery">
            <el-option v-for="option in options" :key="option.value" :label="option.label" :value="option.value"></el-option>
          </el-select>
        </el-form-item>
@@ -89,7 +89,8 @@
              v-model="queryParams.date"
              type="date"
              placeholder="选择日期"
              value-format="yyyy-MM-dd">
              value-format="yyyy-MM-dd"
              @change="handleQuery">
            </el-date-picker>
        </el-form-item>
        <el-form-item>
src/views/system/monitor/car/index.vue
@@ -51,7 +51,7 @@
      <el-form-item label="关键字" prop="name">
        <el-input
          v-model="queryParams.name"
          placeholder="请输入关键字"
          placeholder="设备名/设备编码/IP/单位名"
          clearable
          @keyup.enter.native="handleQuery"
          @clear="handleQuery"
src/views/system/monitor/face/index.vue
@@ -51,7 +51,7 @@
      <el-form-item label="关键字" prop="name">
        <el-input
          v-model="queryParams.name"
          placeholder="请输入关键字"
          placeholder="设备名/设备编码/IP/单位名"
          clearable
          @keyup.enter.native="handleQuery"
          @clear="handleQuery"
src/views/system/monitor/recovery/index.vue
@@ -51,7 +51,7 @@
      <el-form-item label="关键字" prop="name">
        <el-input
          v-model="queryParams.name"
          placeholder="请输入关键字"
          placeholder="设备名/设备编码/IP/单位名"
          clearable
          @keyup.enter.native="handleQuery"
          @clear="handleQuery"
src/views/system/monitor/video/index.vue
@@ -54,7 +54,7 @@
          <el-form-item label="关键字" prop="name">
            <el-input
              v-model="queryParams.name"
              placeholder="请输入关键字"
              placeholder="设备名/设备编码/IP/单位名"
              clearable
              @keyup.enter.native="handleQuery"
              @clear="handleQuery"
src/views/system/platform/index.vue
@@ -1,8 +1,8 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" @submit.native.prevent>
      <el-form-item label="平台名称" prop="workOrderNo">
        <el-input v-model="queryParams.keyword" placeholder="关键词搜索" @clear="handleQuery" clearable @keyup.enter.native="handleQuery" size="small"></el-input>
        <el-input v-model="queryParams.keyword" placeholder="请输入平台名称" @clear="handleQuery" clearable @keyup.enter.native="handleQuery" size="small" ></el-input>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
src/views/system/point/index.vue
@@ -5,6 +5,19 @@
        <el-input v-model="queryParams.pointName" placeholder="输入点位名称" clearable @clear="handleQuery" @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="单位" prop="unit">
        <el-select
          v-model="queryParams.unitId"
          placeholder="请选择单位"
          clearable
          @change="handleQuery"
        >
          <el-option
            v-for="unit in unitList"
            :key="unit.id"
            :label="unit.value"
            :value="unit.id"
          />
        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
@@ -247,7 +260,6 @@
import { unitSelect } from "@/api/platform/unit";
import { getCascader } from '@/api/platform/region'
import { cascader } from '@/api/system/dept'
export default {
  name: "Point",
  dicts: ['point_tag', 'area_code'],
@@ -442,7 +454,12 @@
    handleEditBatch() {
      this.batchOpen = true;
    },
    // 运维公司下拉数据
    selectUnit() {
      workList(this.queryParams).then(res => {
        this.unitList = res.data;
      })
    },
    // 获取区县级联
    getCascader() {
      getCascader().then(res => {
src/views/system/report/index.vue
@@ -2,7 +2,7 @@
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="关键字" prop="peopleId">
        <el-input v-model="queryParams.keyword" placeholder="请输入关键字" clearable @keyup.enter.native="handleQuery" />
        <el-input v-model="queryParams.keyword" placeholder="点位名搜索" clearable @keyup.enter.native="handleQuery" @clear="handleQuery"/>
      </el-form-item>
      <el-form-item label="报备类型" prop="reportType">
        <el-select v-model="queryParams.reportType" @change="handleQuery" placeholder="报备类型" clearable>
src/views/system/work-order/distribute/index.vue
@@ -16,10 +16,10 @@
    <el-row class="op-warp">
      <el-row v-show="showSearch">
        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
          <el-form-item label="关键词" prop="keyword">
          <el-form-item label="关键字" prop="keyword">
            <el-input
              v-model="queryParams.keyword"
              placeholder="关键词搜索"
              placeholder="工单号/设备名/设备编号搜索"
              clearable
              @keyup.enter.native="page"
              @clear="page"
src/views/system/work-order/index.vue
@@ -1,7 +1,20 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="关键词" prop="keyword">
  <div style=" padding: 0 20px;">
    <el-row type="flex" justify="left" v-if="this.$store.state.user.roles.some(role => ['admin', 'zg_city', 'city_leader'].includes(role))">
      <el-col :span="24" style="position: relative">
        <el-menu :default-active="activeIndex" class="el-menu" mode="horizontal">
          <el-menu-item index="0" @click="changeUnit(null, '全部')">
            全部单位({{ totalWorkOrders }})
          </el-menu-item>
          <el-menu-item :index="index + 1" v-for="(item, index) in unitList" :key="index" @click="changeUnit(item.id, item.value)">
            {{ item.unitName }}({{ item.workOrderCount }})
          </el-menu-item>
        </el-menu>
      </el-col>
    </el-row>
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" style="margin-top: 10px;">
      <el-form-item label="关键字" prop="keyword">
        <el-input
          v-model="queryParams.keyword"
          placeholder="工单号/点位名称搜索"
@@ -42,7 +55,6 @@
        <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
@@ -121,10 +133,13 @@
                    <el-col :span="24" class="time">故障时间:{{ item.createTime }}</el-col>
                  </el-row>
                  <el-row class="work-order-item">
                    <el-col class="time" :span="24"><div>国标码:{{ item.serialNumber }}</div>
                    <el-col class="time" :span="24">
                      <div>国标码:{{ item.serialNumber }}</div>
                      <el-tooltip effect="dark" :content="item.source" placement="top-start">
                        <div>{{ item.source }}</div>
                      </el-tooltip></el-col>
                      </el-tooltip>
                      <div>IP:{{ item.ip }}</div>
                    </el-col>
                  </el-row>
                  <el-row style="position: absolute;bottom: 10px">
                    <el-button
@@ -488,6 +503,7 @@
  getYwCondition,
  process
} from '@/api/platform/work-order'
import {workList} from "@/api/platform/unit";
import { addReport } from '@/api/platform/report'
import WorkOrderAuditing from "@/components/WorkOrder/WorkOrderAuditing";
@@ -497,10 +513,12 @@
  components: {WorkOrderAuditing},
  data() {
    return {
      activeIndex: '0',
      drawer: false,
      empty: false,
      openShowCurrent: null,
      ywConditions: [],
      unitList: [],
      batchAuditingVisible: false,
      batchAuditingWorkOrder: {
        errorTypes: [],
@@ -570,6 +588,7 @@
        keyword: null,
        status: ''
      },
      // 表单参数
      form: {},
      // 审核表单
@@ -651,6 +670,12 @@
      this.ywData.content = item.ywCondition
      this.ywData.fileList = item.ywProofMaterials
      this.drawer = true
    },
    changeUnit(unitId, unitName) {
      this.unitId = unitId;
      this.queryParams.unitId = unitId;
      this.unitName = unitName;
      this.getList()
    },
    // 批量审核
    batchAuditing(result) {
@@ -817,22 +842,28 @@
      if (this.queryParams.timeRange && this.queryParams.timeRange.length > 0) {
        this.queryParams.start = this.queryParams.timeRange[0]
        this.queryParams.end = this.queryParams.timeRange[1]
      }else {
        this.queryParams.start = null
        this.queryParams.end = null
      }
      this.queryParams.isNotDistribute = true;
      listWorkOrder(this.queryParams).then(response => {
        response.data.forEach(item => {
          if (item.imgList) {
            item.imgList = item.imgList.map(img => {
              return this.$img + img
            })
        workList(this.queryParams).then(res => {
          this.unitList = res.data;
          response.data.forEach(item => {
            if (item.imgList) {
              item.imgList = item.imgList.map(img => {
                return this.$img + img
              })
            }
          })
          this.workOrderList = response.data
          this.total = response.total
          this.loading = false
          if (this.total === 0) {
            this.empty = true
          }
        })
        this.workOrderList = response.data
        this.total = response.total
        this.loading = false
        if (this.total === 0) {
          this.empty = true
        }
      })
      //   .catch(error => {
      //   //避免防重提卡在加载
@@ -945,7 +976,12 @@
        ...this.queryParams
      }, `work-order_${new Date().getTime()}.xlsx`)
    }
  }
  },
  computed: {
    totalWorkOrders() {
      return this.unitList.reduce((total, item) => total + item.workOrderCount, 0);
    },
  },
}
</script>
@@ -1015,4 +1051,5 @@
::v-deep el-step__description.is-finish {
  color: gray;
}
</style>
src/views/system/work-order/threshold/index.vue
@@ -285,20 +285,11 @@
    </el-row>
    <el-row class="content-warp">
      <div class="header—text" style="margin-bottom: 5px">工单白名单</div>
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
        <el-form-item label="设备编码" prop="serialNumber">
      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" @submit.native.prevent>
        <el-form-item label="关键字" prop="keyword">
          <el-input
            v-model="queryParams.serialNumber"
            placeholder="设备编码"
            clearable
            @keyup.enter.native="getWhiteList"
            @clear="getWhiteList"
          />
        </el-form-item>
        <el-form-item label="点位名称" prop="pointName">
          <el-input
            v-model="queryParams.pointName"
            placeholder="点位名称"
            v-model="queryParams.keyword"
            placeholder="设备编码/点位名"
            clearable
            @keyup.enter.native="getWhiteList"
            @clear="getWhiteList"