规则排序

src/views/rulesManagement/matterRules/components/matter-add.vue

@@ -488,11 +488,31 @@
         form.categoryName = this.cName;
         form.categoryId = this.cId;
 
-        form.cycle = this.$refs.cycleMultipleRef.ruleCycleList.map(
-          (i, index) => {
+        form.cycle = this.$refs.cycleMultipleRef.ruleCycleList
+          .map((i) => {
+            // 根据月日时分排序计算权重排序
+            let sortNum = 0;
+            if (i.month) {
+              sortNum += i.month * 60 * 24 * 30;
+            }
+            if (i.day) {
+              sortNum += i.day * 60 * 24;
+            }
+            if (i.hour) {
+              sortNum += i.hour * 60;
+            }
+
+            if (i.minute) {
+              sortNum += i.minute * 1;
+            }
+
+            return { ...i, sortNum };
+          })
+          .sort((a, b) => a.sortNum - b.sortNum)
+          .map((i, index) => {
             return { ...i, sortNum: index + 1 };
-          }
-        );
+          });
+
         console.log(form);
 
         switch (form.cycleType) {

src/views/rulesManagement/releaseRules/components/permitAdd.vue

@@ -633,11 +633,30 @@
             this.btnLoading = true;
 
             this.formData.recordRulesCycleList =
-              this.$refs.cycleMultipleRef.recordRulesCycleList.map(
-                (i, index) => {
+              this.$refs.cycleMultipleRef.recordRulesCycleList
+                .map((i) => {
+                  // 根据月日时分排序计算权重排序
+                  let sortNum = 0;
+                  if (i.month) {
+                    sortNum += i.month * 60 * 24 * 30;
+                  }
+                  if (i.day) {
+                    sortNum += i.day * 60 * 24;
+                  }
+                  if (i.hour) {
+                    sortNum += i.hour * 60;
+                  }
+
+                  if (i.minute) {
+                    sortNum += i.minute * 1;
+                  }
+
+                  return { ...i, sortNum };
+                })
+                .sort((a, b) => a.sortNum - b.sortNum)
+                .map((i, index) => {
                   return { ...i, sortNum: index + 1 };
-                }
-              );
+                });
 
             const body = { ...this.formData };
 
@@ -685,11 +704,30 @@
           try {
             this.btnLoading = true;
             this.formData.recordRulesCycleList =
-              this.$refs.cycleMultipleRef.recordRulesCycleList.map(
-                (i, index) => {
+              this.$refs.cycleMultipleRef.recordRulesCycleList
+                .map((i) => {
+                  // 根据月日时分排序计算权重排序
+                  let sortNum = 0;
+                  if (i.month) {
+                    sortNum += i.month * 60 * 24 * 30;
+                  }
+                  if (i.day) {
+                    sortNum += i.day * 60 * 24;
+                  }
+                  if (i.hour) {
+                    sortNum += i.hour * 60;
+                  }
+
+                  if (i.minute) {
+                    sortNum += i.minute * 1;
+                  }
+
+                  return { ...i, sortNum };
+                })
+                .sort((a, b) => a.sortNum - b.sortNum)
+                .map((i, index) => {
                   return { ...i, sortNum: index + 1 };
-                }
-              );
+                });
 
             const body = { ...this.formData };
 

vue.config.js

@@ -35,10 +35,11 @@ module.exports = {
         // target: 'http://192.168.1.105:18086',
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.176:18086',
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18087',
         // target: 'http://192.168.1.116:18086',
+        target: 'http://192.168.1.251:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {