Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-05 7e0ec9b7a6899cb47c0230231ca23924cef42c25

Merge remote-tracking branch 'origin/master'

 src/assets/images/ht.jpg

 src/assets/images/profile.jpg

 src/assets/images/profile1.jpg

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

@@ -39,16 +39,16 @@
    </el-row>
    <el-row v-if="contractList && contractList.length > 0" v-loading="loading" :gutter="20">
      <el-col
        :span="8"
        :span="6"
        v-for="(item, index) in contractList"
        :key="index"
        style="margin-bottom: 10px"
      >
        <el-card :body-style="{ padding: '0px' }">
          <ImagePreview
          <el-image
            style="width: 100%; height: 187px"
            fit="cover"
            :src="item.attachment"
            :src="require('../../../../assets/images/ht.jpg')"
            class="image"
          />
          <div style="padding: 14px">

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

@@ -1,8 +1,12 @@
<template>
  <div class="app-container">
    <div style="display: flex;flex-direction: row;min-width: 158px;max-width: 158px;margin-bottom: 5px;border-radius: 1px">
      <div @click="allData(0)" class="tab" :class="{tabActive: 0 === selected, tabInactive: 0 !== selected}">全部</div>
      <div @click="provinceData(1)" class="tab" :class="{tabActive: 1 === selected, tabInactive: 1 !== selected}">省厅考核</div>
    </div>
    <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 style="font-size: 18px;min-width: 200px">{{ruleName}}</div>
        <div style="font-size: 18px;min-width: 200px;height: 80px;display: flex;align-items: center">{{ruleName}}</div>
        <div v-if="cardList && cardList.length > 0" v-for="card in cardList" style="display: flex;flex-direction: row; margin-right: 50px;margin-left: 20px;align-items: center" :key="card.label">
          <div>
            <div class="icon-container">
@@ -26,6 +30,7 @@
      </el-row>
    </el-card>

    <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"/>
@@ -44,6 +49,9 @@
        <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
      <right-toolbar style="position: absolute;right: 0px" v-show="index !== 'image_resource_security'" :showSearch.sync="showSearch" @queryTable="handleQuery" :columns="showList"></right-toolbar>
    </div>


    <el-row :gutter="10" class="mb8" v-show="index === 'image_resource_security'">
      <el-container>
@@ -81,8 +89,6 @@
      </el-col>
      <right-toolbar  :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <right-toolbar v-show="index !== 'image_resource_security'" :showSearch.sync="showSearch" @queryTable="handleQuery" :columns="showList"></right-toolbar>

    <div>
      <el-table v-loading="loading" :data="tableData.list">
@@ -160,6 +166,7 @@
  },
  data() {
    return {
      selected: 0,
      // 导入参数
      upload: {
        // 是否显示弹出层
@@ -277,6 +284,12 @@
    this.getList();
  },
  methods: {
    allData(active) {
      this.selected = active
    },
    provinceData(active) {
      this.selected = active
    },
    showListPD(item) {
      if (!this.showList) {
        return true
@@ -399,6 +412,26 @@
};
</script>
<style scoped>
.tab {
  padding: 5px 15px;
}
.tab:hover {
  cursor: pointer;
  user-select: none;
}
.tabActive {
  color: white;
  background-color: #409eff;
  border: none;
  border-radius: 1px;
}
.tabInactive {
  background-color: #edf2f6;
  color: #409eff;
}
.tabInactive:hover {
  background-color: #edf2f6;
}
.box-card {
  background-color: #F5F9FE;
  width: 100%;

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

@@ -338,6 +338,9 @@
            {
              label: '纬度异常数'
            },
            {
              label: '合格率'
            },
          ]
        }
      ],
@@ -666,6 +669,9 @@
            },
            {
              label: '纬度异常数'
            },
            {
              label: '注册率'
            },
          ]
        }
@@ -996,6 +1002,9 @@
            {
              label: '纬度异常数'
            },
            {
              label: '考核比'
            },
          ]
        }
      ],
@@ -1155,6 +1164,9 @@
            {
              label: '设备总数'
            },
            {
              label: '在线率'
            },
          ]
        }
      ],
@@ -1303,6 +1315,9 @@
            {
              label: '设备总数'
            },
            {
              label: '在线率'
            },
          ]
        }
      ],
@@ -1392,6 +1407,9 @@
            {
              label: '异常'
            },
            {
              label: '可用率'
            },
          ]
        }
      ]
@@ -1468,6 +1486,9 @@
            },
            {
              label: '异常'
            },
            {
              label: '可用率'
            },
          ]
        }
@@ -1943,21 +1964,9 @@
            {
              label: '设备总数'
            },
            // {
            //   label: '已联网'
            // },
            // {
            //   label: '未联网'
            // },
            // {
            //   label: '视频监控'
            // },
            // {
            //   label: '车辆识别'
            // },
            // {
            //   label: '人脸识别'
            // },
            {
              label: '在线率'
            },
          ]
        }
      ],
@@ -2046,6 +2055,9 @@
            },
            {
              label: '异常'
            },
            {
              label: '可用率'
            },
          ]
        }
@@ -2144,7 +2156,10 @@
            },
            {
              label: 'osd时间标注错误数'
            }
            },
            {
              label: '标注正确率'
            },
          ]
        }
      ],
@@ -2236,7 +2251,10 @@
            },
            {
              label: 'osd时间标注错误数'
            }
            },
            {
              label: '校时正确率'
            },
          ]
        }
      ],
@@ -2393,21 +2411,9 @@
            {
              label: '设备总数'
            },
            // {
            //   label: '已联网'
            // },
            // {
            //   label: '未联网'
            // },
            // {
            //   label: '视频监控'
            // },
            // {
            //   label: '车辆识别'
            // },
            // {
            //   label: '人员识别'
            // },
            {
              label: '在线率'
            },
          ]
        }
      ],
@@ -2616,6 +2622,9 @@
            {
              label: '数据量少'
            },
            {
              label: '稳定性'
            },
          ]
        }
      ]
@@ -2691,6 +2700,9 @@
          dataList: [
            {
              label: '设备总数'
            },
            {
              label: '在线率'
            },
          ]
        }
@@ -2998,6 +3010,9 @@
            {
              label: '纬度异常数'
            },
            {
              label: '一致率'
            },
          ]
        }
      ],
@@ -3088,6 +3103,9 @@
            },
            {
              label: '精度过低'
            },
            {
              label: '准确率'
            },
          ]
        }
@@ -3192,7 +3210,9 @@
        {
          icon: 'el-icon-truck',
          dataList: [

            {
              label: '完整性'
            }
          ]
        }
      ],
@@ -3282,7 +3302,9 @@
        {
          icon: 'el-icon-truck',
          dataList: [

            {
              label: '准确性'
            }
          ]
        }
      ],
@@ -3543,6 +3565,9 @@
            {
              label: '数据量少'
            },
            {
              label: '准确性'
            },
          ]
        }
      ],
@@ -3653,7 +3678,9 @@
        {
          icon: 'el-icon-truck',
          dataList: [

            {
              label: '及时性'
            }
          ]
        }
      ]
@@ -3739,7 +3766,9 @@
        {
          icon: 'el-icon-truck',
          dataList: [

            {
              label: '可用性'
            }
          ]
        }
      ]
@@ -3861,7 +3890,9 @@
        {
          icon: 'el-icon-truck',
          dataList: [

            {
              label: '可用性'
            }
          ]
        }
      ],
@@ -3951,6 +3982,9 @@
            {
              label: '数据量少'
            },
            {
              label: '稳定性'
            },
          ]
        }
      ]
@@ -4028,6 +4062,9 @@
            },
            {
              label: '数据量少'
            },
            {
              label: '在线率'
            },
          ]
        }
@@ -4335,6 +4372,9 @@
            {
              label: '纬度异常数'
            },
            {
              label: '一致率'
            },
          ]
        }
      ],
@@ -4430,6 +4470,9 @@
            {
              label: '精度过低'
            },
            {
              label: '准确率'
            },
          ]
        }
      ]
@@ -4490,6 +4533,9 @@
            },
            {
              label: '精度过低'
            },
            {
              label: '合格性'
            },
          ]
        }
@@ -4717,6 +4763,9 @@
            {
              label: '数据量少'
            },
            {
              label: '准确性'
            },
          ]
        }
      ],
@@ -4937,6 +4986,9 @@
            {
              label: '数据量少'
            },
            {
              label: '及时性'
            },
          ]
        }
      ],
@@ -5064,7 +5116,9 @@
        {
          icon: 'el-icon-truck',
          dataList: [

            {
              label: '可用性'
            }
          ]
        }
      ],

 src/views/system/point/index.vue

@@ -29,7 +29,7 @@
          v-hasPermi="['point:remove']">删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" plain icon="el-icon-bottom" v-loading="download" size="mini" @click="handleExport"
        <el-button type="primary" plain icon="el-icon-top" v-loading="download" size="mini" @click="handleExport"
                   v-hasPermi="['point:export']">导出点位</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -84,7 +84,7 @@
            <el-button class="bottom_" type="primary" size="small" v-loading="upload" @click="handleImport"
                       v-hasPermi="['point:import']">导入</el-button>
          </div>
          <el-button type="primary" size="mini" plain icon="el-icon-top" slot="reference" v-hasPermi="['point:import']">导入点位</el-button>
          <el-button type="primary" size="mini" plain icon="el-icon-bottom" slot="reference" v-hasPermi="['point:import']">导入点位</el-button>
        </el-popover>
      </el-col>
<!--      <el-col :span="1.5">-->
@@ -124,56 +124,13 @@
      @pagination="getList" />

    <!-- 添加运维点位对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
      <div style="display: flex;flex-direction: row">
        <div style="flex: 5; border-right: 1px solid #d3d3d3; padding-right: 10px">
      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
        <el-form-item label="点位名称" prop="pointName">
          <el-input v-model="form.pointName" placeholder="请输入点位名称" />
        </el-form-item>
        <el-form-item label="重点标签" prop="importantTag">
          <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-form-item>
        <el-form-item label="省厅标签" prop="provinceTag">
          <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-form-item>
        <el-form-item label="重点指挥图像标签" prop="importantCommandImageTag">
          <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-form-item>
        <!--        <el-form-item label="点位所在地" prop="region">-->
        <!--          <el-cascader v-model="form.region" :options="regionList" placeholder="点位所在地" :props="props" collapse-tags></el-cascader>-->
        <!--        </el-form-item>-->
        <el-form-item label="监管部门" prop="deptId">
          <el-cascader v-model="form.deptId" :options="deptOptions" :show-all-levels="false" clearable
            :props="{ checkStrictly: true }">
@@ -199,6 +156,50 @@
          <el-input type="textarea" v-model="form.remark"/>
        </el-form-item>
      </el-form>
        </div>
        <div style="flex: 5">
          <el-form ref="form" :model="form" :rules="rules" label-width="130px">
            <el-form-item label="重点:" prop="importantTag">
              <el-switch
                v-model="form.importantTag"
                active-color="#13ce66"
                inactive-color="gray"
                active-text="重点点位"
                inactive-text="普通点位">
              </el-switch>
            </el-form-item>
            <el-form-item label="省厅:" prop="provinceTag">
              <el-switch
                v-model="form.provinceTag"
                active-color="#13ce66"
                inactive-color="gray"
                active-text="省厅点位"
                inactive-text="普通点位">
              </el-switch>
            </el-form-item>
            <el-form-item label="部级:" prop="deptTag">
              <el-switch
                v-model="form.deptTag"
                active-color="#13ce66"
                inactive-color="gray"
                active-text="部级点位"
                inactive-text="普通点位">
              </el-switch>
            </el-form-item>
            <el-form-item label="重点指挥图像:" prop="importantCommandImageTag">
              <el-switch
                v-model="form.importantCommandImageTag"
                active-color="#13ce66"
                inactive-color="gray"
                active-text="重点指挥图像点位"
                inactive-text="普通点位">
              </el-switch>
            </el-form-item>
          </el-form>

        </div>
      </div>

      <div slot="footer" class="dialog-footer">
        <el-button @click="cancel">取 消</el-button>
        <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -241,7 +242,7 @@

export default {
  name: "Point",
  dicts: ['point_tag'],
  dicts: ['point_tag', 'area_code'],
  data() {
    return {
      needUpdateUnit: false,
@@ -460,8 +461,9 @@
        createTime: null,
        updateTime: null,
        deleted: null,
        importantTag: null,
        provinceTag: null
        importantTag: false,
        provinceTag: false,
        deptTag: false,
      };
      this.resetForm("form");
    },