From 05da003e67c035b298492fd7ef6d589e9d119f46 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 12 May 2025 13:19:55 +0800
Subject: [PATCH] up

---
 .../achievements/components/detailAchievements.vue | 14 +++++++++-----
 vue.config.js                                      |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/achievements/components/detailAchievements.vue b/src/views/achievements/components/detailAchievements.vue
index 6914fc4..f6f5525 100644
--- a/src/views/achievements/components/detailAchievements.vue
+++ b/src/views/achievements/components/detailAchievements.vue
@@ -60,13 +60,14 @@
             <th>一级指标</th>
             <th>二级指标</th>
             <th>三级指标</th>
+            <th>年初计划值</th>
             <th style="min-width: 100px;">{{ type === 1 ? '半年' : '全年' }}（程）指标值</th>
             <th>{{ type === 1 ? '半年实际执行值' : '实际完成值' }}</th>
-            <th>年初计划值</th>
+
             <th>分值</th>
             <th v-if="type === 1">是否偏差（是/否）</th>
             <th v-if="type === 1">完成可能性（确定能/有可能/完全不可能）</th>
-            <th v-if="type !== 1">分值</th>
+            <!-- <th v-if="type !== 1">分值</th> -->
             <th v-if="type !== 1">得分</th>
             <th v-if="type !== 1" style="max-width: 30%;">评价要点及评分规则</th>
             <th v-if="type !== 1" style="max-width: 24%;">未完成指标原因分析</th>
@@ -76,13 +77,16 @@
             <td :rowspan="spanArr[index]" v-if="spanArr[index]" :style="{ 'display': spanArr[index] ? '' : 'none' }">{{ (item.target && item.target.target_type_detail) ? item.target.target_type_detail.name : '' }}</td>
             <td :rowspan="spanArr1[index]" v-if="spanArr1[index]" :style="{ 'display': spanArr1[index] ? '' : 'none' }">{{ (item.target && item.target.target_type2_detail) ? item.target.target_type2_detail.name : '' }}</td>
             <td>{{ item.target ? item.target.name : '' }}</td>
-            <td>{{ targetValue(item) }}</td>
             <th>{{item.year_plan?item.year_plan:''}}</th>
-            <th>{{item.score_level?item.score_level:''}}</th>
+            <td>{{ targetValue(item) }}</td>
             <td>{{ actResultFormat(item) }}</td>
+
+
+            <th>{{item.score_level?item.score_level:''}}</th>
+
             <td v-if="type === 1">{{ isDeviation(item) }}</td>
             <td v-if="type === 1">{{ endPossibility(item) }}</td>
-            <td v-if="type !== 1">{{ item.score }}</td>
+            <!-- <td v-if="type !== 1">{{ item.score }}</td> -->
             <td v-if="type !== 1">{{ socre(item) }}</td>
             <td v-if="type !== 1" style="max-width: 300px;">{{ evaluationMain(item) }}</td>
             <td v-if="type !== 1">{{ remark(item) }}</td>
diff --git a/vue.config.js b/vue.config.js
index 7920f4d..deec825 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,7 +26,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath:  process.env.ENV === 'staging' ? '/admin_test' : '/admin',
-  outputDir: '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hjjc-hdcontract/public/admin',
+  outputDir: '/Users/mac/Documents/朗业/2025/s-苏州环境监测中心/hjjc-hdcontract/public/admin_test',
   assetsDir: 'static',
   lintOnSave: false,
   productionSourceMap: false,