季度时间格式调整

梁保满
1 parent 2d6a1682
Showing 10 changed files with 124 additions and 70 deletions
src/api/apis/apis.js
src/api/urls/apis.js
src/i18n/lang/cn.js
src/router/index.js
src/views/analysis/index.vue
src/views/ask/index.vue
src/views/device/index.vue
src/views/device/log.vue
src/views/login/index.vue
src/views/test/index.vue
@@ -521,6 +521,14 @@ export default {
       data,
     });
   },
+  //  新增基站
+  addStation(data) {
+    return service({
+      url: setUpUrls.addStation,
+      method: "POST",
+      data,
+    });
+  },
   //  查询下载配置列表
   appConfigList(data) {
     return service({
@@ -132,6 +132,8 @@ export default {
   modifyUpgradeFlag: "/api_html/school/manager/modifyUpgradeFlag",
   //   修改基站信息
   updateDevice: "/api_html/school/manager/updateDevice",
+  //   新增基站
+  addStation: "/api_html/school/manager/addStation",
   //   查询下载配置列表
   appConfigList: "/api_html/school/manager/appConfigList",
   //   查询最新的授课端应用版本
@@ -3,6 +3,8 @@ import zhLocale from &quot;element-ui/lib/locale/lang/zh-CN&quot;
 const cn = {
   routeName: {
     home: "主页",
+    ask: "随堂问",
+    examinationPaper: "备题组卷",
     icon: "图标",
     builtInIcon: "内置图标",
     permissions: "权限管理",
@@ -89,14 +89,14 @@ let addrouters = [  //测试用，后续后端获取
       {
         path: "/examinationPaper",
         iconCls: "fa fa-file-text", // 图标样式class
-        name: "",
+        name: "examinationPaper",
         component: ExaminationPaper,
         children: []
       },
       {
         path: "/examinationPaperAdd",
         iconCls: "", // 图标样式class
-        name: "添加答题卡",
+        name: "examinationPaperAdd",
         component: ExaminationPaperAdd,
         parent: "examinationPaper",
         children: []
@@ -129,7 +129,8 @@ let addrouters = [  //测试用，后续后端获取
       {
         path: "/ask",
         iconCls: "fa fa-bar-chart", // 图标样式class
-        name: "",
+        name: "ask",
+        name: "随堂问报表",
         component: Ask,
         meta: {
           keepAlive: true,
@@ -251,11 +251,11 @@ export default {
           break;
         case 4:
           if (aMonth > 0 && aMonth < 4) {
-            aMonth = "01";
+            aMonth = "1";
           } else if (aMonth > 3 && aMonth < 7) {
-            aMonth = "04";
+            aMonth = "4";
           } else if (aMonth > 6 && aMonth < 10) {
-            aMonth = "07";
+            aMonth = "7";
           } else {
             aMonth = "10";
           }
@@ -566,11 +566,11 @@ export default {
           break;
         case 4:
           if (aMonth > 0 && aMonth < 4) {
-            aMonth = "01";
+            aMonth = "1";
           } else if (aMonth > 3 && aMonth < 7) {
-            aMonth = "04";
+            aMonth = "4";
           } else if (aMonth > 6 && aMonth < 10) {
-            aMonth = "07";
+            aMonth = "7";
           } else {
             aMonth = "10";
           }
 <template>
-  <div ref="main"  class="page-content">
+  <div ref="main" class="page-content">
     <back-box>
       <template slot="title">
         <span>设备管理</span>
       </template>
-      <template
-        slot="btns"
-        v-if="role != 'ROLE_JITUAN' && type == 1 && !code"
-      >
-      <!-- 暂未有接口 -->
+      <template slot="btns" v-if="role != 'ROLE_JITUAN' && type == 1 && !code">
         <!-- <el-tooltip effect="dark" content="设备导入" placement="bottom">
           <el-button
             type="primary"
@@ -19,16 +15,21 @@
             @click="diaUp = true"
           ></el-button>
         </el-tooltip> -->
-        <!-- <el-tooltip effect="dark" content="添加基站" placement="bottom">
+        <el-tooltip
+          v-if="role == 'ROLE_XUEXIAO'"
+          effect="dark"
+          content="添加基站"
+          placement="bottom"
+        >
           <el-button
             type="primary"
             icon="el-icon-receiving"
             size="mini"
             plain
             circle
-            @click="diaAnswerEqu = true"
+            @click="addDev"
           ></el-button>
-        </el-tooltip> -->
+        </el-tooltip>
       </template>
     </back-box>
     <div>
@@ -121,7 +122,7 @@
               ></el-table-column>
               <el-table-column label="关联班级" align="center">
                 <template slot-scope="scoped">
-                  <p v-for="(item,index) in scoped.row.classList" :key="index">
+                  <p v-for="(item, index) in scoped.row.classList" :key="index">
                     {{ item.className }}
                   </p>
                 </template>
@@ -389,7 +390,12 @@
       </div>
     </div>
     <el-dialog title="设备导入" :visible.sync="diaUp" width="400">
-      <up-load id="downDevice" :url="url" @upSuccess="upSuccess" fileName="设备信息">
+      <up-load
+        id="downDevice"
+        :url="url"
+        @upSuccess="upSuccess"
+        fileName="设备信息"
+      >
         <p class="down-txt" slot="down">
           通过Excel名单导入设备，需要提供设备编码，点击
           <el-link type="danger" @click="downExcel">模板下载</el-link> 。
@@ -399,7 +405,7 @@
         <el-button @click="diaUp = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="修改基站" :visible.sync="diaAnswerEqu" width="400">
+    <el-dialog :title="isAdd?'添加基站':'修改基站'" :visible.sync="diaAnswerEqu" width="400">
       <el-form ref="forms" :model="form" :rules="formRules" label-width="140px">
         <el-form-item label="设备编码：" prop="sn">
           <el-col :span="16"
@@ -410,6 +416,7 @@
               maxlength="30"
               size="45"
               show-word-limit
+              :disabled="!isAdd"
             >
             </el-input
           ></el-col>
@@ -447,7 +454,7 @@
               clearable
               v-model="form.classIds"
               :options="gradeList"
-              :props="{ expandTrigger: 'hover'}"
+              :props="{ expandTrigger: 'hover' }"
               :show-all-levels="false"
             ></el-cascader>
           </el-col>
@@ -501,6 +508,7 @@ export default {
   },
   data() {
     return {
+      isAdd:false,//添加还是修改基站
       role: "",
       code: "",
       loading: false,
@@ -510,6 +518,7 @@ export default {
       gradeList: [],
       gradeListAll: [],
       schoolAll: [],
+      school: {}, //校园账号所属学校信息
       props: {
         multiple: true,
         checkStrictly: true,
@@ -545,9 +554,7 @@ export default {
         roomName: "",
       },
       formRules: {
-        sn: [
-          { required: true, message: "请输入设备编码", trigger: "blur" },
-        ],
+        sn: [{ required: true, message: "请输入设备编码", trigger: "blur" }],
         frequency: [{ required: true, message: "请输入频点", trigger: "blur" }],
         pairingCode: [
           { required: true, message: "请输入配对码", trigger: "blur" },
@@ -565,7 +572,7 @@ export default {
     };
   },
   created() {
-    this.code = localStorage.getItem("csCode")||""
+    this.code = localStorage.getItem("csCode") || "";
     let role = "";
     this.$store.getters.info.permissions.map((item) => {
       if (item.roleName == this.$store.getters.info.showRoleName) {
@@ -574,31 +581,34 @@ export default {
     });
     this.role = role ? role : this.$store.getters.info.permissions[0].role;
     if (this.role == "ROLE_JITUAN") {
-      this.props.lazy = true,
-      this.props.lazyLoad = function (node, resolve) {
-        const { level } = node;
-        if (level == 2) {
-          console.log(node);
-          api
-            .tenantClassList({
-              schoolId: node.data.value,
-            })
-            .then((res) => {
-              let children = formatGradeNameClass(res.data?.list).sort(
-                (a, b) => {
-                  return a.grade - b.grade;
-                }
-              );
-              console.log();
+      (this.props.lazy = true),
+        (this.props.lazyLoad = function (node, resolve) {
+          const { level } = node;
+          if (level == 2) {
+            console.log(node);
+            api
+              .tenantClassList({
+                schoolId: node.data.value,
+              })
+              .then((res) => {
+                let children = formatGradeNameClass(res.data?.list).sort(
+                  (a, b) => {
+                    return a.grade - b.grade;
+                  }
+                );
+                console.log();
  
-              const nodes = [...children];
-              // 通过调用resolve将子节点数据返回，通知组件数据加载完成
-              resolve(nodes);
-            });
-        } else {
-          resolve(node);
-        }
-      };
+                const nodes = [...children];
+                // 通过调用resolve将子节点数据返回，通知组件数据加载完成
+                resolve(nodes);
+              });
+          } else {
+            resolve(node);
+          }
+        });
+    }
+    if (this.role == "ROLE_XUEXIAO") {
+      this._QueryDataSchool();
     }
     this.stationReport();
     this._QueryGradeList();
@@ -608,19 +618,22 @@ export default {
     }
   },
   methods: {
-    upSuccess(){//导入成功
-    this.diaUp = false
+    upSuccess() {
+      //导入成功
+      this.diaUp = false;
       this._QueryData();
     },
     edit(obj) {
+      this.isAdd=false
       for (let key in this.form) {
         if (key == "classIds") {
-          this.form[key] = obj.classList[0]?.classId
+          this.form[key] = obj.classList[0]?.classId;
         } else {
           this.form[key] = obj[key];
         }
       }
-      this.form.deviceId = obj.id
+      delete this.form.schoolId
+      this.form.deviceId = obj.id;
       this.diaAnswerEqu = true;
     },
     linkTo(obj, type) {
@@ -674,6 +687,17 @@ export default {
       this.page = page;
       this._QueryData(false);
     },
+    addDev() {
+      this.form.sn = "";
+      this.form.frequency = "";
+      this.form.pairingCode = "";
+      this.form.classIds = "";
+      this.form.roomName = "";
+      this.form.schoolId= this.school.id
+      delete this.form.deviceId
+      this.isAdd = true
+      this.diaAnswerEqu = true;
+    },
     async showSchool() {
       const { data, status, info } = await this.$request.schoolList();
       if (status === 0) {
@@ -759,8 +783,14 @@ export default {
           // query.classIds = query.classIds.map((item) => {
           //   return item[1];
           // });
-          query.classIds = [query.classIds]
-          const { data, status, info } = await this.$request.updateDevice({
+          if(typeof query.classIds == 'string' || typeof query.classIds == 'number'){
+            query.classIds = [query.classIds];
+          }else{
+            query.classIds = [query.classIds[1]];
+          }
+          
+          let deviceApi = this.isAdd?this.$request.addStation:this.$request.updateDevice
+          const { data, status, info } = await deviceApi({
             ...query,
           });
           this.loadingAnswerEqu = false;
@@ -769,6 +799,9 @@ export default {
             this.diaAnswerEqu = false;
             this.$message.success(info);
             this._QueryData();
+            if(this.isAdd){
+              this.stationReport()
+            }
           } else {
             this.$message.error(info);
           }
@@ -777,6 +810,14 @@ export default {
         }
       });
     },
+    async _QueryDataSchool() {
+      const { data, status, info } = await this.$request.schoolDetail();
+      if (status === 0) {
+        this.school = { ...data };
+      } else {
+        this.$message.error(info);
+      }
+    },
     // 查找班级
     async _QueryGradeList() {
       this.loading = true;
@@ -990,9 +1031,9 @@ export default {
             })) ||
           [];
         this.total = data.count;
-        this.$nextTick(function(){
-          this.$refs.main.scrollTop = 0
-        })
+        this.$nextTick(function () {
+          this.$refs.main.scrollTop = 0;
+        });
       } else {
         this.$message.error(info);
       }
@@ -1008,7 +1049,7 @@ export default {
   overflow-y: auto;
 }
 .tab-box {
-  padding:20px 0 12px
+  padding: 20px 0 12px;
 }
 .sel {
   width: 100%;
@@ -206,11 +206,11 @@ export default {
           break;
         case 4:
           if (aMonth > 0 && aMonth < 4) {
-            aMonth = "01";
+            aMonth = "1";
           } else if (aMonth > 3 && aMonth < 7) {
-            aMonth = "04";
+            aMonth = "4";
           } else if (aMonth > 6 && aMonth < 10) {
-            aMonth = "07";
+            aMonth = "7";
           } else {
             aMonth = "10";
           }
@@ -95,14 +95,14 @@ export default {
       loginForm: {
         // username: "15911715665",
         // password: "715665",
-        // username: "18314340313",
-        // password: "Pw340313#",
+        username: "18314340313",
+        password: "Pw340313#",
         // username: "18687826606",
         // password: "Pw826606#",
         // username: "18893712576",
         // password: "712576",
-        username: "13247726488",
-        password: "726488",
+        // username: "13247726488",
+        // password: "726488",
       },
       loginRules: {
         username: [
@@ -583,11 +583,11 @@ export default {
           break;
         case 4:
           if (aMonth > 0 && aMonth < 4) {
-            aMonth = "01";
+            aMonth = "1";
           } else if (aMonth > 3 && aMonth < 7) {
-            aMonth = "04";
+            aMonth = "4";
           } else if (aMonth > 6 && aMonth < 10) {
-            aMonth = "07";
+            aMonth = "7";
           } else {
             aMonth = "10";
           }