From e7991254fab9ba2d940f51eaefc55c359127c517 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 24 Jun 2024 16:50:05 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCorpStatistics/AppCorpOverview.vue     | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue b/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue
index 53ca6ee5..01f50390 100644
--- a/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue
+++ b/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue
@@ -116,7 +116,7 @@ export default {
   methods: {
     loadNode(node, resolve) {
       if (node.level == 0) {
-        this.instance.post(`/api/appCorpStat/getCorpStatTotal`).then((res) => {
+        this.instance.post(`/api/appcorp2/getCorpStatTotal`).then((res) => {
           if (res.data) {
             return resolve([{name: `全国  (${res.data})`}]);
           }
@@ -128,11 +128,11 @@ export default {
       if (node.level == 1) {  //全国
         areaId = ''
       }
-      this.instance.post(`/api/appCorpStat/getCorpStatByArea?areaId=${areaId}`).then((res) => {
+      this.instance.post(`/api/appcorp2/getCorpStatByArea?areaId=${areaId}`).then((res) => {
         if (res.data) {
           res.data.map((item) => {
             item.name = item.name + `(${item.total})`
-            item.leaf = !/0{8}$/.test(item.id)
+            item.leaf = !/0{10}$/.test(item.id)
           })
           resolve(res.data)
         }
@@ -159,21 +159,18 @@ export default {
     },
 
     getInfo() {
-      this.info = {}
-      this.instance.post(`/api/appCorpStat/getLatestInfo?areaId=${this.areaId}`).then(res => {
-        if (res.code === 0) {
-          this.info = res.data
+      this.instance.post(`/api/appcorp2/getLatestInfo?areaId=${this.areaId}`).then(res => {
+        if (res?.data) {
+          this.info = res.data || {}
         }
       })
     },
 
     getTableData() {
-      this.instance.post(`/api/appCorp/page?areaId=${this.areaId}&current=${this.page.current}&size=${this.page.size}&name=${this.name}`,).then(res => {
-        if (res.code === 0) {
-          if (res.data) {
-            this.gropList = res.data.records
-            this.page.total = res.data.total
-          }
+      this.instance.post(`/api/appcorp2/list?areaId=${this.areaId}&current=${this.page.current}&size=${this.page.size}&name=${this.name}`,).then(res => {
+        if (res?.data) {
+          this.gropList = res.data.records
+          this.page.total = res.data.total
         }
       })
     },
@@ -252,7 +249,6 @@ export default {
     gap: 16px;
 
 
-
     .title {
       line-height: 60px;
       font-size: 18px;

From 18dd1937ced406e343dd4318fc51884bad04c24e Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 24 Jun 2024 17:01:50 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue b/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue
index 01f50390..8463a4fc 100644
--- a/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue
+++ b/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue
@@ -98,7 +98,7 @@ export default {
     },
     colConfigs() {
       return [
-        {label: "企微名称", prop: "name", align: 'center', width: 250},
+        {label: "企微名称", prop: "name", width: 250},
         {label: "地区", prop: "areaName", align: 'center', width: 150},
         {label: "地区编码", prop: "areaId", align: 'center', width: 150},
         {label: "创建时间", prop: "createTime", align: 'center', width: 200},

From 5c29d7ca5d472253d6959bf478d3da6ce71d564a Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 24 Jun 2024 17:59:21 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppCorpStatistics/AppCorpOverview.vue     | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue b/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue
index 8463a4fc..27d43cf3 100644
--- a/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue
+++ b/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue
@@ -43,10 +43,10 @@
               </template>
             </ai-search-bar>
             <ai-table :tableData="gropList" :total="page.total" :current.sync="page.current" :size.sync="page.size"
-                      @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+                      @getList="getTableData" :col-configs="colConfigs" :dict="dict" height="calc(100% - 64px)">
               <el-table-column label="操作" slot="options" align="center" width="100">
                 <template v-slot="{row}">
-                  <el-button type="text" @click="$router.push({hash:'#add',query:{id:row.id}})">详情</el-button>
+                  <el-button v-if="row.aiEnable==1" type="text" @click="$router.push({hash:'#add',query:{id:row.id}})">详情</el-button>
                 </template>
               </el-table-column>
             </ai-table>
@@ -60,9 +60,11 @@
 <script>
 import {mapState} from 'vuex'
 import coDetail from "./coDetail.vue";
+import AiCard from "dui/packages/layout/AiCard.vue";
 
 export default {
   name: 'AppCorpOverview',
+  components: {AiCard},
   label: '企微概览',
   props: {
     dict: Object,
@@ -132,7 +134,6 @@ export default {
         if (res.data) {
           res.data.map((item) => {
             item.name = item.name + `(${item.total})`
-            item.leaf = !/0{10}$/.test(item.id)
           })
           resolve(res.data)
         }
@@ -205,12 +206,12 @@ export default {
           .ai-search-ba {
             margin-top: 10px;
           }
-
-          .ai-table {
-            margin-top: 0 !important;
-          }
         }
       }
+      .ai-table {
+        height: calc(100% - 44px);
+        margin-top: 0 !important;
+      }
     }
   }
 
@@ -263,5 +264,13 @@ export default {
       padding-bottom: 20px;
     }
   }
+
+  .table {
+    background: #fff;
+    box-shadow: 0 4px 6px -2px rgba(15, 15, 21, 0.15);
+    border-radius: 2px;
+    padding: 16px;
+    height: calc(100% - 133px);
+  }
 }
 </style>

From cd4a5621bb758e53da6b48e694fa0a73c81826c9 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 24 Jun 2024 18:22:18 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statistics/AppCorpStatistics/coDetail.vue | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/project/oms/apps/statistics/AppCorpStatistics/coDetail.vue b/project/oms/apps/statistics/AppCorpStatistics/coDetail.vue
index dfb2fc70..5fce1e71 100644
--- a/project/oms/apps/statistics/AppCorpStatistics/coDetail.vue
+++ b/project/oms/apps/statistics/AppCorpStatistics/coDetail.vue
@@ -15,15 +15,15 @@ export default {
       detail: {},
       tableData: [],
       sta: {
-        a: "接入群数量",
-        b: "群消息调用总计",
-        c: "昨日群调用",
-        d: "昨日请求人数"
+        accessGroupCount: "接入群数量",
+        aiCallCount: "群消息调用总计",
+        yesterdayCallCount: "昨日群调用",
+        yesterdayCallMember: "昨日请求人数"
       }
     }
   },
   computed: {
-    columns: v => [
+    columns: () => [
       {label: "群ID", prop: "1", width: 160},
       {label: "时间", prop: "1", width: 160},
       {label: "请求文本", prop: "1"},
@@ -32,11 +32,11 @@ export default {
   methods: {
     getDetail() {
       const {id} = this.$route.query
-      this.instance.post("", null, {
+      this.instance.post("/api/appcorp2/list", null, {
         params: {id}
       }).then(res => {
         if (res?.data) {
-          this.detail = res.data
+          this.detail = res.data.records?.[0] || {}
         }
       })
     }
@@ -55,9 +55,9 @@ export default {
         <div>
           <ai-card title="大模型应用详情">
             <el-descriptions :column="1" :colon="false">
-              <el-descriptions-item label="地域名称"></el-descriptions-item>
-              <el-descriptions-item label="地域编号"></el-descriptions-item>
-              <el-descriptions-item label="ab_appid"></el-descriptions-item>
+              <el-descriptions-item label="地域名称">{{detail.areaName}}</el-descriptions-item>
+              <el-descriptions-item label="地域编号">{{detail.areaId}}</el-descriptions-item>
+              <el-descriptions-item label="ab_appid">{{detail.abAppid}}</el-descriptions-item>
             </el-descriptions>
           </ai-card>
           <ai-card title="大模型应用统计">

From 90e89cd60dd23a63e62158b7578d81b1f2445319 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 24 Jun 2024 19:42:17 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statistics/AppCorpStatistics/coDetail.vue | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/project/oms/apps/statistics/AppCorpStatistics/coDetail.vue b/project/oms/apps/statistics/AppCorpStatistics/coDetail.vue
index 5fce1e71..0975ef17 100644
--- a/project/oms/apps/statistics/AppCorpStatistics/coDetail.vue
+++ b/project/oms/apps/statistics/AppCorpStatistics/coDetail.vue
@@ -24,9 +24,9 @@ export default {
   },
   computed: {
     columns: () => [
-      {label: "群ID", prop: "1", width: 160},
-      {label: "时间", prop: "1", width: 160},
-      {label: "请求文本", prop: "1"},
+      {label: "群ID", prop: "xbotGroupId", width: 160},
+      {label: "时间", prop: "sendTime", width: 160},
+      {label: "请求文本", prop: "content"},
     ]
   },
   methods: {
@@ -39,6 +39,13 @@ export default {
           this.detail = res.data.records?.[0] || {}
         }
       })
+      this.instance.post("/api/apiForward", null, {
+        params: {url: "http://192.168.1.87:9000/app/appmasssendingtaskbaidu/ailist?size=15"}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data
+        }
+      })
     }
   },
   created() {
@@ -55,9 +62,9 @@ export default {
         <div>
           <ai-card title="大模型应用详情">
             <el-descriptions :column="1" :colon="false">
-              <el-descriptions-item label="地域名称">{{detail.areaName}}</el-descriptions-item>
-              <el-descriptions-item label="地域编号">{{detail.areaId}}</el-descriptions-item>
-              <el-descriptions-item label="ab_appid">{{detail.abAppid}}</el-descriptions-item>
+              <el-descriptions-item label="地域名称">{{ detail.areaName }}</el-descriptions-item>
+              <el-descriptions-item label="地域编号">{{ detail.areaId }}</el-descriptions-item>
+              <el-descriptions-item label="ab_appid">{{ detail.abAppid }}</el-descriptions-item>
             </el-descriptions>
           </ai-card>
           <ai-card title="大模型应用统计">

From f2a513bd0ebb20a22159dc943080719fff6eb7ea Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 24 Jun 2024 19:52:36 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statistics/AppCorpStatistics/AppCorpOverview.vue     | 9 ++-------
 .../oms/apps/statistics/AppCorpStatistics/coDetail.vue   | 7 ++-----
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue b/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue
index 27d43cf3..bd8f1b8e 100644
--- a/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue
+++ b/project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue
@@ -5,7 +5,7 @@
       <!-- 标题 -->
       <ai-title slot="title" :title="$options.label" isShowBottomBorder/>
       <template #content>
-        <ai-tree-menu title="企微统计">
+        <ai-tree-menu title="企微统计" hideInput>
           <el-tree @node-click="nodeClick" :props="props" :load="loadNode" lazy :expand-on-click-node="false"/>
         </ai-tree-menu>
         <div class="fill mar-l8">
@@ -109,12 +109,10 @@ export default {
       ]
     }
   },
-
   mounted() {
     this.getInfo()
     this.getTableData()
   },
-
   methods: {
     loadNode(node, resolve) {
       if (node.level == 0) {
@@ -139,7 +137,6 @@ export default {
         }
       })
     },
-
     nodeClick(list, node) {
       if (node.data.id) {
         this.areaId = node.data.id
@@ -150,7 +147,6 @@ export default {
       this.getInfo()
       this.getTableData()
     },
-
     resetSearch() {
       this.name = ''
       this.page.current = 1
@@ -158,7 +154,6 @@ export default {
       this.page.total = 0
       this.getTableData()
     },
-
     getInfo() {
       this.instance.post(`/api/appcorp2/getLatestInfo?areaId=${this.areaId}`).then(res => {
         if (res?.data) {
@@ -166,7 +161,6 @@ export default {
         }
       })
     },
-
     getTableData() {
       this.instance.post(`/api/appcorp2/list?areaId=${this.areaId}&current=${this.page.current}&size=${this.page.size}&name=${this.name}`,).then(res => {
         if (res?.data) {
@@ -208,6 +202,7 @@ export default {
           }
         }
       }
+
       .ai-table {
         height: calc(100% - 44px);
         margin-top: 0 !important;
diff --git a/project/oms/apps/statistics/AppCorpStatistics/coDetail.vue b/project/oms/apps/statistics/AppCorpStatistics/coDetail.vue
index 0975ef17..10d39061 100644
--- a/project/oms/apps/statistics/AppCorpStatistics/coDetail.vue
+++ b/project/oms/apps/statistics/AppCorpStatistics/coDetail.vue
@@ -1,10 +1,7 @@
 <script>
-
-import AiTable from "dui/packages/basic/AiTable.vue";
-
+const aiBase = process.env.NODE_ENV == "production" ? "https://aiweb.icunwei.com" : "http://192.168.1.87:9000"
 export default {
   name: "coDetail",
-  components: {AiTable},
   label: "系统详情",
   props: {
     dict: Object,
@@ -40,7 +37,7 @@ export default {
         }
       })
       this.instance.post("/api/apiForward", null, {
-        params: {url: "http://192.168.1.87:9000/app/appmasssendingtaskbaidu/ailist?size=15"}
+        params: {url: `${aiBase}/app/appmasssendingtaskbaidu/ailist?size=15`}
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data