fuliqi
2024-10-15 0e944bfc16136c0a749fc6022e0dfc7f2b4af010
工单图片样式调整、取消考核页面人脸和车辆的公安部按钮
5个文件已修改
213 ■■■■ 已修改文件
src/views/system/check/result/detail/detail.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/check/result/detail/index.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/data-manage/data-detail/list.js 180 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/data-manage/equipment/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/work-order/detail/index.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/check/result/detail/detail.vue
@@ -5,7 +5,7 @@
               >
          <el-menu-item index="0">省厅考核</el-menu-item>
          <el-menu-item index="1">区县考核</el-menu-item>
          <el-menu-item index="2">公安部考核</el-menu-item>
          <el-menu-item index="2" v-if ="examineCategory==1">公安部考核</el-menu-item>
        </el-menu>
      </div>
    <el-container>
@@ -335,6 +335,7 @@
    if(this.$route.query.deptId){
      this.queryParams.deptId = this.$route.query.deptId;
    }
    this.examineCategory = this.$route.query.examineCategory;
    let examineTag = this.$route.query.examineTag;
    this.activeIndex = examineTag;
    this.queryParams.examineTag = examineTag;
src/views/system/check/result/detail/index.vue
@@ -72,7 +72,7 @@
                size="mini"
                type="text"
                icon="el-icon-view"
                @click="handleDetail(scope.row.id)"
                @click="handleDetail(scope.row)"
              >详细
              </el-button>
            </div>
@@ -246,12 +246,13 @@
    handleCurrentChange(val) {
      console.log(`当前页: ${val}`);
    },
    handleDetail(id) {
    handleDetail(row) {
      this.$router.push({
        path: '/check/detail/detail',
        query: {
          id: id,
          id: row.id,
          examineTag: this.activeIndex,
          examineCategory: row.examineCategory,
          deptId: this.queryParamsList.deptId
        }
      })
src/views/system/data-manage/data-detail/list.js
@@ -4799,153 +4799,153 @@
      index: 'view_zc_manage',
      columns: [
        {
          label: "设备编码",
          align: "center",
          prop: "serialNumber"
          "label": "设备编码",
          "align": "center",
          "prop": "serialNumber"
        },
        {
          label: "设备名称",
          align: "center",
          prop: "name"
          "label": "设备名称",
          "align": "center",
          "prop": "name"
        },
        {
          label: "监控点位类型",
          align: "center",
          prop: "siteType"
          "label": "监控点位类型",
          "align": "center",
          "prop": "siteType"
        },
        {
          label: "Mac地址",
          align: "center",
          prop: "macAddr"
          "label": "Mac地址",
          "align": "center",
          "prop": "macAddr"
        }, {
          label: "IPV4/IPV6",
          align: "center",
          prop: "ip"
          "label": "IPV4/IPV6",
          "align": "center",
          "prop": "ip"
        },
        {
          label: "摄像机功能类型",
          align: "center",
          prop: "cameraFunType"
          "label": "摄像机功能类型",
          "align": "center",
          "prop": "cameraFunType"
        },
        {
          label: "经度",
          align: "center",
          prop: "longitude"
          "label": "经度",
          "align": "center",
          "prop": "longitude"
        },
        {
          label: "纬度",
          align: "center",
          prop: "latitude"
          "label": "纬度",
          "align": "center",
          "prop": "latitude"
        },
        {
          label: "摄像机采集区域",
          align: "center",
          prop: "cameraCaptureArea"
          "label": "摄像机采集区域",
          "align": "center",
          "prop": "cameraCaptureArea"
        },
        {
          label: "设备状态",
          align: "center",
          prop: "onState"
          "label": "设备状态",
          "align": "center",
          "prop": "onState"
        },
        {
          label: "行政区域",
          align: "center",
          prop: "civilCode"
          "label": "行政区域",
          "align": "center",
          "prop": "civilCode"
        },
        {
          label: "是否集成设备",
          align: "center",
          prop: "integratedDevice"
          "label": "是否集成设备",
          "align": "center",
          "prop": "integratedDevice"
        },
        {
          label: "摄像机品牌",
          align: "center",
          prop: "cameraBrand"
          "label": "摄像机品牌",
          "align": "center",
          "prop": "cameraBrand"
        },
        {
          label: "安装地址",
          align: "center",
          prop: "address"
          "label": "安装地址",
          "align": "center",
          "prop": "address"
        },
        {
          label: "联网属性",
          align: "center",
          prop: "netWorking"
          "label": "联网属性",
          "align": "center",
          "prop": "netWorking"
        },
        {
          label: "所属辖区公安机关",
          align: "center",
          prop: "publicSecurity"
          "label": "所属辖区公安机关",
          "align": "center",
          "prop": "publicSecurity"
        },
        {
          label: "安装时间",
          align: "center",
          prop: "installedTime"
          "label": "安装时间",
          "align": "center",
          "prop": "installedTime"
        },
        {
          label: "管理单位",
          align: "center",
          prop: "managementUnit"
          "label": "管理单位",
          "align": "center",
          "prop": "managementUnit"
        },
        {
          label: "管理单位联系方式",
          align: "center",
          prop: "muContactInfo"
          "label": "管理单位联系方式",
          "align": "center",
          "prop": "muContactInfo"
        },
        {
          label: "录像保存天数",
          align: "center",
          prop: "storageDays"
          "label": "录像保存天数",
          "align": "center",
          "prop": "storageDays"
        },
        {
          label: "监视方位",
          align: "center",
          prop: "monitorAzimuth"
          "label": "监视方位",
          "align": "center",
          "prop": "monitorAzimuth"
        },
        {
          label: "摄像机场景预设照片URL",
          align: "center",
          prop: "scenePhotoAddr"
          "label": "摄像机场景预设照片URL",
          "align": "center",
          "prop": "scenePhotoAddr"
        },
        {
          label: "设备型号",
          align: "center",
          prop: "model"
          "label": "设备型号",
          "align": "center",
          "prop": "model"
        },
        {
          label: "点位俗称",
          align: "center",
          prop: "siteVulgo"
          "label": "点位俗称",
          "align": "center",
          "prop": "siteVulgo"
        },
        {
          label: "摄像机类型",
          align: "center",
          prop: "cameraType"
          "label": "摄像机类型",
          "align": "center",
          "prop": "cameraType"
        },
        {
          label: "补光属性",
          align: "center",
          prop: "cameraLightType"
          "label": "补光属性",
          "align": "center",
          "prop": "cameraLightType"
        },
        {
          label: "摄像机编码格式",
          align: "center",
          prop: "encodedFormat"
          "label": "摄像机编码格式",
          "align": "center",
          "prop": "encodedFormat"
        },
        {
          label: "所属部门/行业",
          align: "center",
          prop: "cameraDept"
          "label": "所属部门/行业",
          "align": "center",
          "prop": "cameraDept"
        },
        {
          label: "行业编码",
          align: "center",
          prop: "hybm"
          "label": "行业编码",
          "align": "center",
          "prop": "hybm"
        },
        {
          label: "类型编码",
          align: "center",
          prop: "lxbm"
          "label": "类型编码",
          "align": "center",
          "prop": "lxbm"
        }
      ],
      card: [
src/views/system/data-manage/equipment/index.vue
@@ -105,7 +105,7 @@
      <el-table-column label="设备名称" align="center" prop="name" width="280" fixed/>
      <el-table-column label="设备编码" align="center" prop="serialNumber" width="180"/>
      <el-table-column label="标签" align="center" prop="publicSecurity" width="180" v-if="columns[0].visible"/>
      <el-table-column label="区域" align="center" prop="address" width="180" v-if="columns[1].visible"/>
      <el-table-column label="区域" align="center" prop="cameraCaptureArea" width="180" v-if="columns[1].visible"/>
      <el-table-column label="设备状态" align="center" prop="onState" v-if="columns[2].visible">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/>
@@ -250,7 +250,6 @@
  created() {
    this.getVideoCount();
    this.getList();
    this.getDyColumn()
  },
  methods: {
    getDyColumn() {
@@ -269,7 +268,7 @@
    /** 查询设备资产列表 */
    getList() {
      this.loading = true;
      this.getDyColumn()
      // this.getDyColumn()
      dataCenter('assetManagement', this.queryParams).then(response => {
        this.monitorList = response.data;
        this.total = response.total;
src/views/system/work-order/detail/index.vue
@@ -156,12 +156,13 @@
      <div class="img-info" v-for="(img, index) in workOrderInfo.imgList" :key="index">
        <div>
          <el-image
            style="width: 160px; height: 100px"
            style="width: 100%; height: auto"
            :src="getImgUrl(img.imgUrl)"
            :preview-src-list="getImgUrl(img.imgUrl)">
            :preview-src-list="workOrderInfo.imgList.map(i => getImgUrl(i.imgUrl))"
            >
          </el-image>
        </div>
        <div style="margin-top: 8px">{{img.createTime}}</div>
        <div style="margin-top: 8px;text-align: center">{{img.createTime}}</div>
      </div>
    </div>
@@ -288,14 +289,15 @@
<style scoped>
.img-info {
  display: flex;
  flex-direction: column;
  justify-content: center;
  align-items: center;
  padding: 0 5px;
  flex: 0 0 calc(20% - 8px); /* 每行五个,所以每个占20%,减去间距 */
  box-sizing: border-box;
}
.work-order-img {
  margin-top: 15px;
  display: flex;
  flex-wrap: wrap;
  gap: 8px; /* 可选:设置图片之间的间距 */
}
.work-order-info {
  width: 100%;