From a6eb85ed01a5fd4dc6a3ba4d15e37685b750087a Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Thu, 30 Mar 2023 09:08:31 +0800
Subject: [PATCH] 下载模版错误信息展示，图标根据环境切换

---
 public/index.html                    | 11 ++++++++++-
 src/utils/index.js                   |  6 +++---
 src/views/personal/test/index.vue    |  4 ++--
 src/views/standard/card/index.vue    | 15 +++++++++++----
 src/views/standard/test/analysis.vue |  1 +
 src/views/standard/test/index.vue    |  4 ++--
 6 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/public/index.html b/public/index.html
index de842a2..44867c3 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,13 +8,22 @@
   <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
   <meta http-equiv="Pragma" content="no-cache" />
   <meta http-equiv="Expires" content="0" />
-  <link rel="icon" href="<%= BASE_URL %>331icon.ico">
   <title>
     <%= htmlWebpackPlugin.options.title %>
   </title>
 </head>
 
 <body>
+  <script>
+    window.onload = function () {
+      var link = document.querySelector("link[rel*='icon']") || document.createElement('link');
+      link.type = 'image/x-icon';
+      link.rel = 'shortcut icon';
+      var isZS = window.location.host.includes('ezquiz.sunvotecloud')
+      link.href = !isZS ? "./favicon.ico" : "./331icon.ico";
+      document.getElementsByTagName('head')[0].appendChild(link);
+    }
+  </script>
   <noscript>
     <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
         Please enable it to continue.</strong>
diff --git a/src/utils/index.js b/src/utils/index.js
index 4454612..6b86f02 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -775,9 +775,9 @@ export function tablePrint(id) {
     .hui-ul{border-top: 1px solid #e2e2e2;}
     .hui-li{display: flex;}
     .hui-s{height: 48px;line-height: 48px;border-right: 1px solid #e2e2e2;border-bottom: 1px solid #e2e2e2;box-sizing: border-box;}
-    .hui-s.s1{width: 87.5px;}
-    .hui-s.s2{ width: 97.5px;}
-    .hui-s.s3{width: 108px;}
+    .hui-s.s1{width: 100px;}
+    .hui-s.s2{ width: 110px;}
+    .hui-s.s3{width: 120px;}
     .info { display: flex;flex-wrap: wrap;border-left: 1px solid #e2e2e2;border-top: 1px solid #e2e2e2;margin-bottom: 12px;}
     .info-item {width: 25%;height: 50px;box-sizing: border-box;flex-shrink: 0;background: #f8f8f8;border-right: 1px solid #e2e2e2;border-bottom: 1px solid #e2e2e2;line-height: 50px;text-align: center;}
     </style>`;
diff --git a/src/views/personal/test/index.vue b/src/views/personal/test/index.vue
index c2a79f5..07ca68d 100644
--- a/src/views/personal/test/index.vue
+++ b/src/views/personal/test/index.vue
@@ -813,13 +813,13 @@ export default {
       }
       const data = await this.$request.pExportPhaseExamReport({ ...query });
       this.exportLoading = false;
-      if (data) {
+      if (data && !data.code) {
         let blob = new Blob([data], {
           type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
         downloadFile("即时测-阶段测练报表.xlsx", blob);
       } else {
-        this.$message.error("下载失败");
+        this.$message.error(data.info);
       }
     },
   },
diff --git a/src/views/standard/card/index.vue b/src/views/standard/card/index.vue
index 14944fb..3f245ba 100644
--- a/src/views/standard/card/index.vue
+++ b/src/views/standard/card/index.vue
@@ -77,6 +77,11 @@
             label="答题器编码"
             prop="clickerSn"
           ></el-table-column>
+          <el-table-column align="center" label="年级">
+            <template slot-scope="scope">
+              <span>{{ scope.row.classList[0].gradeName }}</span>
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="班级">
             <template slot-scope="scope">
               <span v-for="item in scope.row.classList" :key="item.classCode">{{
@@ -144,7 +149,7 @@
 </template>
 
 <script>
-import { downloadFile } from "utils";
+import { downloadFile, formatDate } from "utils";
 export default {
   data() {
     return {
@@ -275,13 +280,15 @@ export default {
       this.exportLoading = true;
       const data = await this.$request.exportClickersLog({ ...query });
       this.exportLoading = false;
-      if (data) {
+      if (data && !data.code) {
         let blob = new Blob([data], {
           type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
-        downloadFile("发卡记录.xlsx", blob);
+        let date = formatDate(new Date().getTime(), "yyyy-MM-dd");
+        let name = `发卡记录_${date}.xlsx`;
+        downloadFile(name, blob);
       } else {
-        this.$message.error("下载失败");
+        this.$message.error(data.info);
       }
     },
   },
diff --git a/src/views/standard/test/analysis.vue b/src/views/standard/test/analysis.vue
index d34bb0e..e89b05a 100644
--- a/src/views/standard/test/analysis.vue
+++ b/src/views/standard/test/analysis.vue
@@ -131,6 +131,7 @@
             :label="item.title"
             :prop="'count' + index"
             align="center"
+            width="120"
             ><template slot-scope="scope"
               ><p class="persent">
                 {{
diff --git a/src/views/standard/test/index.vue b/src/views/standard/test/index.vue
index e65176d..11f860f 100644
--- a/src/views/standard/test/index.vue
+++ b/src/views/standard/test/index.vue
@@ -936,13 +936,13 @@ export default {
       this.exportLoading = true;
       const data = await exportPhaseExamReport({ ...query });
       this.exportLoading = false;
-      if (data) {
+      if (data && !data.code) {
         let blob = new Blob([data], {
           type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
         downloadFile("即时测-阶段测练报表.xlsx", blob);
       } else {
-        this.$message.error("下载失败");
+        this.$message.error(data.info);
       }
     },
     async downExcel() {
--
libgit2 0.21.4

