Merge branch 'dev-coop-phase3-0830' into 'release'

Dev coop phase3 0830



See merge request !86

src/views/education/item-shield.vue

@@ -104,7 +104,7 @@ export default {
         }
       ],
       tableData: [],
-      totalRows: 0,
+      totalRows: 0
     };
   },
   computed: {
@@ -113,26 +113,26 @@ export default {
   created() {
     vm = this;
     this.search();
-    window.onbeforeunload = function(e) {
-      let pathname = location.href.split("/");
-      pathname = pathname[pathname.length - 1];
-      // console.log(pathname);
-      if (pathname == "item-shield") {
-        e = e || window.event;
-        if (e) {
-          e.returnValue = "关闭提示";
-        }
-        return "关闭提示";
-      }
-    };
+    // window.onbeforeunload = function(e) {
+    //   let pathname = location.href.split("/");
+    //   pathname = pathname[pathname.length - 1];
+    //   // console.log(pathname);
+    //   if (pathname == "item-shield") {
+    //     e = e || window.event;
+    //     if (e) {
+    //       e.returnValue = "关闭提示";
+    //     }
+    //     return "关闭提示";
+    //   }
+    // };
   },
   // 挂载到Dom完成时
   mounted: function() {
     window.onbeforeunload = function(e) {
-      let pathname = location.href.split('/');
-      pathname = pathname[pathname.length-1];
+      let pathname = location.href.split("/");
+      pathname = pathname[pathname.length - 1];
       console.log(pathname);
-      if(pathname == 'item-shield') {
+      if (pathname == "item-shield") {
         e = e || window.event;
         if (e) {
           e.returnValue = "数据不会保存";
@@ -140,7 +140,6 @@ export default {
         return "数据不会保存";
       }
     };
-
     commonUtil.resizeHeight();
   },
   beforeRouteLeave(to, from, next) {
@@ -153,8 +152,7 @@ export default {
       next(false);
     }
   },
-  destroyed() {
-  },
+  destroyed() {},
   methods: {
     searchList() {
       this.formInline.pageNo = 1;
@@ -180,9 +178,10 @@ export default {
     //改变
     changeType(value) {
       console.log(value);
+      vm.searchList();
     },
     complete() {
-      console.log('完成');
+      console.log("完成");
     },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
@@ -192,7 +191,7 @@ export default {
       console.log(`当前页: ${val}`);
       this.formInline.pageNo = val;
       this.search();
-    },
+    }
   }
 };
 </script>

src/views/learning/item-list.vue

@@ -197,7 +197,7 @@ export default {
       showOriginal: 2,
       roleType: '',
       formInline: {
-        region: [],
+        region: [0],
         date: "",
         organization: [],
         checked: false,
@@ -234,6 +234,7 @@ export default {
     this.projectName = vm.getUrlSearch(window.location.href, "projectName");
     this.curmbThird = vm.getUrlSearch(window.location.href, "projectName");
     this.getDisplay();
+    this.search();
     // this.getRegionOption();
   },
   mounted: function() {