Merge remote-tracking branch 'origin/main'

SC-web/src/views/dashboard/admin/components/ContractList.vue

@@ -32,11 +32,20 @@ export default {
   components: { CountTo },
   data() {
     return {
+      intervalID: undefined,
       list: []
     }
   },
   mounted: function () {
     this.getContractList();
+    //this.intervalStrat();
+  },
+  // mounted() {
+  //   var date = new Date();
+  //   this.fnDateChg(date);
+  // },
+  beforeDestroy() {
+    this.intervalDel();
   },
   methods: {
     getContractList: function () {
@@ -46,6 +55,9 @@ export default {
         data: {
           currentPage: 1,
           pageSize: 7,
+          json: "",
+          keyword: "",
+          sidx: "",
         },
       }).then(res => {
         if (res.code == 200) {
@@ -53,6 +65,18 @@ export default {
         }
       }).catch(() => {
       })
+    },
+    intervalStrat() {
+      this.intervalDel();
+      this.intervalID = setInterval(() => {
+        console.log('hi');
+      }, 1000);
+
+    },
+    intervalDel() {
+      if (this.intervalID) {
+        clearInterval(this.intervalID);
+      }
     }
   }
 }

SC-web/src/views/scm/basicInformation/natural/Form.vue

@@ -170,7 +170,7 @@ export default {
             var _data = this.dataList()
             if (!this.dataForm.id) {
                 request({
-                    url: '/api/example/Natural',
+                    url: '/api/example/Jg_natural',
                     method: 'post',
                     data: _data
                 }).then((res) => {