From 9920db40ad924a9b2eb140273a17e555952557b3 Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Sat, 27 Jul 2024 09:01:15 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E6=97=A5=E6=8A=A5=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/quartz/task/RyTask.java    | 74 +++++++++----------
 ruoyi-ui/src/views/statistics/daily/index.vue | 18 ++++-
 2 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index a9ee072..432f4fe 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -20,41 +20,41 @@ public class RyTask {
     @Autowired
     private IBusFifteenInfoService iBusFifteenInfoService;
 
-    /**
-     * 获取订单并解析号码   5分钟
-     */
-    public void getOrders() {
-        iMeituanService.orderInfoList();
-    }
-
-    /**
-     * 发送AI  1分钟
-     *
-     * @throws Exception
-     */
-    public void sendToAi() throws Exception {
-        aiService.sendToAi();
-    }
-
-    /**
-     * 获取AI结果  5分钟
-     */
-    public void getAiResult() {
-        aiService.queryAiTask();
-    }
-
-    /**
-     * 统计昨日营销数 每天8点执行一次
-     */
-    public void getReturnInfo() {
-        iMeituanService.getReturnInfo(null);
-
-    }
-
-    /**
-     * 清理表 15天前数据
-     */
-    public void deleteBusFifteenInfo() {
-        iBusFifteenInfoService.deleteBusFifteenInfo();
-    }
+//    /**
+//     * 获取订单并解析号码   5分钟
+//     */
+//    public void getOrders() {
+//        iMeituanService.orderInfoList();
+//    }
+//
+//    /**
+//     * 发送AI  1分钟
+//     *
+//     * @throws Exception
+//     */
+//    public void sendToAi() throws Exception {
+//        aiService.sendToAi();
+//    }
+//
+//    /**
+//     * 获取AI结果  5分钟
+//     */
+//    public void getAiResult() {
+//        aiService.queryAiTask();
+//    }
+//
+//    /**
+//     * 统计昨日营销数 每天8点执行一次
+//     */
+//    public void getReturnInfo() {
+//        iMeituanService.getReturnInfo(null);
+//
+//    }
+//
+//    /**
+//     * 清理表 15天前数据
+//     */
+//    public void deleteBusFifteenInfo() {
+//        iBusFifteenInfoService.deleteBusFifteenInfo();
+//    }
 }
diff --git a/ruoyi-ui/src/views/statistics/daily/index.vue b/ruoyi-ui/src/views/statistics/daily/index.vue
index f828f95..5d472a1 100644
--- a/ruoyi-ui/src/views/statistics/daily/index.vue
+++ b/ruoyi-ui/src/views/statistics/daily/index.vue
@@ -325,7 +325,11 @@ export default {
             url: response.data.codeUrl
           })
         }
-        this.attrList = response.data.attrInfoList;
+        // this.attrList = response.data.attrInfoList;
+        response.data.attrInfoList.forEach((item, index) => {
+          //this.items[index] = Object.assign({}, item, { attrId: item.attrId, });
+          this.attrList.push({attrId: item.attrId,attrValue: item.attrValue,attrName:item.attrName});
+        });
         this.open = true;
         this.title = "修改模版";
       });
@@ -394,11 +398,19 @@ export default {
     },
     listTemplateAttr(){
       listTemplateAttr({}).then(response => {
-        this.attrConfigList = response.data
+        response.data.forEach((item, index) => {
+          //this.items[index] = Object.assign({}, item, { attrId: item.attrId, });
+          this.attrConfigList.push({attrId: item.attrId,attrValue: item.attrValue,attrName:item.attrName});
+        });
+        // for(response.data.){
+        //   const item = {attrId:};
+        //   this.attrConfigList.push({});
+        // }
+        // this.attrConfigList = response.data
       });
     },
     isElementPresent(item) {
-      return this.attrList.indexOf(item);
+      return this.attrList.findIndex(listItem => listItem.attrId === item.attrId);;
     }
   }
 };