From 34b574e01c5e961266f0242c3a813dc057ff4584 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Tue, 7 Mar 2023 15:03:19 +0800
Subject: [PATCH] 细节优化

---
 src/views/admin/clientVersion/index.vue | 14 ++++++++++++++
 src/views/admin/device/index.vue        | 43 ++++++++++++++++++++++---------------------
 src/views/examinationPaper/index.vue    |  3 +++
 src/views/personal/ask/index.vue        |  2 ++
 src/views/personal/setUp/student.vue    |  2 +-
 src/views/personal/test/index.vue       |  2 ++
 src/views/standard/device/index.vue     |  5 -----
 7 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/src/views/admin/clientVersion/index.vue b/src/views/admin/clientVersion/index.vue
index b37b1bb..65c1b98 100644
--- a/src/views/admin/clientVersion/index.vue
+++ b/src/views/admin/clientVersion/index.vue
@@ -119,6 +119,15 @@
             </el-input>
           </el-col>
         </el-form-item>
+        <el-form-item label="类型：">
+          <el-col :span="12">
+            <el-select v-model="formAdd.appType" placeholder="">
+              <el-option label="授课端软件" :value="0"></el-option>
+              <el-option label="发卡软件" :value="1"></el-option>
+              <el-option label="授课端个人版" :value="2"></el-option>
+            </el-select>
+          </el-col>
+        </el-form-item>
         <el-form-item label="软件图标：">
           <el-col :span="12">
             <upLoadImg url="/file/uploadImg" @upSuccess="logoSuccess" />
@@ -172,6 +181,7 @@ export default {
         appName: "",
         versionName: "",
         versionNumber: "",
+        appType:0,
         appImage: "",
         md5: "",
         fileSize: "",
@@ -188,6 +198,9 @@ export default {
         versionName: [
           { required: true, message: "请输入版本名称", trigger: "blur" },
         ],
+        appType: [
+          { required: true, message: "请选择版本名称", trigger: "blur" },
+        ],
         filePath: [
           { required: true, message: "请上传全量文件包", trigger: "blur" },
         ],
@@ -212,6 +225,7 @@ export default {
       for (let key in this.formAdd) {
         this.formAdd[key] = "";
       }
+      this.formAdd.appType = 0
       this.diaAdd = true;
     },
     changePage(page) {
diff --git a/src/views/admin/device/index.vue b/src/views/admin/device/index.vue
index 73865ee..8c39245 100644
--- a/src/views/admin/device/index.vue
+++ b/src/views/admin/device/index.vue
@@ -30,24 +30,36 @@
                   placeholder="请输入学校"
                   v-model="query.schoolName"
                   class="input-with-select"
-                  @keyup.enter.native="query.loginName='',_QueryData(true)"
+                  @keyup.enter.native="query.loginName='',query.realName='',QueryData(true)"
                 >
                   <el-button
                     slot="append"
                     icon="el-icon-search"
-                    @click="query.loginName='',_QueryData(true)"
+                    @click="query.loginName='',query.realName='',_QueryData(true)"
                   ></el-button>
                 </el-input>
                 <el-input
-                  placeholder="请输入租户"
+                  placeholder="请输入租户账号"
                   v-model="query.loginName"
                   class="input-with-select"
-                  @keyup.enter.native="query.schoolName='',_QueryData(true)"
+                  @keyup.enter.native="query.schoolName='',query.realName='',_QueryData(true)"
                 >
                   <el-button
                     slot="append"
                     icon="el-icon-search"
-                    @click="query.schoolName='',_QueryData(true)"
+                    @click="query.schoolName='',query.realName='',_QueryData(true)"
+                  ></el-button>
+                </el-input>
+                <el-input
+                  placeholder="请输入租户名称"
+                  v-model="query.realName"
+                  class="input-with-select"
+                  @keyup.enter.native="query.schoolName='',query.loginName='',_QueryData(true)"
+                >
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="query.schoolName='',query.loginName='',_QueryData(true)"
                   ></el-button>
                 </el-input>
                 <el-button class="serach-box" round @click="_QueryData(true)"
@@ -72,25 +84,18 @@
                 align="center"
               ></el-table-column>
               <el-table-column
-                prop="roomName"
-                label="所在教室"
+                prop="tenantName"
+                label="所在学校"
                 align="center"
               ></el-table-column>
-              <el-table-column label="关联班级" align="center">
-                <template slot-scope="scoped">
-                  <p v-for="(item, index) in scoped.row.classList" :key="index">
-                    {{ item.className }}
-                  </p>
-                </template>
-              </el-table-column>
               <el-table-column
                 prop="otaVersionName"
                 label="固件版本号"
                 align="center"
               ></el-table-column>
               <el-table-column
-                prop="onlineTime"
-                label="最近上报"
+                prop="contactPerson"
+                label="联系人"
                 align="center"
               ></el-table-column>
               <el-table-column label="状态" align="center"
@@ -180,11 +185,6 @@
                   </p></template
                 ></el-table-column
               >
-              <el-table-column
-                prop="electricity"
-                label="电量"
-                align="center"
-              ></el-table-column>
               <el-table-column prop="class" label="关联班级" align="center">
                 <template slot-scope="scoped">
                   <p v-for="(item, index) in scoped.row.classList" :key="index">
@@ -272,6 +272,7 @@ export default {
       query: {
         schoolName: "",
         loginName: "",
+
       },
       tableData: [],
       total: 0,
diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index 4fda0a0..8202620 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -323,6 +323,7 @@ export default {
     },
     // 查找答题卡类型
     async _QueryTypeList() {
+      if (!this.query.classId) return;
       let fetchTypeNames =
         this.role == "ROLE_PERSONAL"
           ? this.$request.pPaperTagList
@@ -375,6 +376,7 @@ export default {
     },
     // 查找科目
     async _QuerySubjectList() {
+      if (!this.query.classId) return;
       let fetchSubjectList =
         this.role == "ROLE_PERSONAL"
           ? this.$request.pSubjectList
@@ -397,6 +399,7 @@ export default {
       }
     },
     async _QueryData(type) {
+      if (!this.query.classId) return;
       this.loading = true;
       //获取答题卡列表
       let query = {};
diff --git a/src/views/personal/ask/index.vue b/src/views/personal/ask/index.vue
index 7473f13..4d41b66 100644
--- a/src/views/personal/ask/index.vue
+++ b/src/views/personal/ask/index.vue
@@ -538,6 +538,7 @@ export default {
       }
     },
     async _QuerySubjectList() {
+      if (!this.query.classId) return;
       const { data, status, info } = await this.$request.pSubjectList({
         classId: this.query.classId,
       });
@@ -560,6 +561,7 @@ export default {
       }
     },
     async _QueryData() {
+      if (!this.query.classId) return;
       if (this.tabIndex == 1) {
         this.periodReportList();
       } else if (this.tabIndex == 2) {
diff --git a/src/views/personal/setUp/student.vue b/src/views/personal/setUp/student.vue
index 6ccdc85..db53a92 100644
--- a/src/views/personal/setUp/student.vue
+++ b/src/views/personal/setUp/student.vue
@@ -287,7 +287,7 @@ export default {
     setClass(obj) {
       this.formClass.classId = obj.id;
       this.formClass.className = obj.className;
-      this.formClass.subjectNames = obj.subjectNames;
+      this.formClass.subjectNames = obj.subjectNames||[];
       this.diaClass = true;
     },
     addSubjectName() {
diff --git a/src/views/personal/test/index.vue b/src/views/personal/test/index.vue
index f0f2c3e..f6638fc 100644
--- a/src/views/personal/test/index.vue
+++ b/src/views/personal/test/index.vue
@@ -660,6 +660,7 @@ export default {
       }
     },
     async _QuerySubjectList() {
+      if (!this.query.classId) return;
       const { data, status, info } = await this.$request.pSubjectList({
         classId: this.query.classId,
       });
@@ -682,6 +683,7 @@ export default {
       }
     },
     async _QueryData() {
+      if (!this.query.classId) return;
       this.tableData = [];
       if (this.tabIndex == 1) {
         this.examReportList();
diff --git a/src/views/standard/device/index.vue b/src/views/standard/device/index.vue
index 1bbf281..a5438ff 100644
--- a/src/views/standard/device/index.vue
+++ b/src/views/standard/device/index.vue
@@ -252,11 +252,6 @@
                   </p></template
                 ></el-table-column
               >
-              <el-table-column
-                prop="electricity"
-                label="电量"
-                align="center"
-              ></el-table-column>
               <el-table-column prop="class" label="关联班级" align="center">
                 <template slot-scope="scoped">
                   <p v-for="(item, index) in scoped.row.classList" :key="index">
--
libgit2 0.21.4