瀏覽代碼

提交一下

1
mo 3 年之前
父節點
當前提交
e0002ef464

+ 1 - 1
src/views/courseRulersManager/components/studentAttRules.vue

@@ -28,7 +28,7 @@
                 <el-option label="小时" value="bi"> </el-option>
                 <el-option label="分钟" value="bi"> </el-option>
               </el-select> -->
-                分钟
+                小时
               </template>
             </el-input>
             前可提交请假申请。

+ 32 - 5
src/views/main/abnormal/index.vue

@@ -103,7 +103,9 @@ import { createNotification } from "@/helpers/notification";
 import { errorType } from "@/views/main/constant";
 import { permission } from "@/utils/directivePage";
 import title from "./title";
-import{Export}  from "@/utils/downLoadFile";
+import { getSysTenantConfig } from "@/views/courseRulersManager/api";
+import { descs } from "../constant";
+import { Export } from "@/utils/downLoadFile";
 const initSearch = {
   organId: null,
 };
@@ -120,6 +122,7 @@ export default {
       infoByType: {},
       list: [],
       errorType: errorType,
+      descs: { ...descs },
     };
   },
   computed: {
@@ -179,9 +182,9 @@ export default {
       return list;
     },
   },
-  mounted() {
+  async mounted() {
     this.FetchList();
-    this.$store.dispatch("setBranchs");
+    await this.$store.dispatch("setBranchs");
   },
   methods: {
     permission,
@@ -223,7 +226,8 @@ export default {
       });
       this.FetchList();
     },
-    formatData(data) {
+    async formatData(data) {
+      console.log(data);
       const list = {};
       for (const item of data) {
         const row = errorType[item.errorType] || {};
@@ -235,7 +239,30 @@ export default {
           ...item,
           ...row,
         });
+        // if (item.errorType == "COURSE_TIME_ERROR") {
+        //   try {
+        //     const res = await getSysTenantConfig({ group: "SERVER_ERROR" });
+        //     let startStr = "";
+        //     let endStr = "";
+        //     res.data.forEach((item) => {
+        //       // this.form[item.paramName] = item.paranValue
+        //       if (item.id == "195") {
+        //         startStr = item.paranValue.substring(0,5);
+        //       }
+        //       if (item.id == "196") {
+        //         endStr = item.paranValue.substring(0,5);
+        //       }
+        //     });
+        //     this.descs[
+        //       "COURSE_TIME_ERROR"
+        //     ] = `上课时间在${startStr}~${endStr}时间段内为时间安排异常`;
+        //     console.log(this.descs);
+        //   } catch (e) {
+        //     console.log(e);
+        //   }
+        // }
       }
+      console.log(Object.values(list))
       return Object.values(list);
     },
     async FetchList() {
@@ -276,7 +303,7 @@ export default {
           method: "post",
           url: "/api-web/export/exportIndexErrData",
           params: this.$helpers.qs.stringify({
-            ...params
+            ...params,
           }),
         },
         "是否确认导出报表?"

+ 12 - 7
src/views/main/abnormal/title.vue

@@ -1,5 +1,5 @@
 <template>
- <div
+  <div
     class="title"
     :class="{ error: type === 'error', warning: type === 'warning' }"
   >
@@ -36,17 +36,23 @@ export default {
   data() {
     return {
       descs,
-      ignore: ["NO_CLASS_MUSIC_GROUP_STUDENT_INFO","NO_MEMBER_STUDENT_INFO","MEMBER_STUDENT_INFO","MUSIC_GROUP_PERFORMANCE"], // // 忽略类型
+      ignore: [
+        "NO_CLASS_MUSIC_GROUP_STUDENT_INFO",
+        "NO_MEMBER_STUDENT_INFO",
+        "MEMBER_STUDENT_INFO",
+        "MUSIC_GROUP_PERFORMANCE",
+      ], // // 忽略类型
     };
   },
-  mounted() {},
+  async mounted() {
+
+  },
   methods: {
     titleFilter(item) {
       if (this.ignore.includes(item.errorType)) {
-
         let tempName = item.name;
-        tempName = tempName.replace("{0}",`<b>${item.num}</b>`);
-        tempName = tempName.replace("{1}",`<b>${item.num2}</b>`);
+        tempName = tempName.replace("{0}", `<b>${item.num}</b>`);
+        tempName = tempName.replace("{1}", `<b>${item.num2}</b>`);
         return tempName;
       } else {
         return item.name;
@@ -81,7 +87,6 @@ export default {
     &:before {
       position: absolute;
       background-color: #ed6f62;
-
     }
   }
   &.warning {

+ 7 - 0
src/views/main/api.js

@@ -167,3 +167,10 @@ export const indexStudentOverView = (data) => request2({
   method: 'get',
   params: data
 })
+
+// 获取动态的配置项
+export const getSysConfigName = (data) => request2({
+  url: '/api-web/sysConfig/queryByParamName',
+  method: 'get',
+  params: data
+})

+ 2 - 2
src/views/teamBuild/components/teamBaseInfo.vue

@@ -140,7 +140,7 @@
             :disabled="basdisabled"
           ></el-input>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           label="运营主管"
           prop="boss"
           :rules="[{ required: true, message: '运营主管不能为空' }]"
@@ -163,7 +163,7 @@
               }}</span>
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
 
         <!-- <el-form-item
           label="预报名截止时间"

+ 2 - 2
vue.config.js

@@ -17,9 +17,9 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://192.168.3.227:8000' // 何国威
-let target = 'http://192.168.3.250:8000' //邹璇
+// let target = 'http://192.168.3.250:8000' //邹璇
 // let target = 'http://192.168.3.112:8000' //勇哥
-// let target = 'http://dev.dayaedu.com' // 开发环境
+let target = 'http://dev.dayaedu.com' // 开发环境
 // let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/