Merge branch 'master' into dev-threejs

ZhangXianQiang

2024-05-06 72f13e697d40c8fffc7aa0197fec4509bbe41569

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

File was renamed from src/views/system/result/index.vue
@@ -3,8 +3,8 @@
    <div>
      <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
        style="margin-bottom: 10px">
        <el-menu-item index="1">省厅考核</el-menu-item>
        <el-menu-item index="2">市局考核</el-menu-item>
        <el-menu-item index="0">省厅考核</el-menu-item>
        <el-menu-item index="1">市局考核</el-menu-item>
      </el-menu>
    </div>

@@ -13,10 +13,6 @@
        <div class="card-content">
          <div class="title-container">
            <h1>考核成绩</h1>
            <div class="select-container">
              <el-date-picker v-model="date" type="date" placeholder="选择日期">
              </el-date-picker>
            </div>
          </div>
          <div class="echart-container">
            <div id="barChart" ref="barChart"></div>
@@ -39,9 +35,9 @@
                </div>
                <div v-for="(score, scoreIndex) in city" :key="scoreIndex">
                  <div class="score-item">
                    <div v-if="score.examineCategory == 0">车辆：</div>
                    <div v-else-if="score.examineCategory == 1">人脸：</div>
                    <div v-else-if="score.examineCategory == 2">视频：</div>
                    <div v-if="score.examineCategory == 2">车辆：</div>
                    <div v-else-if="score.examineCategory == 3">人脸：</div>
                    <div v-else-if="score.examineCategory == 1">视频：</div>
                    <div class="score">{{ score.score }}</div>
                  </div>
                </div>
@@ -77,8 +73,7 @@
      },
      checkScoreList: [],
      areaList: [],
      activeIndex: '1',
      activeIndex2: '2',
      activeIndex: '0',
      date: '',
      company: '',
      dataList: {
@@ -95,6 +90,7 @@
    }
  },
  created() {
    this.queryParams.examineTag = this.activeIndex
    this.getList();
    this.areaSelect();
  },
@@ -105,9 +101,10 @@
  methods: {
    jumpDetail(index) {
      this.$router.push({
        path: '/examine/detail',
        path: '/check/detail',
        query: {
          index: index
          index: index,
          examineTag: this.activeIndex
        }
      })
    },
@@ -176,9 +173,9 @@
        }
      });
      const nameArray = mapData.map(item => item.name);
      const data1 = this.filterData(mapData, 0);
      const data2 = this.filterData(mapData, 1);
      const data3 = this.filterData(mapData, 2);
      const data1 = this.filterData(mapData, 1);
      const data2 = this.filterData(mapData, 2);
      const data3 = this.filterData(mapData, 3);
      const option = {
        grid: {
          left: 0,
@@ -277,16 +274,12 @@
    /** 导航切换 */
    handleSelect(key) {
      this.activeIndex = key; // 更新当前激活的菜单项
      this.queryParams.examineTag = key;
      this.getList();
    },
    /** 查询考核成绩列表 */
    getList() {
      this.loading = true;
      if (this.activeIndex === '1') {
        this.queryParams.examineTag = '0'; // 省厅考核
      } else if (this.activeIndex === '2') {
        this.queryParams.examineTag = '1'; // 区域考核
      }
      // 获取当前日期
      const today = new Date();

@@ -310,7 +303,7 @@
      const cityName = this.translateDeptId(parseInt(city[0].deptId));
      this.province.publish = text === "发布" ? "PUBLISHED" : "UNPUBLISHED";
      this.province.id = city.map(city => city.id);
      this.$modal.confirm('是否确认' + text + '考核名为"' + cityName + '"的数据项？')
      this.$modal.confirm('是否确认' + text + '考核名为"' + cityName + '"的成绩？')
        .then(() => {
          return publishScore(this.province);
        })