From 9e8d1bd0b6fb495920921214775b84d490e032a3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 16:43:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/system/check/result/detail/detail.vue |   72 ++++++++++++++++++++++++++---------
 1 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/src/views/system/check/result/detail/detail.vue b/src/views/system/check/result/detail/detail.vue
index bc41357..f5b8242 100644
--- a/src/views/system/check/result/detail/detail.vue
+++ b/src/views/system/check/result/detail/detail.vue
@@ -1,5 +1,12 @@
 <template>
-  <div class="app-container">
+  <div style="padding: 0px 10px">
+      <div >
+        <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
+               >
+          <el-menu-item index="0">鐪佸巺鑰冩牳</el-menu-item>
+          <el-menu-item index="1">鍖哄幙鑰冩牳</el-menu-item>
+        </el-menu>
+      </div>
     <el-container>
       <el-main>
         <h2>鑰冩牳瑙勫垯</h2>
@@ -30,6 +37,7 @@
                   type="text"
                   icon="el-icon-edit"
                   @click="handleRuleUpdate(item)"
+                  v-hasPermi="['check:template:edit']"
                   >淇敼
                 </el-button>
               </div>
@@ -81,6 +89,7 @@
               icon="el-icon-download"
               size="mini"
               @click="handleExport"
+              v-hasPermi="['check:result:detail:export']"
               >瀵煎嚭
             </el-button>
           </el-col>
@@ -91,18 +100,18 @@
             :inline="true"
             v-show="showSearch"
           >
-            <el-form-item label="鑰冩牳鏈堝害" prop="name">
-              <el-date-picker
-                v-model="queryParams.date"
-                format="yyyy-MM"
-                value-format="yyyy-MM"
-                type="month"
-                placeholder="閫夋嫨鏃ユ湡"
-                @change="dateChange"
-              >
-              </el-date-picker>
-            </el-form-item>
-            <el-form-item label="鑰冩牳瀛ｅ害">
+<!--            <el-form-item label="鑰冩牳鏈堝害" prop="name">-->
+<!--              <el-date-picker-->
+<!--                v-model="queryParams.date"-->
+<!--                format="yyyy-MM"-->
+<!--                value-format="yyyy-MM"-->
+<!--                type="month"-->
+<!--                placeholder="閫夋嫨鏃ユ湡"-->
+<!--                @change="dateChange"-->
+<!--              >-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+            <el-form-item label="鑰冩牳鏃堕棿">
               <el-date-picker
                 :clearable="false"
                 v-model="queryParams.quarter"
@@ -156,6 +165,17 @@
               <span>{{ translateDeptId(scope.row.dept_id) }}</span>
             </template>
           </el-table-column>
+          <el-table-column
+            label="鑰冩牳鏍囩"
+            align="center"
+            prop="dept_id"
+            width="120px"
+            fixed
+          >
+            <template slot-scope="scope">
+              {{ scope.row.examine_tag === 0 ? '鐪佸巺鑰冩牳' : '鍖哄幙鑰冩牳' }}
+            </template>
+          </el-table-column>
           <template v-for="item in tableData">
             <el-table-column
               :key="item.ruleName"
@@ -164,7 +184,7 @@
               width="180px"
             >
               <template slot-scope="scope">
-                <span>{{ scope.row[item.ruleIndex] }}</span>
+                <span>{{ (scope.row[item.ruleIndex] * 100).toFixed(2) + '%'}}</span>
               </template>
             </el-table-column>
           </template>
@@ -325,7 +345,9 @@
       queryParams: {
         id: null,
         date: null,
-        quarter: null
+        quarter: null,
+        examineTag: null,
+        deptId: null
       },
       // 琛ㄥ崟鏍￠獙
       rules: {},
@@ -344,6 +366,12 @@
     if (this.$route.query.id) {
       this.queryParams.id = this.$route.query.id;
     }
+    if(this.$route.query.deptId){
+      this.queryParams.deptId = this.$route.query.deptId;
+    }
+    let examineTag = this.$route.query.examineTag;
+    this.activeIndex = examineTag;
+    this.queryParams.examineTag = examineTag;
     // 鑰冩牳绉垎鍒楄〃
     this.getList();
     this.areaSelect();
@@ -441,6 +469,15 @@
       this.indexOpen = true;
       this.title = "淇敼鑰冩牳鎸囨爣";
     },
+    /** 瀵艰埅鍒囨崲 */
+    handleSelect(key) {
+      this.activeIndex = key;
+      this.queryParams.examineTag = key;
+      // 鑰冩牳绉垎鍒楄〃
+      this.getList();
+
+
+    },
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleRuleUpdate(row) {
       this.reset("ruleForm");
@@ -465,15 +502,12 @@
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
       this.download(
-        "/check/score/export",
+        "/check/score/detailExport",
         {
           ...this.queryParams,
         },
         `鑰冩牳鎸囨爣_${new Date().getTime()}.xlsx`
       );
-    },
-    handleSelect(key, keyPath) {
-      console.log(key, keyPath);
     },
   },
 };

--
Gitblit v1.8.0