Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-01 59e70e07bd9cb986069b2e4dc2ee881701e601d9

Merge remote-tracking branch 'origin/master'

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

@@ -91,7 +91,7 @@
            :inline="true"
            v-show="showSearch"
          >
            <el-form-item label="考核日期" prop="name">
            <el-form-item label="考核月度" prop="name">
              <el-date-picker
                v-model="queryParams.date"
                format="yyyy-MM"
@@ -102,8 +102,7 @@
              >
              </el-date-picker>
            </el-form-item>
            <!-- 季度选择 -->
            <el-form-item>
            <el-form-item label="考核季度">
              <el-date-picker
                :clearable="false"
                v-model="queryParams.quarter"

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

@@ -35,7 +35,7 @@
                <div class="score-item">
                  <div style="font-size: 15px; margin-bottom: 15px">{{ formatCreateDate(city[0]) }}</div>
                </div>
                <div v-for="(score, scoreIndex) in city" :key="scoreIndex">
                <div v-for="(score, scoreIndex) in filterRepeat(city)" :key="scoreIndex">
                  <div class="score-item">
                    <div v-if="score.examineCategory == 2">车辆：</div>
                    <div v-else-if="score.examineCategory == 3">人脸：</div>
@@ -269,14 +269,27 @@
      return city.some(score => score.publish === 'UNPUBLISHED');
    },
    formatCreateDate(item) {
      let date = new Date(item.startDate);
      let year = date.getFullYear();
      let startMonth = date.getMonth() + 1;
      date = new Date(item.endDate);
      let endMonth = date.getMonth() + 1;
      let str = `${year}年${startMonth}月`;
      if (startMonth !== endMonth) str += `-${endMonth}月`;
      return str;
      const date = new Date(item.createTime);
      const year = date.getFullYear();
      const month = date.getMonth() + 1; // getMonth() 返回的月份是从 0 开始的，所以要加 1
      const day = date.getDate();

      // 使用 padStart 方法确保月份和日期始终是两位数
      const formattedMonth = month.toString().padStart(2, '0');
      const formattedDay = day.toString().padStart(2, '0');

      return `${year}年${formattedMonth}月${formattedDay}号`;
    },
    filterRepeat(city) {
      let list = [];
      let examineCategorys = [];
      city.forEach(item => {
        if (examineCategorys.indexOf(item.examineCategory) === -1) {
          examineCategorys.push(item.examineCategory);
          list.push(item);
        }
      });
      return list;
    },
    /** 导航切换 */
    handleSelect(key) {

 src/views/system/monitor/car/index.vue

@@ -22,14 +22,6 @@
              <p>异常数</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ count.totalViews }}</h3>
              <p>生成异常工单数</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ count.totalCar }}</h3>
              <p>过车数据总量</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ count.viewsPercentage }}%</h3>
              <p>设备运行率</p >
            </div>
@@ -79,21 +71,6 @@
        </el-select>
      </el-form-item>

       <el-form-item label="是否生成异常工单" prop="defaultOrder" label-width="130px">
         <el-select
           v-model="queryParams.defaultOrder"
           placeholder="是否生成异常工单"
           clearable
           style="width: 170px"
         >
         <el-option
           v-for="dict in dict.type.platform_yes_no"
           :key="dict.value"
           :label="dict.label"
           :value="dict.value"
         />
         </el-select>
        </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>

 src/views/system/monitor/face/index.vue

@@ -22,14 +22,6 @@
              <p>异常数</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ count.totalViews }}</h3>
              <p>生成异常工单数</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ count.totalFace }}</h3>
              <p>抓拍数据总量</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ count.viewsPercentage }}%</h3>
              <p>设备运行率</p >
            </div>
@@ -78,21 +70,6 @@
        />
        </el-select>
      </el-form-item>
       <el-form-item label="是否生成异常工单" prop="defaultOrder" label-width="130px">
         <el-select
           v-model="queryParams.defaultOrder"
           placeholder="是否生成异常工单"
           clearable
           style="width: 170px"
         >
         <el-option
           v-for="dict in dict.type.platform_yes_no"
           :key="dict.value"
           :label="dict.label"
           :value="dict.value"
         />
         </el-select>
        </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>

 src/views/system/monitor/recovery/index.vue

@@ -22,10 +22,6 @@
              <p>异常数</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ count.totalViews }}</h3>
              <p>生成异常工单数</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ count.viewsPercentage }}%</h3>
              <p>设备运行率</p >
            </div>

 src/views/system/monitor/video/index.vue

@@ -24,18 +24,6 @@
              <p>异常数</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ count.totalViews }}</h3>
              <p>生成异常工单数</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ count.noStore }}</h3>
              <p>无存储</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ count.partStore }}</h3>
              <p>部分存储</p >
            </div>
            <div class="dashboard-item">
              <h3>{{ count.viewsPercentage }}%</h3>
              <p>设备运行率</p >
            </div>
@@ -84,21 +72,6 @@
        />
        </el-select>
      </el-form-item>
       <el-form-item label="是否生成异常工单" prop="defaultOrder" label-width="130px">
         <el-select
           v-model="queryParams.defaultOrder"
           placeholder="是否生成异常工单"
           clearable
           style="width: 170px"
         >
         <el-option
           v-for="dict in dict.type.platform_yes_no"
           :key="dict.value"
           :label="dict.label"
           :value="dict.value"
         />
         </el-select>
        </el-form-item>

      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>