mo vor 4 Jahren
Ursprung
Commit
79a35045db

+ 2 - 0
src/components/save-form/index.vue

@@ -26,6 +26,7 @@ export default {
   },
   methods: {
     setFormValue() {
+
       const searchs = new Searchs(this.saveKey || this.$route.path)
       this.searchs = searchs
       const active = searchs.get()
@@ -44,6 +45,7 @@ export default {
       evt.stopImmediatePropagation()
       evt.preventDefault()
       this.searchs.update(this.model, undefined, 'form')
+        console.log(  new Searchs().searchs)
       if (this.$listeners.submit) {
         this.$listeners.submit(evt)
       }

+ 13 - 5
src/layout/components/TagsView.vue

@@ -109,14 +109,21 @@ export default {
     },
     syncTagViewAndSaveForm() {
       const keys = this.$store.state.tagsView.visitedViews.map(
-        (item) => item.path
+        (item) => {
+          // console.log(item)
+          return item.path}
       );
       const searchs = new Searchs();
       const allSearch = searchs.getSearchs();
+      console.log(allSearch)
       const sks = Object.keys(allSearch);
+
       let route = this.$route;
       for (const item of sks) {
+         console.log(keys,item)
+          console.log( allSearch[item].bind)
         if (!(keys.includes(item) || keys.includes(allSearch[item].bind))) {
+          console.log(item,'删除前')
           searchs.removeByKey(item);
         }
 
@@ -140,6 +147,7 @@ export default {
       }
       // console.log(this.$route)
       await this.$store.dispatch("addVisitedViews", route);
+
       this.syncTagViewAndSaveForm();
     },
     moveToCurrentTag() {
@@ -193,18 +201,18 @@ export default {
     closeMenu() {
       this.visible = false;
     },
-    changeTag(tag) {
-      console.log(tag);
-      activeKey = this.getSearchsByRealPath(tag);
+    async changeTag(tag) {
+      activeKey = await this.getSearchsByRealPath(tag);
     },
     getSearchsByRealPath(tag) {
       const searchs = new Searchs();
       let keyName = "";
 
-      console.log(searchs.searchs);
+
       for (const key in searchs.searchs) {
         if (Object.hasOwnProperty.call(searchs.searchs, key)) {
           const item = searchs.searchs[key];
+
           if (tag.path === key || item.bind === tag.path) {
             keyName = item.bind || tag.path;
           }

+ 0 - 1
src/views/categroyManager/insideSetting/addressManager.vue

@@ -621,7 +621,6 @@ export default {
       });
     },
     openTeaching(type, row) {
-      console.log(row);
       // 重置数据
       // this.form = {
       //   id: null,

+ 0 - 3
src/views/main/abnormal/index.vue

@@ -172,11 +172,9 @@ export default {
       this.FetchList()
     },
     formatData(data) {
-      console.log(data,'格式化方法')
       const list = {}
       for (const item of data) {
         const row = errorType[item.errorType] || {}
-        console.log(row)
         const key = row.parent || item.errorType
         if (!list[key]) {
           list[key] = []
@@ -189,7 +187,6 @@ export default {
         )
 
       }
-       console.log(list)
       return Object.values(list)
     },
     async FetchList() {

+ 1 - 0
src/views/main/constant.js

@@ -194,6 +194,7 @@ export const errorType = {
     url: '/operateManager/serverDetail',
     query: {
       searchType: 'TEACHER_SERVE_ERROR',
+      unDone:1
     },
   }
 }

+ 15 - 5
src/views/serverDetail/index.vue

@@ -3,13 +3,14 @@
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      服务指标明细<filter-search
+      服务指标明细
+    </h2>
+    <!-- <filter-search
         ref="filterSearch"
         @reload="reloadSearch"
         :keys="['searchType']"
         :moreKeys="['organId']"
-      />
-    </h2>
+      /> -->
     <div class="m-core">
       <save-form
         :inline="true"
@@ -79,7 +80,7 @@
             end-placeholder="结束日期"
             :clearable="false"
             @change="changeWeek"
-            :picker-options="{ firstDayOfWeek: 1 }"
+            :picker-options="bigin()"
           >
           </el-date-picker>
         </el-form-item>
@@ -265,8 +266,8 @@ export default {
       this.$store.dispatch("setEmploys");
       this.getDefaultTime();
       if (this.$route.query.searchType) {
-        console.log();
         this.searchForm.organId = this.$route.query.organId * 1 || "";
+        this.searchForm.unDone = this.$route.query.unDone || ""
         const dayjs = this.$helpers.dayjs;
         let nowDate = dayjs(new Date()).format("YYYY-MM-DD");
         this.orderDate = [
@@ -366,6 +367,15 @@ export default {
     handleSelectionChange(arr) {
       this.chioseList = arr;
     },
+    bigin(){
+      let self = this;
+      return {
+        firstDayOfWeek: 1,
+        disabledDate(time) {
+            return time.getTime() >= Date.now();
+        },
+      };
+    }
   },
 };
 </script>