From 8ef228094b590cf2deb67defbce41e0b4313f9ce Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Tue, 23 May 2023 16:33:08 +0800
Subject: [PATCH] 软件下载页面添加.net环境下载

---
 src/api/apis/apis.js                |   8 ++++++++
 src/api/urls/apis.js                |   2 ++
 src/router/index.js                 |  29 +++++++++++++++++++++++++----
 src/views/standard/device/error.vue | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/standard/device/index.vue |  10 +++++++++-
 src/views/standard/down/index.vue   |  13 ++++++++-----
 src/views/standard/setUp/school.vue |   4 ++--
 7 files changed, 162 insertions(+), 12 deletions(-)
 create mode 100644 src/views/standard/device/error.vue

diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index f35936d..20786d2 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -1468,4 +1468,12 @@ export default {
       data,
     });
   },
+  //.net下载地址
+  runtimeEnvFileUrl(data) {
+    return service({
+      url: setUpUrls.runtimeEnvFileUrl,
+      method: "POST",
+      data,
+    });
+  },
 };
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index 10a346e..c16b41f 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -380,4 +380,6 @@ export default {
   studentClassLogs: "/api_html/school/manager/studentClassLogs",
   //修改科目
   updateSubject: "/api_html/school/manager/updateSubject",
+  //.net下载地址
+  runtimeEnvFileUrl: "/api_html/school/manager/runtimeEnvFileUrl",
 }
diff --git a/src/router/index.js b/src/router/index.js
index 3071542..73ad9e9 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -43,8 +43,7 @@ const SetUpSchool = () => import("@/views/standard/setUp/school")
 const SetUpTeacher = () => import("@/views/standard/setUp/teacher")
 const SetUpStudent = () => import("@/views/standard/setUp/student")
 const ArchivedClazz = () => import("@/views/standard/setUp/archivedClazz")
-const SetUpClazz = () => import("@/views/standard/setUp/clazz")
-const Archived = () => import("@/views/standard/setUp/archived")
+
 
 const PersonalAsk = () => import("@/views/personal/ask/index")
 const PersonalAskAnalysis = () => import("@/views/personal/ask/analysis")
@@ -63,6 +62,13 @@ const AdminAccount = () => import("@/views/admin/account/index")
 const AdminClientVersion = () => import("@/views/admin/clientVersion/index")
 
 /**
+ * v1.4 
+ */
+const SetUpClazz = () => import("@/views/standard/setUp/clazz")
+const Archived = () => import("@/views/standard/setUp/archived")
+const DeviceError = () => import("@/views/standard/device/error")
+
+/**
  * 重写路由的push方法
  */
 const routerPush = Router.prototype.push
@@ -102,6 +108,21 @@ let defaultRouter = [
     ]
   },
   {
+    path: "/deviceError",
+    iconCls: "fa fa-home", // 图标样式class
+    name: "异常设备信息",
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: "/deviceError",
+        name: "异常设备信息",
+        component: DeviceError,
+        hidden: true
+      }
+    ]
+  },
+  {
     path: "/userInfo",
     iconCls: "fa fa-user", // 图标样式class
     name: "个人信息",
@@ -830,7 +851,7 @@ const addroutersPersonal = [
         name: "随堂已归档问报表分析",
         component: PersonalArchiving,
         parent: "ask",
-        hidden:true,
+        hidden: true,
         children: []
       }
     ]
@@ -866,7 +887,7 @@ const addroutersPersonal = [
         name: "即时已归档测报表分析",
         component: PersonalTestArchiving,
         parent: "test",
-        hidden:true,
+        hidden: true,
         children: []
       }
 
diff --git a/src/views/standard/device/error.vue b/src/views/standard/device/error.vue
new file mode 100644
index 0000000..6a149cb
--- /dev/null
+++ b/src/views/standard/device/error.vue
@@ -0,0 +1,108 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>异常设备信息</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <el-table :data="tableData" border style="width: 100%">
+        <el-table-column
+          prop="sn"
+          label="设备编码"
+          align="center"
+          width="160"
+        ></el-table-column>
+        <el-table-column
+          prop="type"
+          label="设备类型"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="operationTime"
+          label="异常类型"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="operationTime"
+          label="最早发现时间"
+          align="center"
+          width="200"
+        ></el-table-column>
+        <el-table-column
+          prop="operationTime"
+          label="异常后答题次数"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="operationTime"
+          label="状态"
+          align="center"
+        ></el-table-column>
+        <el-table-column label="操作" align="center"  width="200"
+          ><template slot-scope="scoped">
+            <el-link>处理</el-link></template
+          ></el-table-column
+        >
+      </el-table>
+      <div class="pagination-box">
+        <el-pagination
+          small=""
+          layout="total,prev, pager, next"
+          :hide-on-single-page="true"
+          :total="total"
+          @current-change="changePage"
+          :current-page="page"
+          :page-size="size"
+        >
+        </el-pagination>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      tableData: [],
+      total: 0,
+      page: 1,
+      size: 20,
+    };
+  },
+  created() {
+    this._QueryData()
+  },
+  methods: {
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
+    },
+    async _QueryData() {
+      this.loading = true;
+      const {
+        data = {},
+        status,
+        info,
+      } = await this.$request.pDeviceLogList({
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = (data?.list && [...data?.list]) || [];
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  padding: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/standard/device/index.vue b/src/views/standard/device/index.vue
index 1092e93..2ec6747 100644
--- a/src/views/standard/device/index.vue
+++ b/src/views/standard/device/index.vue
@@ -48,6 +48,11 @@
           <el-radio-button :label="3">授课端管理</el-radio-button>
         </el-radio-group>
       </div>
+      <p v-show="type == 1" class="error-tips">
+        有{{}}条设备异常信息，<router-link to="/deviceError"
+          >点击查看&gt;&gt;</router-link
+        >
+      </p>
       <div class="content">
         <div v-show="type == 1">
           <div class="chart-box" v-if="count">
@@ -1257,6 +1262,9 @@ export default {
 .down {
   padding: 0 0 16px 20px;
 }
+.error-tips{
+  margin-bottom:12px;
+}
 .content {
   background: #f8f8f8;
   border: 1px solid #e2e2e2;
@@ -1308,7 +1316,7 @@ export default {
     .answer-header {
       padding: 0;
       margin-bottom: 12px;
-      .upgrade-all{
+      .upgrade-all {
         display: flex;
         align-items: center;
       }
diff --git a/src/views/standard/down/index.vue b/src/views/standard/down/index.vue
index 80d5d87..836515b 100644
--- a/src/views/standard/down/index.vue
+++ b/src/views/standard/down/index.vue
@@ -8,7 +8,7 @@
     <div class="page-content">
       <div class="down-item">
         <p class="txt">
-          K12公私立学校、高等院校、教育培训机构的课堂互动教学、即时课堂测验
+          K12公私立学校、高等院校、教育培训机构的课堂互动教学、即时课堂测验。
         </p>
         <el-button plan round @click="links">授课端下载</el-button>
       </div>
@@ -19,7 +19,10 @@
         <el-button plan round @click="downCard">发卡软件下载</el-button>
       </div>
       <div class="down-item" v-loading="loading">
-        <p class="txt">。</p>
+        <p class="txt">
+          电脑缺少.NET Framework环境时，请下载安装.NET Framework
+          4.5.2，以便于授课端可正常使用。
+        </p>
         <el-button plan round @click="downNet">.Net环境下载</el-button>
       </div>
     </div>
@@ -65,12 +68,12 @@ export default {
     async downNet() {
       if (this.loadingNet == true) return;
       this.loadingNet = true;
-      const { data, status, info } = await this.$request.latestClickersApp();
+      const { data, status, info } = await this.$request.runtimeEnvFileUrl();
       this.loadingNet = false;
       if (status == 0) {
         const a = document.createElement("a");
-        a.href = data.downloadUrl;
-        a.download = data.appName;
+        a.href = data;
+        // a.download = data.appName;
         document.body.appendChild(a);
         a.click();
         a.remove();
diff --git a/src/views/standard/setUp/school.vue b/src/views/standard/setUp/school.vue
index 6b47c5c..2102604 100644
--- a/src/views/standard/setUp/school.vue
+++ b/src/views/standard/setUp/school.vue
@@ -63,9 +63,9 @@
         <div class="grade-box">
           <p class="h-title">
             年级管理
-            <!-- <span v-if="!code" class="popconfirm-box" @click="diaUpgradeGrade = true">
+            <span v-if="!code" class="popconfirm-box" @click="diaUpgradeGrade = true">
               年级升级<i class="fa fa-level-up"></i>
-            </span> -->
+            </span>
           </p>
           <ul class="grade-info">
             <li
--
libgit2 0.21.4