diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 0000000..5d99a5e
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,5 @@
+
+{
+    "htmlWhitespaceSensitivity": "ignore",
+    "printWidth": 1000
+   }
\ No newline at end of file
diff --git a/package.json b/package.json
index 35a9559..997be84 100644
--- a/package.json
+++ b/package.json
@@ -25,11 +25,14 @@
     "element-plus": "2.2.27",
     "file-saver": "2.0.5",
     "fuse.js": "6.6.2",
+    "highlight.js": "^11.10.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.3.1",
+    "marked": "^14.0.0",
+    "md-editor-v3": "^4.18.1",
     "nprogress": "0.2.0",
     "pinia": "2.0.22",
-    "vue": "3.2.45",
+    "vue": "^3.2.47",
     "vue-cropper": "1.0.3",
     "vue-router": "4.1.4"
   },
diff --git a/src/api/marketing-algorithm.js b/src/api/marketing-algorithm.js
new file mode 100644
index 0000000..c74fd0d
--- /dev/null
+++ b/src/api/marketing-algorithm.js
@@ -0,0 +1,33 @@
+/*
+ * @Author: qinzhenpen qzp1807@126.com
+ * @Date: 2024-08-16 10:14:59
+ * @LastEditors: qinzhenpen qzp1807@126.com
+ * @LastEditTime: 2024-08-16 16:38:09
+ * @FilePath: \vue3\src\api\marketing-algorithm.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import request from "@/utils/request";
+// 选择指标分析数据展示
+export function getMarketingAlgorithm(data) {
+  return request({
+    url: "/api/model/viewAnalyzeData",
+    method: "POST",
+    data,
+  });
+}
+// 查看指标
+export function getMarketingAlgorithmList(params) {
+  return request({
+    url: "/api/model/viewMetrics",
+    method: "POST",
+    params,
+  });
+}
+// 描述性统计数据预处理
+export function getMarketingAlgorithmPreprocessing(data) {
+  return request({
+    url: "/api/model/descriptiveStatistics",
+    method: "POST",
+    data,
+  });
+}
diff --git a/src/assets/images/01.png b/src/assets/images/01.png
index fb875f3..96f14f5 100644
Binary files a/src/assets/images/01.png and b/src/assets/images/01.png differ
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 331e95f..4b65962 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -134,6 +134,10 @@ aside {
 
 .pagination-container {
   margin-top: 30px;
+  background-color: transparent !important;
+  .el-pagination__total,.el-pagination__goto,.el-pagination__classifier{
+    color: #ffffff !important;
+  }
 }
 
 .text-center {
@@ -183,7 +187,8 @@ aside {
     margin-bottom: 10px;
   }
 }
-.app-container{
+
+.app-container {
   margin: 10px;
   box-shadow: 0px 0px 13px 0px #0452C6;
   border-radius: 10px;
@@ -192,18 +197,22 @@ aside {
 
 .dialog-footer {
   text-align: center;
+
   .el-button:nth-child(1) {
     background: url("../../assets/images/szjj/提交任务.png") no-repeat;
     background-size: 100% 100%;
   }
+
   .el-button:nth-child(2) {
     background: url("../../assets/images/szjj/重新开始.png") no-repeat;
     background-size: 100% 100%;
   }
+
   .el-button--large.is-round {
     padding: 12px 20px 12px 40px !important;
   }
-  .el-button{
+
+  .el-button {
     width: 136px;
     height: 40px;
     padding: 12px 20px 12px 40px !important;
@@ -212,6 +221,7 @@ aside {
     color: #ffffff;
   }
 }
+
 .app-container2 {
   position: relative;
   padding: 20px;
diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index a7d3ec9..929f414 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -119,7 +119,7 @@
 }
 
 .pagination-container .el-pagination {
-	right: 0;
+	// right: 0;
 	position: absolute;
 }
 
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index b866f48..af31f52 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -1,10 +1,11 @@
 #app {
 
   .main-container {
-    height: 100%;
+    height:calc(100% - 58px);
     transition: margin-left .28s;
     margin-left: $base-sidebar-width;
     position: relative;
+ 
   }
 
   .sidebarHide {
diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss
index e065775..c57f1e0 100644
--- a/src/assets/styles/variables.module.scss
+++ b/src/assets/styles/variables.module.scss
@@ -42,7 +42,7 @@ $--color-warning: #E6A23C;
 $--color-danger: #F56C6C;
 $--color-info: #909399;
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 239px;
 
 // the :export directive is the magic sauce for webpack
 // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index ab5490c..af1d101 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,9 +1,17 @@
+<!--
+ * @Author: qinzhenpen qzp1807@126.com
+ * @Date: 2024-07-15 15:44:46
+ * @LastEditors: qinzhenpen qzp1807@126.com
+ * @LastEditTime: 2024-08-16 17:40:50
+ * @FilePath: \vue3\src\layout\components\AppMain.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <section class="app-main">
     <router-view v-slot="{ Component, route }">
-      <transition name="fade-transform" mode="out-in">
+      <transition name="fade-transform" mode="out-in" :key="route.path">
         <keep-alive :include="tagsViewStore.cachedViews">
-          <component v-if="!route.meta.link" :is="Component" :key="route.path"/>
+          <component v-if="!route.meta.link" :is="Component" :key="route.path" />
         </keep-alive>
       </transition>
     </router-view>
@@ -12,18 +20,20 @@
 </template>
 
 <script setup>
-import iframeToggle from "./IframeToggle/index"
-import useTagsViewStore from '@/store/modules/tagsView'
-const tagsViewStore = useTagsViewStore()
+import iframeToggle from "./IframeToggle/index";
+import useTagsViewStore from "@/store/modules/tagsView";
+const tagsViewStore = useTagsViewStore();
 </script>
 
 <style lang="scss" scoped>
 .app-main {
   /* 50= navbar  50  */
-  min-height: calc(100vh - 50px);
+  min-height: calc(100vh - 58px);
   width: 100%;
   position: relative;
   overflow: hidden;
+  background: url("@/assets/images/背景.png") no-repeat;
+  background-size: 100% 100%;
 }
 
 .fixed-header + .app-main {
@@ -33,7 +43,7 @@ const tagsViewStore = useTagsViewStore()
 .hasTagsView {
   .app-main {
     /* 84 = navbar + tags-view = 50 + 34 */
-    min-height: calc(100vh - 84px);
+    min-height: calc(100vh - 58px);
   }
 
   .fixed-header + .app-main {
@@ -64,4 +74,3 @@ const tagsViewStore = useTagsViewStore()
   border-radius: 3px;
 }
 </style>
-
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 4b0abaa..3eae115 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,3 +1,11 @@
+<!--
+ * @Author: qinzhenpen qzp1807@126.com
+ * @Date: 2024-08-09 17:36:23
+ * @LastEditors: qinzhenpen qzp1807@126.com
+ * @LastEditTime: 2024-08-16 17:00:39
+ * @FilePath: \vue3\src\layout\components\Sidebar\index.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <div :class="{ 'has-logo': showLogo }" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
     <!-- <logo v-if="showLogo" :collapse="isCollapse" /> -->
@@ -13,7 +21,7 @@
         mode="vertical"
       >
         <sidebar-item
-          v-for="(route, index) in constantRoutes"
+          v-for="(route, index) in dynamicRoutes"
           :key="route.path + index"
           :item="route"
           :base-path="route.path"
@@ -30,7 +38,7 @@ import variables from '@/assets/styles/variables.module.scss'
 import useAppStore from '@/store/modules/app'
 import useSettingsStore from '@/store/modules/settings'
 import usePermissionStore from '@/store/modules/permission'
-import {constantRoutes} from '@/router/index.js'
+import {constantRoutes,dynamicRoutes} from '@/router/index.js'
 
 const route = useRoute();
 const appStore = useAppStore()
diff --git a/src/layout/index.vue b/src/layout/index.vue
index c4d63c0..f2dfaca 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -4,9 +4,11 @@
     class="app-wrapper"
     :style="{ '--current-color': theme }"
   >
-    <div class="navTitle">
+    <div class="title" style="height: 58px;background-color: #072048 !important;">
+      <div class="navTitle">
       <span class="nacber-name">天 择 数 字 营 销 实 训 系 统 </span>
     </div>
+    </div>
     <div
       v-if="device === 'mobile' && sidebar.opened"
       class="drawer-bg"
@@ -88,13 +90,16 @@ function setLayout() {
   background: url("@/assets/images/背景.png");
   background-size: cover;
   padding-bottom: 14px;
+  height: 100%;
+  width: 100%;
 
   &.mobile.openSidebar {
     position: fixed;
     top: 0;
   }
   .navTitle {
-    background: url("@/assets/images/top.png");
+    background: url("@/assets/images/top.png") no-repeat;
+    background-size: 100% 100%;
     height: 58px;
     width: 100%;
     z-index: 1;
@@ -113,18 +118,12 @@ function setLayout() {
       margin-left: 33px;
       margin-top: 3px;
       letter-spacing: 1px;
-    }
-    
+    }    
   }
   .sidebar-container {
       margin-top: 58px;
     }
     .main-container {
-      // margin-top: 58px;
-      padding-top: 70px;
-      padding-left: 60px;
-      padding-right: 20px;
-
       .caseData {
         position: fixed;
         right: 2%;
diff --git a/src/router/index.js b/src/router/index.js
index 063b63e..48d691c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -70,16 +70,20 @@ export const constantRoutes = [
       },
     ],
   },
+];
+
+// 动态路由，基于用户权限动态去加载
+export const dynamicRoutes = [
   {
     path: "",
     component: Layout,
-    redirect: "/digitalMarketAlgorithm",
+    redirect: "/index",
     children: [
       {
-        path: "/digitalMarketAlgorithm",
-        component: () => import("@/views/digitalMarketAlgorithm/index"),
-        name: "digitalMarketAlgorithm",
-        meta: { title: "数字营销算法", icon: "dashboard", affix: true },
+        path: "/index",
+        component: () => import("@/views/index"),
+        name: "Index",
+        meta: { title: "首页", icon: "dashboard", affix: true },
       },
     ],
   },
@@ -96,6 +100,20 @@ export const constantRoutes = [
       },
     ],
   },
+  // Bi可视化分析
+  {
+    path: "",
+    component: Layout,
+    redirect: "/bi",
+    children: [
+      {
+        path: "/bi",
+        component: () => import("@/views/visual-analysis/index.vue"),
+        name: "bi",
+        meta: { title: "BI可视化分析", icon: "dashboard", affix: true },
+      },
+    ],
+  },
   {
     path: "",
     component: Layout,
@@ -147,7 +165,8 @@ export const constantRoutes = [
         meta: { title: "知识测评", icon: "dashboard", affix: true },
       },
     ],
-  },{
+  },
+  {
     path: "",
     component: Layout,
     redirect: "/Achievement",
@@ -162,12 +181,9 @@ export const constantRoutes = [
   },
 ];
 
-// 动态路由，基于用户权限动态去加载
-export const dynamicRoutes = [];
-
 const router = createRouter({
   history: createWebHistory(),
-  routes: constantRoutes,
+  routes: [...constantRoutes, ...dynamicRoutes],
   scrollBehavior(to, from, savedPosition) {
     if (savedPosition) {
       return savedPosition;
diff --git a/src/store/modules/algorithm.js b/src/store/modules/algorithm.js
new file mode 100644
index 0000000..bd29ba5
--- /dev/null
+++ b/src/store/modules/algorithm.js
@@ -0,0 +1,39 @@
+import Cookies from "js-cookie";
+import * as portraitModel from "@/api/portraitModel";
+import * as marketingAlgorithmApi from "@/api/marketing-algorithm.js";
+
+const useAlgorithmStore = defineStore("algorithm", {
+  state: () => ({
+    userDatabase: [],
+    tableData: [],
+    tableKey:[],
+    userDataLabel:["用户属性表", "用户登录活跃表", "用户消费能力表", "用户行为表", "用户评论表"], //用户数据标签
+    indexLibrary: [],
+    analysisData: [],
+  }),
+  actions: {
+    getlist(data){
+      portraitModel.getUserTableData(data).then((res) => {
+        this.tableData = res?.data?.list;
+        this.tableKey = Object.keys(res?.data?.list[0]).map(item => {
+          return {
+            label: item,
+          };
+        });
+      })
+    },
+    getUserDatabase(val) {
+      marketingAlgorithmApi.getMarketingAlgorithmList(val).then((res) => {
+        this.indexLibrary= res?.data?.map(item => {
+          return {
+            label: item,
+          };
+        }
+        )
+      });
+    }
+  },
+  getters: {},
+});
+
+export default useAlgorithmStore;
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 3b26cfe..7f55c6e 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -5,7 +5,7 @@ const useAppStore = defineStore(
   {
     state: () => ({
       sidebar: {
-        opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
+        opened: true,
         withoutAnimation: false,
         hide: false
       },
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 8764b9d..fe3b72b 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,5 +1,13 @@
+/*
+ * @Author: qinzhenpen qzp1807@126.com
+ * @Date: 2024-08-15 09:41:09
+ * @LastEditors: qinzhenpen qzp1807@126.com
+ * @LastEditTime: 2024-08-17 11:30:38
+ * @FilePath: \vue3\src\store\modules\user.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 import { login, logout, getInfo } from '@/api/login'
-import { getToken, setToken, removeToken,setUserInfo,removeUserInfo } from '@/utils/auth'
+import { getToken, setToken, removeToken,setUserInfo,removeUserInfo,getUserInfo } from '@/utils/auth'
 import defAva from '@/assets/images/profile.jpg'
 
 const useUserStore = defineStore(
@@ -10,7 +18,8 @@ const useUserStore = defineStore(
       name: '',
       avatar: '',
       roles: [],
-      permissions: []
+      permissions: [],
+      userInfo: getUserInfo(),
     }),
     actions: {
       // 登录
diff --git a/src/utils/request.js b/src/utils/request.js
index f428655..076014b 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -16,12 +16,10 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   // baseURL: import.meta.env.VITE_APP_BASE_API,
-  // baseURL:'http://192.168.2.28:9868/',
-  baseURL:'http://192.168.2.16:9868/',
+  baseURL:'http://118.31.7.2:9868/',
   // 超时
   timeout: 10000
 })
-
 // request拦截器
 service.interceptors.request.use(config => {
   // 是否需要设置 token
@@ -45,21 +43,6 @@ service.interceptors.request.use(config => {
       time: new Date().getTime()
     }
     const sessionObj = cache.session.getJSON('sessionObj')
-    if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
-      cache.session.setJSON('sessionObj', requestObj)
-    } else {
-      const s_url = sessionObj.url;                // 请求地址
-      const s_data = sessionObj.data;              // 请求数据
-      const s_time = sessionObj.time;              // 请求时间
-      const interval = 1000;                       // 间隔时间(ms)，小于此时间视为重复提交
-      if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
-        const message = '数据正在处理，请勿重复提交';
-        console.warn(`[${s_url}]: ` + message)
-        return Promise.reject(new Error(message))
-      } else {
-        cache.session.setJSON('sessionObj', requestObj)
-      }
-    }
   }
   return config
 }, error => {
diff --git a/src/views/digitalMarketTech/AIGCLargeModel/components/AIVenisonDiagram.vue b/src/views/digitalMarketTech/AIGCLargeModel/components/AIVenisonDiagram.vue
index e2b3295..099c957 100644
--- a/src/views/digitalMarketTech/AIGCLargeModel/components/AIVenisonDiagram.vue
+++ b/src/views/digitalMarketTech/AIGCLargeModel/components/AIVenisonDiagram.vue
@@ -2,38 +2,31 @@
   <div class="app-containere">
     <el-scrollbar ref="scrollbar" height="530px">
       <div class="one-AI" v-if="textOne">
-          <img src="@/assets/images/ai.png" alt="" />
-          <div class="AI-item">
-            <h2>你好，我是AI助手</h2>
-            <p>作为你的智能伙伴，我既能写文章、想点子，又能陪你聊天、答疑解惑。</p>
-            <p>想知道我还能做什么？点这里快速上手！可以浏览器收藏网站，下次使用更高效哦 ~</p>
-            <div class="examples">
-              <div style="flex-basis: 100%;">
-                <p>你可以试着问我：</p>
-              </div>
-              <div class="example-item" v-for="item in itemData" :key="item" @click="sendExample(item)">
-                <div style="display:flex">
-                  <img :src="getImg(item.img)" alt="">
-                  <span>{{item.title}}</span>
-                </div>
-                <p>{{item.text}}</p>
+        <img src="@/assets/images/ai.png" alt="" />
+        <div class="AI-item">
+          <h2>你好，我是AI助手</h2>
+          <p>作为你的智能伙伴，我既能写文章、想点子，又能陪你聊天、答疑解惑。</p>
+          <p>想知道我还能做什么？点这里快速上手！可以浏览器收藏网站，下次使用更高效哦 ~</p>
+          <div class="examples">
+            <div style="flex-basis: 100%">
+              <p>你可以试着问我：</p>
+            </div>
+            <div class="example-item" v-for="item in itemData" :key="item" @click="sendExample(item)">
+              <div style="display: flex">
+                <img :src="getImg(item.img)" alt="" />
+                <span>{{ item.title }}</span>
               </div>
+              <p>{{ item.text }}</p>
             </div>
           </div>
         </div>
-      <div
-        v-for="(message, index) in messages"
-        :key="index"
-        :class="['message', message.type]"
-      >
+      </div>
+      <div v-for="(message, index) in messages" :key="index" :class="['message', message.type]">
         <div class="items-end" v-if="message.type === 'ai-main'">
           <img src="@/assets/images/ai.png" alt="" />
         </div>
-        <div
-          :class="['items-text', message.type]"
-          :id="'text-container-' + message.id"
-        >
-          <p>{{ message.displayContent }}</p>
+        <div :class="['items-text', message.type]" :id="'text-container-' + message.id">
+          <MdPreview :editorId="id" :modelValue="message.displayContent" :codeFoldable="false" theme="dark" />
         </div>
       </div>
     </el-scrollbar>
@@ -41,19 +34,8 @@
       <form @submit.prevent="sendText">
         <el-scrollbar height="140px">
           <div class="inputCode" style="display: flex">
-            <el-input
-              @keydown="handleKeyDown"
-              v-model="input"
-              type="textarea"
-              rows="6"
-              resize="none"
-              placeholder="文件拖拽进来，使用“/”调用指令，可通过shift+回车换行"
-            />
-            <el-button
-              class="sendButton"
-              :disabled="input === '' || butFlag"
-              @click="sendText"
-            >
+            <el-input @keydown="handleKeyDown" v-model="input" type="textarea" rows="6" resize="none" placeholder="文件拖拽进来，使用“/”调用指令，可通过shift+回车换行" />
+            <el-button class="sendButton" :disabled="input === '' || butFlag" @click="sendText">
               <img src="@/assets/images/发送.png" />
             </el-button>
           </div>
@@ -62,60 +44,70 @@
     </div>
   </div>
 </template>
-  
-  <script setup>
-import { ref, reactive } from "vue";
+<script setup>
+import { MdPreview, MdCatalog } from "md-editor-v3";
+import { getToken,getUserInfo } from '@/utils/auth'
+import useUserStore from "@/store/modules/user";
+import "md-editor-v3/lib/preview.css";
 import * as AI from "@/api/AI.js";
-import {getAssetsFile} from "@/utils/index.js"
+import { getAssetsFile } from "@/utils/index.js";
+import { computed, onMounted } from "vue";
+const userStore = useUserStore();
 const input = ref("");
 const butFlag = ref(false);
 const messages = reactive([]);
 const scrollbar = ref(null);
-const isRequestPending = ref(false); 
-const textOne=ref(true)
-const getImg=(img)=>{
-  return getAssetsFile(img)
-}
-const itemData=[
+const isRequestPending = ref(false);
+const textOne = ref(true);
+const getImg = (img) => {
+  return getAssetsFile(img);
+};
+const itemData = [
   {
-    title:'热点文章编写',
-    text:'你是一位编辑，请从数学老师王闰秋鼓励支持其发挥数学…',
-    img:'热点.png'
+    title: "热点文章编写",
+    text: "你是一位编辑，请从数学老师王闰秋鼓励支持其发挥数学…",
+    img: "热点.png",
   },
   {
-    title:'暑期实践活动安排',
-    text:'仿照这些优秀范例，设计一份初中生2024年暑期社会实践…',
-    img:'安排.png'
+    title: "暑期实践活动安排",
+    text: "仿照这些优秀范例，设计一份初中生2024年暑期社会实践…",
+    img: "安排.png",
   },
   {
-    title:'PPT内容框架',
-    text:'现在你需要制作一份PPT，你需要按照我给出的主题来准备…',
-    img:'框架.png'
-  },{
-    title:'最新学术论文检索',
-    text:'帮我检索一下今年6月的人工智能领域的最新论文，记得给…',
-    img:'检索.png'
-  },{
-    title:'期末备考计划',
-    text:'你是大学期末备考专家，我是一名学【工商管理】的学生…',
-    img:'科研论文.png'
-  },{
-    title:'科普2024世界人工智能大会',
-    text:'阅读下面这些链接，科普一下：2024世界人工智能大会究…',
-    img:'新闻01.png'
+    title: "PPT内容框架",
+    text: "现在你需要制作一份PPT，你需要按照我给出的主题来准备…",
+    img: "框架.png",
   },
-]
-const sendExample=(item)=>{
-  textOne.value=false
-  input.value=item.text
-  sendText()
-}
-const sendText = async() => {
-  if (input.value.trim() === '' || isRequestPending.value) return;
+  {
+    title: "最新学术论文检索",
+    text: "帮我检索一下今年6月的人工智能领域的最新论文，记得给…",
+    img: "检索.png",
+  },
+  {
+    title: "期末备考计划",
+    text: "你是大学期末备考专家，我是一名学【工商管理】的学生…",
+    img: "科研论文.png",
+  },
+  {
+    title: "科普2024世界人工智能大会",
+    text: "阅读下面这些链接，科普一下：2024世界人工智能大会究…",
+    img: "新闻01.png",
+  },
+];
+const sendExample = (item) => {
+  textOne.value = false;
+  input.value = item.text;
+  sendText();
+};
+const aiUserid=computed(()=>{
+  return  getUserInfo() ? JSON.parse(getUserInfo()) : "";
+})
+const sendText = async () => {
+  if (input.value.trim() === "" || isRequestPending.value) return;
   if (input.value.trim() === "") return;
-   isRequestPending.value = true; 
+  isRequestPending.value = true;
   let text = input.value;
-  textOne.value=false
+  textOne.value = false;
   input.value = "";
 
   // 添加用户消息
@@ -130,54 +122,70 @@ const sendText = async() => {
       },
       name: "",
       role: "user",
-      userId: "512",
+      userId: aiUserid.value.userId,
     },
   ];
   const messageId = Date.now();
-  const newMessage = reactive({ id: messageId, type: 'ai-main', displayContent: '' });
+  const newMessage = reactive({ id: messageId, type: "ai-main", displayContent: "" });
   messages.push(newMessage);
-  const resp=await fetch('http://192.168.2.16:9868/api/bigModule/createArticleByAi',{
-    method: 'POST',
+  const resp = await fetch("http://118.31.7.2:9868/api/bigModule/createArticleByAi", {
+    method: "POST",
     headers: {
-      'Content-Type': 'application/json',
-    }, 
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${getToken()}`,
+    },
     body: JSON.stringify(sendData),
-  })
-  const reader=resp.body.getReader()
-  while(1){
-    const {done,value}=await reader.read()
-    if(done){
-      break
+  });
+  const reader = resp.body.getReader();
+  while (1) {
+    const { done, value } = await reader.read();
+    if (done) {
+      break;
     }
-    const decoder=new TextDecoder()
-    const tet=decoder.decode(value)
-    newMessage.displayContent+=tet
-    console.log(tet);
+    const decoder = new TextDecoder("utf-8");
+    const tet = decoder.decode(value, { stream: true });
+
+    await typeText(newMessage, tet);
   }
+  isRequestPending.value = false;
   nextTick(() => {
-        setTimeout(() => {
-            const scrollContainer = scrollbar.value?.$el.querySelector('.el-scrollbar__wrap');
-            if (scrollContainer) {
-                scrollContainer.scrollTop = scrollContainer.scrollHeight;
-            }
-        }, 10);
-    });
-  isRequestPending.value = false; 
+    setTimeout(() => {
+      const scrollContainer = scrollbar.value?.$el.querySelector(".el-scrollbar__wrap");
+      if (scrollContainer) {
+        scrollContainer.scrollTop = scrollContainer.scrollHeight;
+      }
+    }, 10);
+  });
+};
+const typeText = (message, text) => {
+  return new Promise((resolve) => {
+    let index = 0;
+    function type() {
+      if (index < text.length) {
+        const nextChar = text[index];
+        message.displayContent += nextChar;
+        index++;
+        setTimeout(type, 30); // 调整打字速度
+      } else {
+        resolve();
+      }
+    }
+    type();
+  });
 };
-
 const handleKeyDown = (event) => {
   if (event.key === "Enter" && !event.shiftKey) {
     event.preventDefault();
     sendText();
   }
-};
+}
 </script>
-  
-  <style lang="scss" scoped>
+
+<style lang="scss" scoped>
 .app-containere {
   margin: 10px 4px 10px 10px;
-  box-shadow: 0px 0px 13px 0px #0452c6;
-  border-radius: 10px;
+  border: 1px solid #0452c6;
+  background-color: rgba(0, 0, 0, 0.5);
   padding: 25px;
 }
 .message {
@@ -249,50 +257,69 @@ const handleKeyDown = (event) => {
     margin-right: 15px;
   }
 }
-.one-AI{
+.one-AI {
   display: flex;
   width: 100%;
-  img{
+  img {
     width: 31px;
     height: 31px;
   }
-  .AI-item{
+  .AI-item {
     width: calc(100% - 200px);
     margin-left: 10px;
     background: #011031;
     border-radius: 10px;
-    border: 1px solid #003E7C;
+    border: 1px solid #003e7c;
     padding: 10px 15px;
-    color:#FFFFFF;
-    p{
+    color: #ffffff;
+    p {
       font-size: 12px;
     }
-    .examples{
+    .examples {
       display: flex;
       flex-wrap: wrap;
       margin-top: 60px;
       width: calc(100% - 300px);
-      .example-item{
+      .example-item {
         margin: 0 25px 15px 0;
         cursor: pointer;
         width: 349px;
         height: 72px;
-        background: #002C5B;
+        background: #002c5b;
         border-radius: 10px;
         padding: 10px;
-        img{
+        img {
           width: 20px;
           height: 20px;
         }
-        span{
+        span {
           margin-left: 5px;
           font-weight: 400;
           font-size: 16px;
-          color: #FFFFFF;
+          color: #ffffff;
         }
       }
     }
   }
 }
+.md-editor-dark,
+.md-editor-modal-container[data-theme="dark"] {
+  --md-color: #ffffff;
+  --md-bk-color: transparent;
+  --md-border-color: transparent;
+  --md-border-color-hover: transparent;
+  --md-border-color-focus: transparent;
+  --md-border-color-active: transparent;
+  --md-border-color-disabled: transparent;
+  --md-border-color-focus-inner: transparent;
+  --md-border-color-hover-inner: transparent;
+  --md-border-color-active-inner: transparent;
+  --md-border-color-disabled-inner: transparent;
+  --md-border-color-focus-outer: transparent;
+  --md-border-color-hover-outer: transparent;
+  --md-border-color-active-outer: transparent;
+}
+.md-editor-preview hr {
+  border-color: #ffffff;
+}
 </style>
-  
\ No newline at end of file
diff --git a/src/views/digitalMarketTech/AIGCLargeModel/index.vue b/src/views/digitalMarketTech/AIGCLargeModel/index.vue
index 793b040..96bc59f 100644
--- a/src/views/digitalMarketTech/AIGCLargeModel/index.vue
+++ b/src/views/digitalMarketTech/AIGCLargeModel/index.vue
@@ -1,3 +1,11 @@
+<!--
+ * @Author: qinzhenpen qzp1807@126.com
+ * @Date: 2024-08-16 17:56:32
+ * @LastEditors: qinzhenpen qzp1807@126.com
+ * @LastEditTime: 2024-08-16 17:59:16
+ * @FilePath: \vue3\src\views\digitalMarketTech\AIGCLargeModel\index.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
      <div class="app-top">
         <el-button v-for="(item,index) in imgData" :key="index" :class="item.img" @click="clickIndx(index)">{{item.text}}</el-button>
diff --git a/src/views/digitalMarketTech/artificialIntelligence/components/article-identification.vue b/src/views/digitalMarketTech/artificialIntelligence/components/article-identification.vue
index 47d1b09..7796900 100644
--- a/src/views/digitalMarketTech/artificialIntelligence/components/article-identification.vue
+++ b/src/views/digitalMarketTech/artificialIntelligence/components/article-identification.vue
@@ -213,7 +213,7 @@ const downloadArticle=()=>{
     return proxy.$modal.msgWarning("请先完成上一步")
   }
   answerRecord.value=2
-  window.open(`http://192.168.2.16:9868/api/stu/experimental/downloadImg?userId=${JSON.parse(getUserInfo()).userId}&TOKEN=${getToken()}`)
+  window.open(`http://118.31.7.2:9868/api/stu/experimental/downloadImg?userId=${JSON.parse(getUserInfo()).userId}&TOKEN=${getToken()}`)
 }
 
 // 识别文字
diff --git a/src/views/digitalMarketTech/bigData/components/whatBigData.vue b/src/views/digitalMarketTech/bigData/components/whatBigData.vue
index fba03e1..a1211a6 100644
--- a/src/views/digitalMarketTech/bigData/components/whatBigData.vue
+++ b/src/views/digitalMarketTech/bigData/components/whatBigData.vue
@@ -61,11 +61,11 @@
          若以现有的蓝光光盘为计量标准，那么 40ZB 的数据全部存入蓝光光盘，所需要的光盘总重量将达到 424 艘尼米兹号航母的总重量。而这些数据中，约 80% 是非结构化或半结构化类型的数据，甚至更有一部分是不断变化的流数据。因此，数据的爆炸性增长态势，以及其数据构成特点使得人们进入了“大数据”时代。
         </p>
         <p> 一般认为，大数据主要具有以下4个方面的典型特征，即大量(Volume)、多样(Variety)、高速(Velocity)和价值(Value)，即所谓的4V，接下来，通过一张图来具休描述。</p>
-        <p><img src="../../../assets/images/szjj/u1592.png" alt=""></p>
+        <p><img src="@/assets/images/szjj/u1592.png" alt=""></p>
         <p style="font-weight:600;"> 一、Volume(大量)</p><p>大数据的特征首先就是数据规模大。随着互联网、物联网、移动互联技术的发展，人和事物的所有轨迹都可以被记录下来，数据呈现出爆发性增长。数据相关计量单位的换算关系如下表所示。</p>
-        <p><img src="../../../assets/images/szjj/u1594.png" alt=""></p>
+        <p><img src="@/assets/images/szjj/u1594.png" alt=""></p>
         <p>互联网每分钟产生的数据</p>
-        <p><img src="../../../assets/images/szjj/u1597.png" alt=""></p>
+        <p><img src="@/assets/images/szjj/u1597.png" alt=""></p>
         <p style="font-weight:600;"> 二、Variety(多样)</p><p>
             数据来源的广泛性，决定了数据形式的多样性。我们把这些数据大致分为三类：结构化的数据、半结构化的数据和非结构化的数据。<br/>
             结构化的数据，一般指的是关系型数据库中的数据，例如MySQL、Oracle中的表中的数据。如财务系统数据、信息管理系统数据、医疗系统数据等,其特点是数据间因果关系强。这些数据中，每一行的数据都保持着相同的数据格式，有规律可循，非常容易处理。<br/>
diff --git a/src/views/digitalMarketTech/index.vue b/src/views/digitalMarketTech/index.vue
index 6ffdea2..db43208 100644
--- a/src/views/digitalMarketTech/index.vue
+++ b/src/views/digitalMarketTech/index.vue
@@ -1,5 +1,13 @@
+<!--
+ * @Author: qinzhenpen qzp1807@126.com
+ * @Date: 2024-08-12 09:29:39
+ * @LastEditors: qinzhenpen qzp1807@126.com
+ * @LastEditTime: 2024-08-16 17:36:43
+ * @FilePath: \vue3\src\views\digitalMarketTech\index.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
-  <div class="rgzn_top">
+  <div class="rgzn_top  app-container">
     <div class="top_item">
       <el-button :class="{'active':isActive===1}" @click="activeIndex(1)"><img src="@/assets/images/大数据.png">大数据</el-button>
       <el-button :class="{'active':isActive===2}" @click="activeIndex(2)"><img src="@/assets/images/人工智能.png">人工智能</el-button>
diff --git a/src/views/digitalMarketingAlgorithms/components/bigData.vue b/src/views/digitalMarketingAlgorithms/components/bigData.vue
index bf0af31..c8a63e8 100644
--- a/src/views/digitalMarketingAlgorithms/components/bigData.vue
+++ b/src/views/digitalMarketingAlgorithms/components/bigData.vue
@@ -1,118 +1,121 @@
 <template>
   <div class="app-main">
     <div class="main-left">
-        <div class="left-top">
-            <img style="width: 26px;height: 26px;" src="../../../assets/images/图标1.png" alt="">
-            <span>内置表</span>
+      <div class="left-top">
+        <img style="width: 26px; height: 26px" src="../../../assets/images/图标1.png" alt="" />
+        <span>内置表</span>
+      </div>
+      <div class="left-item">
+        <div v-for="(item, index) in nzData" :key="index" class="item" :class="{ 'is-active': nzIndex === index }" @click="goNZ(index, item)">
+          <span>{{ item }}</span>
         </div>
-        <div class="left-item">
-            <div v-for="(item,index) in nzData" :key="index" class="item" :class="{ 'is-active': nzIndex === index}" @click="goNZ(index)">
-                <span>{{item}}</span>
-            </div>
-        </div>
-        <div class="left-top" style="margin-top:35px">
-            <img style="width: 26px;height: 26px;" src="../../../assets/images/图标.png" alt="">
-            <span>自建表</span>
-        </div>
-        <div class="left-item">
-            <div v-for="(item,index) in zjData" :key="index" class="item" :class="{ 'is-active': zjIndex === index}" @click="goZJ(index)">
-                <span>{{item}}</span>
-            </div>
+      </div>
+      <div class="left-top" style="margin-top: 35px">
+        <img style="width: 26px; height: 26px" src="../../../assets/images/图标.png" alt="" />
+        <span>自建表</span>
+      </div>
+      <div class="left-item">
+        <div v-for="(item, index) in zjData" :key="index" class="item" :class="{ 'is-active': zjIndex === index }" @click="goZJ(index)">
+          <span>{{ item }}</span>
         </div>
+      </div>
     </div>
     <div class="main-right">
-        <el-table :data="tableData"  style="width: 94%" :header-cell-style="headerCellStyle">
-            <el-table-column v-for="column in tableLabel" :key="column.prop" :prop="column.prop" :label="column.label" align="center"/>
-        </el-table>
+      <el-table :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle">
+        <el-table-column v-for="column in tableLabel" :key="column" :prop="column.prop" :label="column.label" align="center" />
+      </el-table>
+      <pagination v-show="datatotal > 0" :total="datatotal" v-model:page="n_dataTableQuery.index" v-model:limit="n_dataTableQuery.size" @pagination="getSurface" style="margin-top: 10px" />
     </div>
   </div>
 </template>
-
 <script setup>
-import { reactive } from "vue"
+import * as portraitModel from "@/api/portraitModel";
 
-const nzIndex=ref(0)
-const nzData=['用户属性表','用户登录活跃表','用户消费能力表','用户行为表','用户评论表']
-const zjIndex=ref(-1)
-const zjData=['用户属性表','用户登录活跃表','用户消费能力表','用户行为表','用户评论表']
-const tableLabel=reactive([
-    {prop:'date',label:'用户ID'},
-    {prop:'name',label:'登录名'},
-    {prop:'name',label:'用户姓名'},
-    {prop:'name',label:'学号'},
-    {prop:'name',label:'班级'},
-    {prop:'name',label:'专业'},
-    {prop:'name',label:'学校'},
-    {prop:'name',label:'角色名称'},
-    {prop:'name',label:'角色性别'},
-    {prop:'name',label:'角色年龄'},
-    {prop:'name',label:'注册时间'},
-    {prop:'name',label:'所在地'}
-])
-const goNZ=(index)=>{
-    nzIndex.value=index
-    zjIndex.value=-1
-}
-const goZJ=(index)=>{
-    zjIndex.value=index
-    nzIndex.value=-1
-}
+import useUserStore from "@/store/modules/user";
+import useAlgorithmStore from "@/store/modules/algorithm.js";
+import { ref } from "vue";
+const userStore = useUserStore();
+const algorithmStore = useAlgorithmStore();
+// 数据表query
+const n_dataTableQuery = ref({
+  index: 1,
+  size: 20,
+  tableName: "用户属性表",
+  userId: userStore.userInfo.userId,
+});
+const datatotal = ref(0);
+const nzIndex = ref(0);
+const nzData = ["用户属性表", "用户登录活跃表", "用户消费能力表", "用户行为表", "用户评论表"];
+const zjIndex = ref(-1);
+const zjData = ["用户属性表", "用户登录活跃表", "用户消费能力表", "用户行为表", "用户评论表"];
+const tableLabel = reactive([
+  { prop: "id", label: "用户ID" },
+  { prop: "loginName", label: "登录名" },
+  { prop: "userName", label: "用户姓名" },
+  { prop: "studentId", label: "学号" },
+  { prop: "stuClass", label: "班级" },
+  { prop: "major", label: "专业" },
+  { prop: "school", label: "学校" },
+  { prop: "roleName", label: "角色名称" },
+  { prop: "roleGender", label: "角色性别" },
+  { prop: "roleAge", label: "角色年龄" },
+  { prop: "updateTime", label: "注册时间" },
+  { prop: "location", label: "所在地" },
+]);
+const goNZ = (index, item) => {
+  nzIndex.value = index;
+  zjIndex.value = -1;
+  n_dataTableQuery.value.tableName = item;
+  getSurface();
+};
+const goZJ = (index) => {
+  zjIndex.value = index;
+  nzIndex.value = -1;
+};
+const tableData = ref([]);
 
-const tableData = [
-  {
-    date: '2016-05-03',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-02',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-04',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-01',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },
-]
-const headerCellStyle=()=>{
-     return {
-    // backgroundColor: "#0087F9 !important", // 设置表头背景颜色
-    // background:"linear-gradient(0deg, #002651 0%, #0087F9 100%) !important;",
+const headerCellStyle = () => {
+  return {
     color: "#ffffff !important",
   };
-}
+};
+// 选择内置或自建
+const selectType = (type) => {};
+const getSurface = () => {
+  portraitModel.getUserTableData(n_dataTableQuery.value).then((res) => {
+    tableData.value = res?.data?.list;
+    datatotal.value = res.data.total;
+  });
+};
+onMounted(() => {
+  getSurface();
+});
 </script>
 
 <style lang="scss" scoped>
 .app-main {
-//   background-color: #f5f5f5;
+  //   background-color: #f5f5f5;
   margin: 20px 20px 0;
   height: calc(100vh - 150px);
   display: flex;
   overflow: auto;
-  .main-left{
+  .main-left {
     width: 205px;
     height: 100%;
-    background: #041C49;
-    .left-top{
-        gap: 5px;
-        display: flex;
-        align-items: center;
-        padding: 10px 20px;
-        span{
-            font-weight: bold;
-            font-size: 18px;
-            color: #3596EB;
+    background: #041c49;
+    .left-top {
+      gap: 5px;
+      display: flex;
+      align-items: center;
+      padding: 10px 20px;
+      span {
+        font-weight: bold;
+        font-size: 18px;
+        color: #3596eb;
+      }
     }
-  }
-  .left-item{
-    .item{
+    .left-item {
+      .item {
         width: 195px;
         height: 31px;
         // background: #1983DD;
@@ -120,40 +123,40 @@ const headerCellStyle=()=>{
         align-items: center;
         justify-content: center;
         cursor: pointer;
-        span{
-            color: #9BD1FF;
-            font-weight: 400;
-            font-size: 14px;
+        span {
+          color: #9bd1ff;
+          font-weight: 400;
+          font-size: 14px;
         }
-    }
-    .is-active{
-        background: #1983DD;
-        span{
-            color:#FFFFFF;
+      }
+      .is-active {
+        background: #1983dd;
+        span {
+          color: #ffffff;
         }
+      }
     }
   }
-}
-.main-right{
+  .main-right {
     width: 1639px;
     height: 100%;
     padding: 20px;
     // background: #001D40;
-    border: 1px solid #0452C6;
+    border: 1px solid #0452c6;
     // opacity: 0.5;
   }
 }
-:deep(.el-table__header){
-    .el-table__cell{
-        background:linear-gradient(0deg, #002651 0%, #0087F9 100%) !important;
-    }
+:deep(.el-table__header) {
+  .el-table__cell {
+    background: linear-gradient(0deg, #002651 0%, #0087f9 100%) !important;
+  }
 }
 :deep(.el-table) {
-    --el-table-row-hover-bg-color:#002651 !important;
-    --el-table-border-color: #002651;
-  .el-table__row{
+  --el-table-row-hover-bg-color: #002651 !important;
+  --el-table-border-color: #002651;
+  .el-table__row {
     background-color: #002652 !important;
-    color: #E6E6E6;
+    color: #e6e6e6;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/digitalMarketingAlgorithms/components/descriptiveStatistics.vue b/src/views/digitalMarketingAlgorithms/components/descriptiveStatistics.vue
index a2bdd56..7c8b125 100644
--- a/src/views/digitalMarketingAlgorithms/components/descriptiveStatistics.vue
+++ b/src/views/digitalMarketingAlgorithms/components/descriptiveStatistics.vue
@@ -1,297 +1,342 @@
 <template>
   <el-scrollbar height="800px">
     <div class="main-top">
-        <span style="font-weight: bold;font-size: 18px;color: #3596EB;">任务描述</span>
-        <p style="font-weight: 400;font-size: 12px;color: #E6E6E6;">（给出任务清单参考，做哪些数据的统计分析）Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus pronin sapien nunc accuan eget.</p>
+      <span style="font-weight: bold; font-size: 18px; color: #3596eb">任务描述</span>
+      <p style="font-weight: 400; font-size: 12px; color: #e6e6e6">（给出任务清单参考，做哪些数据的统计分析）Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus pronin sapien nunc accuan eget.</p>
     </div>
     <div class="main-but">
-        <el-button><img src="../../../assets/images/导入.png" alt="">算法知识导入</el-button>
-        <el-button  @click="taskSubmit"><img src="../../../assets/images/提交.png" alt="">实训任务提交</el-button>
+      <el-button>
+        <img src="../../../assets/images/导入.png" alt="" />
+        算法知识导入
+      </el-button>
+      <el-button @click="taskSubmit">
+        <img src="../../../assets/images/提交.png" alt="" />
+        实训任务提交
+      </el-button>
     </div>
     <div class="app-main">
       <div class="main-left">
         <div>
-            <div class="left-top">
-          <span>一、选择指标</span>
-        </div>
-        <div class="metrics">
-            <el-select v-model="input" placeholder="请选择数据" style="width: 180px">
-                <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
+          <div class="left-top">
+            <span>一、选择指标</span>
+          </div>
+          <div class="metrics">
+            <el-select v-model="input" placeholder="请选择数据" style="width: 180px" @change="selectType">
+              <el-option v-for="item in algorithmStore.userDataLabel" :key="item" :label="item" :value="item" />
             </el-select>
-        </div>
-        <div class="metrics-table" style="margin-top: 10px">
-            <el-table border :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle">
-                <el-table-column type="selection" prop="date" label="Date"  align="center"/>
-                <el-table-column prop="name" label="指标"  align="center"/>
+          </div>
+          <div class="metrics-table" style="margin-top: 10px">
+            <el-table border :data="algorithmStore.indexLibrary" style="width: 100%" :header-cell-style="headerCellStyle" @selection-change="handleSelectionChange">
+              <el-table-column type="selection" prop="date" label="Date" align="center" />
+              <el-table-column label="指标" align="center" prop="label" />
             </el-table>
-            <el-button>确定</el-button>
-        </div>
-        <div class="left-top">
-          <span>二、数据预处理</span>
-        </div>
-        <div class="metrics">
-            <el-select v-model="input" placeholder="请选择数据" style="width: 180px">
-                <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
+            <el-button @click="submit">确定</el-button>
+          </div>
+          <div class="left-top">
+            <span>二、数据预处理</span>
+          </div>
+          <div class="metrics">
+            <el-select v-model="preProcessText.text1" placeholder="请选择数据" style="width: 180px">
+              <el-option label="数据去重" value="数据去重" />
             </el-select>
-        </div>
-        <div class="metrics" style="margin-top:15px">
-            <el-select v-model="input" placeholder="请选择数据" style="width: 180px">
-                <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                />
+          </div>
+          <div class="metrics" style="margin-top: 15px">
+            <el-select v-model="preProcessText.text2" placeholder="请选择数据" style="width: 180px" @change="preProcess">
+              <el-option label="缺失值处理-剔除数据" value="缺失值处理-剔除数据" />
+              <el-option label="缺失值处理一均值替代" value="缺失值处理一均值替代" />
             </el-select>
-        </div>
-        <div class="left-top" style="margin-top: 10px">
-          <span>三、模型参数设置</span>
-        </div>
-        <div class="metrics-table" style="margin-top: 10px">
-            <el-table border :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle">
-                <el-table-column type="selection" prop="date" label="Date"  align="center"/>
-                <el-table-column prop="name" label="指标"  align="center"/>
+          </div>
+          <div class="left-top" style="margin-top: 10px">
+            <span>三、模型参数设置</span>
+          </div>
+          <div class="metrics-table" style="margin-top: 10px">
+            <el-table border :data="modelParams" style="width: 100%" :header-cell-style="headerCellStyle" @selection-change="handlemodelSelectionChange">
+              <el-table-column type="selection" prop="date" label="Date" align="center" />
+              <el-table-column prop="name" label="统计量" align="center" />
             </el-table>
-            <el-button>计算</el-button>
-        </div>
+            <el-button @click="modelCalculation">计算</el-button>
+          </div>
         </div>
-<div style="margin-top: auto;">
-    <div class="startOver">
-            <img src="../../../assets/images/重新开始.png" alt="">
+        <div style="margin-top: auto">
+          <div class="startOver">
+            <img src="../../../assets/images/重新开始.png" alt="" />
             <span>重新开始</span>
+          </div>
         </div>
-</div>
-       
       </div>
       <div class="main-right">
         <div>
-            <span style="font-weight: bold;font-size: 18px;color: #3596EB;">分析数据：</span>
-            <el-table :data="tableData"  style="width: 94%;margin-top:10px" :header-cell-style="headerCellStyle" height="350">
-                <el-table-column v-for="column in tableLabel" :key="column.prop" :prop="column.prop" :label="column.label" align="center"/>
-            </el-table>
-            <el-pagination style="margin-top:10px" background layout="prev, pager, next" :total="1000" />
+          <span style="font-weight: bold; font-size: 18px; color: #3596eb">分析数据：</span>
+          <el-table :data="analysisData" style="width: 100%; margin-top: 10px" :header-cell-style="headerCellStyle">
+            <el-table-column v-for="column in analysisHanderKry" :key="column" :prop="column" :label="column" align="center" />
+          </el-table>
+          <!-- <pagination v-show="datatotal > 0" :total="datatotal" v-model:page="dataqueryParams.index" v-model:limit="dataqueryParams.size" @pagination="submit" style="margin-top: 10px" /> -->
         </div>
         <div class="analysisResults" style="margin-top: 20px">
-            <span style="font-weight: bold;font-size: 18px;color: #3596EB;display: block;">分析结果：</span>
-            <el-button>下载</el-button>
-            <el-table :data="tableData"  style="width: 94%;margin-top:10px" :header-cell-style="headerCellStyle" height="350">
-                <el-table-column v-for="column in tableLabel" :key="column.prop" :prop="column.prop" :label="column.label" align="center"/>
-            </el-table>
-            <el-pagination style="margin-top:10px" background layout="prev, pager, next" :total="1000" />
+          <span style="font-weight: bold; font-size: 18px; color: #3596eb; display: block">分析结果：</span>
+          <el-button>下载</el-button>
+          <el-table :data="tableData" style="width: 94%; margin-top: 10px" :header-cell-style="headerCellStyle" height="350">
+            <el-table-column v-for="column in tableLabel" :key="column.label" :prop="column.label" :label="column.label" align="center"></el-table-column>
+            <p v-for="column in tableLabel" :key="column.label">{{ column.label }}</p>
+          </el-table>
+          <el-pagination style="margin-top: 10px" background layout="prev, pager, next" :total="1000" />
         </div>
       </div>
     </div>
   </el-scrollbar>
-
-  <el-dialog
-    v-model="dialogVisible"
-    title="实训任务提交"
-    width="565"
-    custom-class="dialogClass"
-    :show-close="false"
-  >
-  <template #header="{ close, titleId, titleClass }">
+  <el-dialog v-model="dialogVisible" title="实训任务提交" width="565" custom-class="dialogClass" :show-close="false">
+    <template #header="{ close, titleId, titleClass }">
       <div class="my-header">
         <span :id="titleId" :class="titleClass">实训任务提交</span>
-       <img class="gbImg" src="../../../assets/images/关闭.png" @click="close" alt="">
+        <img class="gbImg" src="../../../assets/images/关闭.png" @click="close" alt="" />
       </div>
-      <img class="xtImg" src="../../../assets/images/线条.png" alt="">
+      <img class="xtImg" src="../../../assets/images/线条.png" alt="" />
     </template>
     <div class="from-item">
-        <el-form :inline="true" label-position="right" label-width="84px" :model="form" class="demo-form-inline">
-            <el-form-item label="平均数：">
-                <el-input style="width: 120px;" v-model="formInline.user" clearable />
-            </el-form-item>
-            <el-form-item label="众数：">
-                <el-input style="width: 120px;" v-model="formInline.user" clearable />
-            </el-form-item>
-            <el-form-item label="中位数：">
-                <el-input style="width: 120px;" v-model="formInline.user" clearable />
-            </el-form-item>
-            <el-form-item label="标准差：">
-                <el-input style="width: 120px;" v-model="formInline.user" clearable />
-            </el-form-item>
-            <el-form-item label="方差：">
-                <el-input style="width: 120px;" v-model="formInline.user" clearable />
-            </el-form-item>
-            <el-form-item label="峰度：">
-                <el-input style="width: 120px;" v-model="formInline.user" clearable />
-            </el-form-item>
-            <el-form-item label="标准误差：">
-                <el-input style="width: 120px;" v-model="formInline.user" clearable />
-            </el-form-item>
-            <el-form-item label="偏度：">
-                <el-input style="width: 120px;" v-model="formInline.user" clearable />
-            </el-form-item>
-            <el-form-item label="最大值：">
-                <el-input style="width: 120px;" v-model="formInline.user" clearable />
-            </el-form-item>
-            <el-form-item label="最小值：">
-                <el-input style="width: 120px;" v-model="formInline.user" clearable />
-            </el-form-item>
-            <el-form-item label="求和：">
-                <el-input style="width: 120px;" v-model="formInline.user" clearable />
-            </el-form-item>
-            <el-form-item label="观测数：">
-                <el-input style="width: 120px;" v-model="formInline.user" clearable />
-            </el-form-item>
-        </el-form>
+      <el-form :inline="true" label-position="right" label-width="84px" :model="form" class="demo-form-inline">
+        <el-form-item label="平均数：">
+          <el-input style="width: 120px" v-model="formInline.user" clearable />
+        </el-form-item>
+        <el-form-item label="众数：">
+          <el-input style="width: 120px" v-model="formInline.user" clearable />
+        </el-form-item>
+        <el-form-item label="中位数：">
+          <el-input style="width: 120px" v-model="formInline.user" clearable />
+        </el-form-item>
+        <el-form-item label="标准差：">
+          <el-input style="width: 120px" v-model="formInline.user" clearable />
+        </el-form-item>
+        <el-form-item label="方差：">
+          <el-input style="width: 120px" v-model="formInline.user" clearable />
+        </el-form-item>
+        <el-form-item label="峰度：">
+          <el-input style="width: 120px" v-model="formInline.user" clearable />
+        </el-form-item>
+        <el-form-item label="标准误差：">
+          <el-input style="width: 120px" v-model="formInline.user" clearable />
+        </el-form-item>
+        <el-form-item label="偏度：">
+          <el-input style="width: 120px" v-model="formInline.user" clearable />
+        </el-form-item>
+        <el-form-item label="最大值：">
+          <el-input style="width: 120px" v-model="formInline.user" clearable />
+        </el-form-item>
+        <el-form-item label="最小值：">
+          <el-input style="width: 120px" v-model="formInline.user" clearable />
+        </el-form-item>
+        <el-form-item label="求和：">
+          <el-input style="width: 120px" v-model="formInline.user" clearable />
+        </el-form-item>
+        <el-form-item label="观测数：">
+          <el-input style="width: 120px" v-model="formInline.user" clearable />
+        </el-form-item>
+      </el-form>
     </div>
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="dialogVisible = false">确定</el-button>
-        <el-button type="primary" @click="dialogVisible = false">
-          返回
-        </el-button>
+        <el-button type="primary" @click="dialogVisible = false">返回</el-button>
       </div>
     </template>
   </el-dialog>
 </template>
 
 <script setup>
-const dialogVisible=ref(false)
-const tableLabel=reactive([
-    {prop:'date',label:'用户ID'},
-    {prop:'name',label:'登录名'},
-    {prop:'name',label:'用户姓名'},
-    {prop:'name',label:'学号'},
-    {prop:'name',label:'班级'},
-    {prop:'name',label:'专业'},
-    {prop:'name',label:'学校'},
-    {prop:'name',label:'角色名称'},
-    {prop:'name',label:'角色性别'},
-    {prop:'name',label:'角色年龄'},
-    {prop:'name',label:'注册时间'},
-    {prop:'name',label:'所在地'}
-])
-const formInline=reactive({
-    user:'',
-    region:''
-})
-const input=ref()
-const options = [
+import * as API from "@/api/AI.js";
+
+import * as marketingAlgorithmApi from "@/api/marketing-algorithm.js";
+import useAlgorithmStore from "@/store/modules/algorithm.js";
+import useUserStore from "@/store/modules/user";
+import { onMounted, ref } from "vue";
+const userStore = useUserStore();
+const algorithmStore = useAlgorithmStore();
+const n_dataTableQuery = ref({
+  index: 1,
+  size: 20,
+  tableName: "用户属性表",
+  userId: userStore.userInfo.userId,
+});
+const dialogVisible = ref(false);
+// 模型参数
+const modelParams = reactive([
   {
-    value: 'Option1',
-    label: 'Option1',
+    name: "平均数",
   },
   {
-    value: 'Option2',
-    label: 'Option2',
+    name: "中位数",
   },
   {
-    value: 'Option3',
-    label: 'Option3',
+    name: "众数",
   },
   {
-    value: 'Option4',
-    label: 'Option4',
+    name: "标准差",
   },
   {
-    value: 'Option5',
-    label: 'Option5',
+    name: "方差",
   },
-]
-const taskSubmit=()=>{
-    dialogVisible.value=true
-}
+  {
+    name: "标准误差",
+  },
+  {
+    name: "峰度;",
+  },
+  {
+    name: "偏度",
+  },
+  {
+    name: "最大值",
+  },
+  {
+    name: "最小值",
+  },
+  {
+    name: "求和",
+  },
+  {
+    name: "观测数",
+  },
+]);
+const analysisData = ref([]);
+const analysisHanderKry = ref([]);
+const tableLabel = reactive([
+  { prop: "date", label: "用户ID" },
+  { prop: "name", label: "登录名" },
+  { prop: "name", label: "用户姓名" },
+  { prop: "name", label: "学号" },
+  { prop: "name", label: "班级" },
+  { prop: "name", label: "专业" },
+  { prop: "name", label: "学校" },
+  { prop: "name", label: "角色名称" },
+  { prop: "name", label: "角色性别" },
+  { prop: "name", label: "角色年龄" },
+  { prop: "name", label: "注册时间" },
+  { prop: "name", label: "所在地" },
+]);
+const formInline = ref({});
+const input = ref();
+const g_indicatorData = ref([]);
+const preProcessText = ref({
+  text1: "数据去重",
+  text2: "",
+});
+// 模型参数
+const g_modelParameter = ref([]);
+// 预处理
+const preProcess = (tetx) => {
+  API.dataPreprocessing({
+    mapList: analysisData.value,
+    method: preProcessText.value.text2,
+    userId: n_dataTableQuery.value.userId,
+  }).then((res) => {
+    analysisData.value = res.data;
+  });
+};
+// 提交
+const taskSubmit = () => {
+  dialogVisible.value = true;
+};
 const tableData = [
   {
-    date: '2016-05-03',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
+    date: "2016-05-03",
+    name: "Tom",
+    address: "No. 189, Grove St, Los Angeles",
   },
   {
-    date: '2016-05-02',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
+    date: "2016-05-02",
+    name: "Tom",
+    address: "No. 189, Grove St, Los Angeles",
   },
   {
-    date: '2016-05-04',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
+    date: "2016-05-04",
+    name: "Tom",
+    address: "No. 189, Grove St, Los Angeles",
   },
-{
-    date: '2016-05-04',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },{
-    date: '2016-05-04',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },{
-    date: '2016-05-04',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },{
-    date: '2016-05-04',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },{
-    date: '2016-05-04',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },{
-    date: '2016-05-04',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },{
-    date: '2016-05-04',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },{
-    date: '2016-05-04',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },{
-    date: '2016-05-04',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
+  {
+    date: "2016-05-01",
+    name: "Tom",
+    address: "No. 189, Grove St, Los Angeles",
   },
-]
-const headerCellStyle=()=>{
-     return {
+];
+const headerCellStyle = () => {
+  return {
     backgroundColor: "#1882DE !important", // 设置表头背景颜色
     color: "#ffffff !important",
   };
+};
+// 选择指标
+const selectType = (type) => {
+  n_dataTableQuery.value.tableName = type;
+  getIndicator();
+};
+// 选择数据
+const handleSelectionChange = (type) => {
+  g_indicatorData.value = type.map((item) => item.label);
+};
+// 提交指標
+const submit = () => {
+  marketingAlgorithmApi.getMarketingAlgorithm({ userId: n_dataTableQuery.value.userId, tableName: n_dataTableQuery.value.tableName, fieldList: g_indicatorData.value }).then((res) => {
+    analysisData.value = res.data;
+    analysisHanderKry.value = Object.keys(res.data[0]);
+  });
+};
+// 选择模型
+const handlemodelSelectionChange = (type) => {
+  g_modelParameter.value = type.map((item) => item.name);
+};
+//计算
+const modelCalculation = () => {
+  const processedData = processArrayData(analysisHanderKry.value, analysisData.value);
+  marketingAlgorithmApi.getMarketingAlgorithmPreprocessing(JSON.stringify({ map: processedData, statistic: g_modelParameter.value, userId: n_dataTableQuery.value.userId }));
+};
+function processArrayData(keys, data) {
+  // 创建结果对象
+  const result = {};
+
+  // 遍历每个键
+  keys.forEach((key) => {
+    // 为每个键创建一个数组，包含 data 数组中该键的所有值
+    const values = data.map((item) => item[key]);
+    // 将键和对应的值数组添加到结果对象中
+    result[key] = values;
+  });
+
+  return result;
 }
+onMounted(() => {
+  getIndicator();
+});
+// 获取指标
+const getIndicator = () => {
+  algorithmStore.getUserDatabase({ userId: n_dataTableQuery.value.userId, tableName: n_dataTableQuery.value.tableName });
+};
 </script>
 
 <style lang="scss" scoped>
 .main-top {
-margin: 20px 20px 0;
+  margin: 20px 20px 0;
   margin-top: 10px;
   height: 85px;
   background: #001d40;
   border: 1px solid #0452c6;
   padding: 5px 20px;
 }
-.main-but{
-    margin: 5px 20px 0;
-    display: flex;
-    .el-button:nth-child(1) {
-        width: 180px;
-        height: 56px;
-        background: url('../../../assets/images/011.png');
-        color:#FFFFFF;
-        border-color:#FFFFFF00;
-      }
-      .el-button:nth-child(2) {
-        width: 180px;
-        height: 56px;
-        background: url('../../../assets/images/022.png');
-        color:#FFFFFF;
-        border-color:#FFFFFF00;
-      }
+.main-but {
+  margin: 5px 20px 0;
+  display: flex;
+  .el-button:nth-child(1) {
+    width: 180px;
+    height: 56px;
+    background: url("../../../assets/images/011.png");
+    color: #ffffff;
+    border-color: #ffffff00;
+  }
+  .el-button:nth-child(2) {
+    width: 180px;
+    height: 56px;
+    background: url("../../../assets/images/022.png");
+    color: #ffffff;
+    border-color: #ffffff00;
+  }
 }
 .app-main {
   //   background-color: #f5f5f5;
@@ -317,118 +362,118 @@ margin: 20px 20px 0;
         color: #3596eb;
       }
     }
-    .metrics-table{
-        .el-button {
+    .metrics-table {
+      .el-button {
         width: 149px;
         height: 48px;
-        background: url('../../../assets/images/确定.png');
-        color:#FFFFFF;
-        border-color:#FFFFFF00;
+        background: url("../../../assets/images/确定.png");
+        color: #ffffff;
+        border-color: #ffffff00;
         background-size: 100% 100%;
         margin: 15px;
       }
     }
-    .startOver{
-        margin-left: -10px;
-        width: 205px;
-        height: 55px;
-        background: #00F4FF;
-        //水平居中
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        cursor: pointer;
+    .startOver {
+      margin-left: -10px;
+      width: 205px;
+      height: 55px;
+      background: #00f4ff;
+      //水平居中
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      cursor: pointer;
     }
     :deep(.el-table) {
-    --el-table-row-hover-bg-color:#002651 !important;
-    --el-table-border-color: #7AC1FF;
-  .el-table__row{
-    background-color: #002652 !important;
-    color: #E6E6E6;
-  }
-}
+      --el-table-row-hover-bg-color: #002651 !important;
+      --el-table-border-color: #7ac1ff;
+      .el-table__row {
+        background-color: #002652 !important;
+        color: #e6e6e6;
+      }
+    }
   }
   .main-right {
     width: 1639px;
     // height: 100%;
     padding: 20px;
     border: 1px solid #0452c6;
-    :deep(.el-table__header){
-    .el-table__cell{
-            background:linear-gradient(0deg, #5304BE 0%, #9126FE 100%) !important;
-        }
+    :deep(.el-table__header) {
+      .el-table__cell {
+        background: linear-gradient(0deg, #5304be 0%, #9126fe 100%) !important;
+      }
     }
     :deep(.el-table) {
-        --el-table-row-hover-bg-color:#002651 !important;
-        --el-table-border-color: #002651;
-        --el-table-bg-color:#FFFFFF00;
-    .el-table__row{
+      --el-table-row-hover-bg-color: #002651 !important;
+      --el-table-border-color: #002651;
+      --el-table-bg-color: #ffffff00;
+      .el-table__row {
         background-color: #002652 !important;
-        color: #E6E6E6;
-    }
+        color: #e6e6e6;
+      }
     }
   }
-  .metrics{
-        :deep(.el-input){
-            .el-input__wrapper{
-                background-color:#FFFFFF00;
-                background-image:url('../../../assets/images/下拉框.png');
-                background-size: 100% 100%;
-            }
-            --el-input-text-color:#FFFFFF;
-            --el-input-border-color:#FFFFFF00;
-            --el-input-hover-border-color:#FFFFFF00;
-            --el-input-hover-border:#FFFFFF00;
-            --el-select-border-color-hover:#FFFFFF00;
-            --el-select-input-focus-border-color:#FFFFFF00;
-            --el-input-placeholder-color:#FFFFFF;
-            .el-input__inner{
-                color:#FFFFFF;
-            }
-        }
+  .metrics {
+    :deep(.el-input) {
+      .el-input__wrapper {
+        background-color: #ffffff00;
+        background-image: url("../../../assets/images/下拉框.png");
+        background-size: 100% 100%;
+      }
+      --el-input-text-color: #ffffff;
+      --el-input-border-color: #ffffff00;
+      --el-input-hover-border-color: #ffffff00;
+      --el-input-hover-border: #ffffff00;
+      --el-select-border-color-hover: #ffffff00;
+      --el-select-input-focus-border-color: #ffffff00;
+      --el-input-placeholder-color: #ffffff;
+      .el-input__inner {
+        color: #ffffff;
+      }
     }
+  }
 }
-.analysisResults{
-    .el-button {
-        width: 89px;
-        height: 31px;
-        background: url('../../../assets/images/下载.png');
-        color:black;
-        border-color:#FFFFFF00;
-        // background-size: 100% 100%;
-        margin: 15px 0px 5px;
-      }
+.analysisResults {
+  .el-button {
+    width: 89px;
+    height: 31px;
+    background: url("../../../assets/images/下载.png");
+    color: black;
+    border-color: #ffffff00;
+    // background-size: 100% 100%;
+    margin: 15px 0px 5px;
+  }
 }
-:deep(.el-form-item__label){
-    color: #FFFFFF;;
+:deep(.el-form-item__label) {
+  color: #ffffff;
 }
-.from-item{
-    padding: 20px;
-    .el-input{
-        --el-input-text-color:#FFFFFF;
-        --el-input-bg-color:#002651;
-        --el-input-border-color:#67B3D6;
-    }
+.from-item {
+  padding: 20px;
+  .el-input {
+    --el-input-text-color: #ffffff;
+    --el-input-bg-color: #002651;
+    --el-input-border-color: #67b3d6;
+  }
 }
-.dialog-footer{
-    margin-bottom: 20px;
+.dialog-footer {
+  margin-bottom: 20px;
 }
 </style>
 <style lang="scss">
-.el-dialog{
-    background:url('../../../assets/images/弹框.png') !important;
-    background-size: 100% 100% !important;
-    .el-dialog__header{
-        padding: 5px 0px;
-        margin-right: 5px !important;
-        .gbImg{
-            cursor: pointer;
-            width: 51px;
-            height: 31px;
-            background-size: 100% 100%;
-        }
+.el-dialog {
+  background: url("../../../assets/images/弹框.png") !important;
+  background-size: 100% 100% !important;
+  .el-dialog__header {
+    padding: 5px 0px;
+    margin-right: 5px !important;
+    .gbImg {
+      cursor: pointer;
+      width: 51px;
+      height: 31px;
+      background-size: 100% 100%;
     }
-    .xtImg{
+  }
+  .xtImg {
     margin-left: 18px;
     width: 530px;
   }
@@ -439,9 +484,12 @@ margin: 20px 20px 0;
   justify-content: space-between;
   gap: 16px;
   text-align: center;
-  span{
-    color: #FFFFFF;
+  span {
+    color: #ffffff;
     padding: 38px 20px 0;
   }
 }
-</style>
\ No newline at end of file
+.el-table__body-wrapper {
+  // background: #020620 !important;
+}
+</style>
diff --git a/src/views/digitalMarketingAlgorithms/index.vue b/src/views/digitalMarketingAlgorithms/index.vue
index 22e73f1..c66cfd4 100644
--- a/src/views/digitalMarketingAlgorithms/index.vue
+++ b/src/views/digitalMarketingAlgorithms/index.vue
@@ -1,9 +1,9 @@
 <template>
-    <div class="rgzn_top">
+    <div class="rgzn_top app-container">
       <div class="top_item">
-        <el-button :class="{'active':isActive===1}" @click="activeIndex(1)">大数据</el-button>
-        <el-button :class="{'active':isActive===2}" @click="activeIndex(2)">人工智能</el-button>
-        <el-button :class="{'active':isActive===3}" @click="activeIndex(3)">AIGC大模型</el-button>
+        <el-button :class="{'active':isActive===1}" @click="activeIndex(1)">用户数据库</el-button>
+        <el-button :class="{'active':isActive===2}" @click="activeIndex(2)">描述性统计</el-button>
+        <el-button :class="{'active':isActive===3}" @click="activeIndex(3)">聚类分析</el-button>
         <el-button :class="{'active':isActive===4}" @click="activeIndex(4)">关联规则挖掘</el-button>
         <el-button :class="{'active':isActive===5}" @click="activeIndex(5)">回归分析</el-button>
         <el-button :class="{'active':isActive===6}" @click="activeIndex(6)">情感分析/文本挖掘</el-button>
@@ -34,6 +34,7 @@
       color: #fff;
   }
   .rgzn_top{
+    margin-top: 20px;
     .top_item{
       img{
         margin-right: 5px;
diff --git a/src/views/index.vue b/src/views/index.vue
index 85b8271..ec400ee 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="content">
+  <div class="content app-container">
     <div class="title">
       <img src="@/assets/images/indexTopTitle.png" alt="" />
     </div>
diff --git a/src/views/learningCenter/Achievement.vue b/src/views/learningCenter/Achievement.vue
index 0daa822..1faff6d 100644
--- a/src/views/learningCenter/Achievement.vue
+++ b/src/views/learningCenter/Achievement.vue
@@ -1,265 +1,183 @@
 <template>
-   <div class="app-container">
-     <div class="study_main">
-       <div class="study_main_up">
-         <div class="study_main_up_top">
-           <div class="study_main_up_left">
-             <img src="../../assets/icons/svg/score.svg" />
-             <span style="color:#FFFFFF">得分情况</span>
-           </div>
-           <el-button type="primary" :icon="Refresh" round @click="updateReportGrade">更新</el-button>
-         </div>
-         <div class="study_main_up_foot">
-           <el-table
-             :data="tableData4"
-             :span-method="tableSpanMethod"
-             stripe
-             border
-             :header-cell-style="{background: '#A2C9FF'}"
-             
-             style="width: 100%"
-           >
-           <el-table-column prop="sid" label="序号" width="80" align="center" />
-            <el-table-column
-              prop="learningProjects"
-              label="学习项目"
-              align="center"
-            />
-            <el-table-column
-              prop="assessmentItems"
-              label="考核项目"
-              width="150"
-              align="center"
-            />
-            <el-table-column
-              prop="scoringCriteria"
-              label="计分标准"
-              width="314"
-              align="center"
-            />
-            <el-table-column
-              prop="totalScore"
-              label="总分"
-              width="129"
-              align="center"
-            />
-            <el-table-column
-              prop="scoreWeight"
-              label="成绩权重"
-              width="129"
-              align="center"
-            />
-            <el-table-column
-              prop="completionStatus"
-              label="完成情况"
-              width="225"
-              align="center"
-            />
-            <el-table-column
-              prop="schedule"
-              label="进度"
-              align="center"
-            />
-            <el-table-column
-              prop="scoreProject"
-              label="得分"
-              width="131"
-              align="center"
-            />
-           </el-table>
-         </div>
-       </div>
-       <div class="study_main_but">
-         <div class="study_main_but_left">
-           <img src="../../assets/icons/svg/sxbg.svg" />
-           <span style="color:#FFFFFF">实训报告</span>
-         </div>
-         <!-- action="http://qkljr.sztzjy.com:90/api/stu/concept/block/upload" -->
-       
-         <el-upload
-           ref="uploadRef"
-           class="upload-demo"
-           :file-list="fileList"
-           :auto-upload="false"
-           :on-change="handleChange"
-           :show-file-list="false"
-           multiple="multiple"
-         >
-           <template #trigger>
-             <el-button color="#626aef" round ><el-icon><UploadFilled /></el-icon>点击上传</el-button>
-           </template>
-           <!-- <div class="reportPromptFile" v-html="item[`${index}`].path"></div> -->
-         </el-upload>
-         <div class="study_main_but_foot">
-             <el-table
-             :data="tableData2"
-             stripe
-             style="width: 100%"
-             border
-             :header-cell-style="{background: '#A2C9FF'}"
-           >
-           <el-table-column
-               prop="reportName"
-               label="报告名称"
-               width="289"
-               align="center"
-             />
-             <el-table-column
-               prop="uploadTime"
-               label="上传时间"
-               width="289"
-               align="center"
-             />
-             <el-table-column
-               prop="size"
-               label="文件大小"
-               width="290"
-               align="center"
-             />
-             <el-table-column
-               prop="rating"
-               label="评分"
-               width="289"
-               align="center"
-             />
-             <el-table-column
-               label="操作"
-               class="controls"
-               width="286"
-               align="center"
-             >
-             <el-link type="success" @click="uploadReport"><el-icon><Download /></el-icon>下载</el-link>
-             <el-link type="warning" @click="showComments"><el-icon><Tickets /></el-icon>查看评语</el-link>
-             </el-table-column>
-             </el-table>
-         </div>
-       </div>
-     </div>
-   </div>
- 
-   <el-dialog
-     v-model="dialogVisible"
-     title="评语"
-     width="30%"
-     :before-close="handleClose"
-   >
-     <span>{{tableData2[0].teacherComments}}</span>
-     <template #footer>
-       <span class="dialog-footer">
-         <el-button @click="dialogVisible = false">确定</el-button>
-         <!-- <el-button type="primary" @click="dialogVisible = false">
+  <div class="app-container">
+    <div class="study_main">
+      <div class="study_main_up">
+        <div class="study_main_up_top">
+          <div class="study_main_up_left">
+            <img src="../../assets/icons/svg/score.svg" />
+            <span style="color: #ffffff">得分情况</span>
+          </div>
+          <el-button type="primary" :icon="Refresh" round @click="updateReportGrade">更新</el-button>
+        </div>
+        <div class="study_main_up_foot">
+          <el-table :data="tableData4" :span-method="tableSpanMethod" stripe border :header-cell-style="{ background: '#A2C9FF' }" style="width: 100%">
+            <el-table-column prop="sid" label="序号" width="80" align="center" />
+            <el-table-column prop="learningProjects" label="学习项目" align="center" />
+            <el-table-column prop="assessmentItems" label="考核项目" width="150" align="center" />
+            <el-table-column prop="scoringCriteria" label="计分标准" width="314" align="center" />
+            <el-table-column prop="totalScore" label="总分" width="129" align="center" />
+            <el-table-column prop="scoreWeight" label="成绩权重" width="129" align="center" />
+            <el-table-column prop="completionStatus" label="完成情况" width="225" align="center" />
+            <el-table-column prop="schedule" label="进度" align="center" />
+            <el-table-column prop="scoreProject" label="得分" width="131" align="center" />
+          </el-table>
+        </div>
+      </div>
+      <div class="study_main_but">
+        <div class="study_main_but_left">
+          <img src="../../assets/icons/svg/sxbg.svg" />
+          <span style="color: #ffffff">实训报告</span>
+        </div>
+        <!-- action="http://qkljr.sztzjy.com:90/api/stu/concept/block/upload" -->
+
+        <el-upload ref="uploadRef" class="upload-demo" :file-list="fileList" :auto-upload="false" :on-change="handleChange" :show-file-list="false" multiple="multiple">
+          <template #trigger>
+            <el-button color="#626aef" round>
+              <el-icon><UploadFilled /></el-icon>
+              点击上传
+            </el-button>
+          </template>
+          <!-- <div class="reportPromptFile" v-html="item[`${index}`].path"></div> -->
+        </el-upload>
+        <div class="study_main_but_foot">
+          <el-table :data="tableData2" stripe style="width: 100%" border :header-cell-style="{ background: '#A2C9FF' }">
+            <el-table-column prop="reportName" label="报告名称" width="289" align="center" />
+            <el-table-column prop="uploadTime" label="上传时间" width="289" align="center" />
+            <el-table-column prop="size" label="文件大小" width="290" align="center" />
+            <el-table-column prop="rating" label="评分" width="289" align="center" />
+            <el-table-column label="操作" class="controls" width="286" align="center">
+              <el-link type="success" @click="uploadReport">
+                <el-icon><Download /></el-icon>
+                下载
+              </el-link>
+              <el-link type="warning" @click="showComments">
+                <el-icon><Tickets /></el-icon>
+                查看评语
+              </el-link>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <el-dialog v-model="dialogVisible" title="评语" width="30%" :before-close="handleClose">
+    <span>{{ tableData2[0].teacherComments }}</span>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="dialogVisible = false">确定</el-button>
+        <!-- <el-button type="primary" @click="dialogVisible = false">
            Confirm
          </el-button> -->
-       </span>
-     </template>
-   </el-dialog>
- </template>
- <script setup>
- import { Refresh } from "@element-plus/icons-vue";
- import { onMounted, ref } from "vue";
- import * as API from "@/api/prtrait/prtrait.js" 
+      </span>
+    </template>
+  </el-dialog>
+</template>
+<script setup>
+import { Refresh } from "@element-plus/icons-vue";
+import { onMounted, ref } from "vue";
+import * as API from "@/api/prtrait/prtrait.js";
 //  import {Base64} from 'js-base64'
 //  import { useRouter } from "vue-router";
- import {download} from '@/utils/request.js'
- import { getToken,getUserInfo } from '@/utils/auth'
- import { ElMessage } from "element-plus";
- 
+import { download } from "@/utils/request.js";
+import { getToken, getUserInfo } from "@/utils/auth";
+import { ElMessage } from "element-plus";
+
 //  const router=useRouter();
- //评语弹窗
- const dialogVisible = ref(false)
- 
- const tableSpanMethod = computed(() => {
-   // if (tableData.value.length >= 5) {
-     if (tableData4.value.length >= 6) {
-     return arraySpanMethod;
-   }
-   return null;
- });
- const arraySpanMethod = ({ row, column, rowIndex, columnIndex }) => {
-   if (rowIndex === tableData4.value.length - 1) {
-     if (columnIndex === 0) {
-       return [1, 5];
-     } else if (columnIndex === 1) {
-       return [0, 0];
-     }
-   }
- };
- const tableData2 =ref([])
- const tableData=ref([])
- const tableData4=ref([
-   {
-     sid:1,
-     assessmentItems:"阅读知识",
-     learningProjects:"知识概要",
-     scoreProject:null,
-     scoreWeight:null,
-     scoringCriteria:"",
-     schedule:'0%',
-     totalScore:100
-   },
-   {
-     sid:2,
-     assessmentItems:"观看资源",
-     learningProjects:"资源学习",
-     scoreProject:null,
-     scoreWeight:null,
-     scoringCriteria:"",
-     schedule:'0%',
-     totalScore:100
-   },
-   {
-     sid:3,
-     assessmentItems:"客观题测试",
-     learningProjects:"学习测评",
-     scoreProject:null,
-     scoreWeight:null,
-     scoringCriteria:"",
-     schedule:'0%',
-     totalScore:100
-   },
-   {
-     sid:4,
-     assessmentItems:"输错/选错次数",
-     learningProjects:"实验实训",
-     scoreProject:null,
-     scoreWeight:null,
-     scoringCriteria:"",
-     schedule:'0%',
-     totalScore:100
-   },
-   {
-     sid:5,
-     assessmentItems:"",
-     learningProjects:"实训报告",
-     scoreProject:null,
-     scoreWeight:null,
-     scoringCriteria:"",
-     schedule:'0%',
-     totalScore:100
-   },
- ])
- const calculateAverageScore=()=>{
-   
-   // 计算每个对象的权重乘以得分，并存储在一个新数组中
- const weightedScores = tableData4.value.map(item => {
-   if(item.scoreProject!==null){
-   // 解析权重字符串，去掉百分号并转换为数字
-   const weight = parseFloat(item.scoreWeight.replace('%', ''))/100;
-   // 解析得分字符串并转换为数字
-   const score = parseFloat(item.scoreProject);
-   // 计算权重乘以得分
-   const weightedScore = weight * score;
-   return weightedScore;
-   }
-   return 0
- });
- 
- // 使用 reduce 方法计算新数组中所有元素的总和
- const totalWeightedScore = weightedScores.reduce((acc, curr) => acc + curr, 0);
- // 最终结果是总和乘以5
- const finalResult = totalWeightedScore;
- const finalResult1=String(finalResult.toFixed())
- const newData = {
+//评语弹窗
+const dialogVisible = ref(false);
+
+const tableSpanMethod = computed(() => {
+  // if (tableData.value.length >= 5) {
+  if (tableData4.value.length >= 6) {
+    return arraySpanMethod;
+  }
+  return null;
+});
+const arraySpanMethod = ({ row, column, rowIndex, columnIndex }) => {
+  if (rowIndex === tableData4.value.length - 1) {
+    if (columnIndex === 0) {
+      return [1, 5];
+    } else if (columnIndex === 1) {
+      return [0, 0];
+    }
+  }
+};
+const tableData2 = ref([]);
+const tableData = ref([]);
+const tableData4 = ref([
+  {
+    sid: 1,
+    assessmentItems: "阅读知识",
+    learningProjects: "知识概要",
+    scoreProject: null,
+    scoreWeight: null,
+    scoringCriteria: "",
+    schedule: "0%",
+    totalScore: 100,
+  },
+  {
+    sid: 2,
+    assessmentItems: "观看资源",
+    learningProjects: "资源学习",
+    scoreProject: null,
+    scoreWeight: null,
+    scoringCriteria: "",
+    schedule: "0%",
+    totalScore: 100,
+  },
+  {
+    sid: 3,
+    assessmentItems: "客观题测试",
+    learningProjects: "学习测评",
+    scoreProject: null,
+    scoreWeight: null,
+    scoringCriteria: "",
+    schedule: "0%",
+    totalScore: 100,
+  },
+  {
+    sid: 4,
+    assessmentItems: "输错/选错次数",
+    learningProjects: "实验实训",
+    scoreProject: null,
+    scoreWeight: null,
+    scoringCriteria: "",
+    schedule: "0%",
+    totalScore: 100,
+  },
+  {
+    sid: 5,
+    assessmentItems: "",
+    learningProjects: "实训报告",
+    scoreProject: null,
+    scoreWeight: null,
+    scoringCriteria: "",
+    schedule: "0%",
+    totalScore: 100,
+  },
+]);
+const calculateAverageScore = () => {
+  // 计算每个对象的权重乘以得分，并存储在一个新数组中
+  const weightedScores = tableData4.value.map((item) => {
+    if (item.scoreProject !== null) {
+      // 解析权重字符串，去掉百分号并转换为数字
+      const weight = parseFloat(item.scoreWeight.replace("%", "")) / 100;
+      // 解析得分字符串并转换为数字
+      const score = parseFloat(item.scoreProject);
+      // 计算权重乘以得分
+      const weightedScore = weight * score;
+      return weightedScore;
+    }
+    return 0;
+  });
+
+  // 使用 reduce 方法计算新数组中所有元素的总和
+  const totalWeightedScore = weightedScores.reduce((acc, curr) => acc + curr, 0);
+  // 最终结果是总和乘以5
+  const finalResult = totalWeightedScore;
+  const finalResult1 = String(finalResult.toFixed());
+  const newData = {
     sid: "合计",
     project: "",
     assessmentItems: "100%",
@@ -268,247 +186,241 @@
     weight: "",
     condition: "",
     score: "",
-  }
-   tableData4.value.push(newData)
- }
- const fileList=ref([])
- const data=ref({
-   "ascription":'',
-   "userId":JSON.parse(getUserInfo()).userId,
-   "schoolId":JSON.parse(getUserInfo()).schoolId
- })
- const handleChange =(info)=> {
-       fileList.value.push(info);
-       let formData2 = new FormData();
-       formData2.append("file", fileList.value[0].raw)
-       formData2.append("stuBlockProduct", JSON.stringify(data.value))
-       fileList.value.splice(0, fileList.value.length);
-       API.uploadTrainingReport(formData2).then(()=>{
-         getReports()
-       })
-     }
- const uploadRef = ref(null);
- 
- const getReports=()=>{
-      API.getDetailsTrainingReport(data.value).then((res)=>{
-         tableData2.value.splice(0, tableData2.value.length);
-         if(res.data!==null){
-            tableData2.value.push(res.data)
-            tableData2.value[0].size=tableData2.value[0].size+"kb"
-         }
-      })
- }
- 
- const data2={
-   "userId":JSON.parse(getUserInfo()).userId,
-   "TOKEN":'Bearer '+getToken()
- }
- //下载
- const uploadReport=async()=>{
+  };
+  tableData4.value.push(newData);
+};
+const fileList = ref([]);
+const data = ref({
+  ascription: "",
+  userId: JSON.parse(getUserInfo()).userId,
+  schoolId: JSON.parse(getUserInfo()).schoolId,
+});
+const handleChange = (info) => {
+  fileList.value.push(info);
+  let formData2 = new FormData();
+  formData2.append("file", fileList.value[0].raw);
+  formData2.append("stuBlockProduct", JSON.stringify(data.value));
+  fileList.value.splice(0, fileList.value.length);
+  API.uploadTrainingReport(formData2).then(() => {
+    getReports();
+  });
+};
+const uploadRef = ref(null);
+
+const getReports = () => {
+  API.getDetailsTrainingReport(data.value).then((res) => {
+    tableData2.value.splice(0, tableData2.value.length);
+    if (res.data !== null) {
+      tableData2.value.push(res.data);
+      tableData2.value[0].size = tableData2.value[0].size + "kb";
+    }
+  });
+};
 
-   window.open(`http://118.31.7.2:7899/api/stu/concept/block/download?TOKEN= ${'Bearer '+getToken()}&userId=${data2.userId}`)
-   // window.open(`http://202.97.179.126:8800/api/stu/concept/block/download?reportName=${tableData2.value[0].reportName}&TOKEN= ${'Bearer '+getToken()}&module=${data2.module}&userId=${data.userId}`)
-   // window.open(`http://202.199.90.115:8800/api/stu/concept/block/download?reportName=${tableData2.value[0].reportName}&TOKEN= ${'Bearer '+getToken()}&module=${data2.module}&userId=${data.userId}`)
- }
- const isUpdate=ref(false)
- //查看评语
- const showComments=()=>{
-   if(tableData2.value.length<=0){
-     ElMessage({
-         message: "暂无评语",
-         type: "warning",
-       });
-     return 
-   }
-   dialogVisible.value=true
- }
- onMounted(()=>{
+const data2 = {
+  userId: JSON.parse(getUserInfo()).userId,
+  TOKEN: "Bearer " + getToken(),
+};
+//下载
+const uploadReport = async () => {
+  window.open(`http://118.31.7.2:7899/api/stu/concept/block/download?TOKEN= ${"Bearer " + getToken()}&userId=${data2.userId}`);
+  // window.open(`http://202.97.179.126:8800/api/stu/concept/block/download?reportName=${tableData2.value[0].reportName}&TOKEN= ${'Bearer '+getToken()}&module=${data2.module}&userId=${data.userId}`)
+  // window.open(`http://202.199.90.115:8800/api/stu/concept/block/download?reportName=${tableData2.value[0].reportName}&TOKEN= ${'Bearer '+getToken()}&module=${data2.module}&userId=${data.userId}`)
+};
+const isUpdate = ref(false);
+//查看评语
+const showComments = () => {
+  if (tableData2.value.length <= 0) {
+    ElMessage({
+      message: "暂无评语",
+      type: "warning",
+    });
+    return;
+  }
+  dialogVisible.value = true;
+};
+onMounted(() => {
   //  data.value.module='数字营销'
-   setTimeout(() => {
-    cerateGrade()
- }, 300);
-   
-   setTimeout(() => {
-      getReports()
- }, 600);
- })
- const cerateGrade=()=>{
-      API.academicRecordEnquiry(data.value).then((res)=>{
-         let currentId =1
-       const tableData3 = res.data.map(item => {
-         const weight1 = parseInt(item.scoreWeight*100)
-         const weight2 = `${weight1}%`;
-         if(item.learningProjects==="知识概要"){
-           const score=parseFloat(item.scoringCriteria)
-           const time = reactive({value: '/'});
-           if(item.completionStatus!==null){
-             time.value=parseFloat(item.completionStatus)
-           }
-          tableData4.value[0].scoringCriteria=`阅读1分钟得${score}分,1分钟以下不得分`
-          tableData4.value[0].completionStatus=`阅读${time.value}分钟`
-          tableData4.value[0].scoreProject=item.scoreProject
-          tableData4.value[0].scoreWeight=weight2
-          tableData4.value[0].schedule=item.schedule+'%'
-         }
-         if(item.learningProjects==="实验实训"){
-           const score=parseFloat(item.scoringCriteria)
-           const time = reactive({value: '/'});
-           if(item.completionStatus!==null){
-             time.value=parseFloat(item.completionStatus)
-           }
-           tableData4.value[3].scoringCriteria=`输错/选错次数扣${score}分`
-           tableData4.value[3].completionStatus=`输错/选错 ${time.value}次`
-           tableData4.value[3].scoreProject=item.scoreProject
-           tableData4.value[3].scoreWeight=weight2
-           tableData4.value[3].schedule=item.schedule+'%'
-         }
-         if(item.learningProjects==="资源学习"){
-           const score=parseFloat(item.scoringCriteria)
-           const time = reactive({value: '/'});
-           if(item.completionStatus!==null){
-             time.value=parseFloat(item.completionStatus)
-           }
-           tableData4.value[1].scoringCriteria=`观看资源1分钟得${score}分`
-           tableData4.value[1].completionStatus=`观看${time.value}分钟`
-           tableData4.value[1].scoreProject=item.scoreProject
-           tableData4.value[1].scoreWeight=weight2
-           tableData4.value[1].schedule=item.schedule+'%'
-         }
-         if(item.learningProjects==="学习测评"){
-           const time = reactive({value: '/'});
-           if(item.completionStatus!==null){
-             time.value=parseFloat(item.completionStatus)
-           }
-           const score=parseFloat(item.scoringCriteria)
-           tableData4.value[2].scoringCriteria=`${score}分/道`
-           tableData4.value[2].completionStatus=`错${time.value}道`
-           tableData4.value[2].scoreProject=item.scoreProject
-           tableData4.value[2].scoreWeight=weight2
-           tableData4.value[2].schedule=item.schedule+'%'
-         }
-         if(item.learningProjects==="实训报告"){
-           tableData4.value[4].scoringCriteria=`提交实训报告，教师评分`
-           tableData4.value[4].completionStatus=item.completionStatus
-           if(item.scoreProject!==null){
-             tableData4.value[4].scoreProject=item.scoreProject
-           }
-           tableData4.value[4].scoreWeight=weight2
-           tableData4.value[4].schedule=item.schedule+'%'
-         }
-           return {
-               ...item
-           };
-         });
-         if(isUpdate.value){
-           return
-         }
-       tableData.value.push(...tableData3)
-       calculateAverageScore()
-      })
- }
- 
- const updateReportGrade=()=>{
-   getReports()
-   cerateGrade()
- }
-   
- </script>
- <style lang="scss" scoped>
- .study_main {
-   margin-top: 15px;
-   width: 1443px;
-   .study_main_up {
-     .el-button {
-     margin-right: 0px;
-     height: 28px;
-     width: 125px;
-     background:  #0E64FE;
-     }
-     .study_main_up_top {
-       display: flex;
-       justify-content: space-between;
-       margin-bottom: 10px;
-       .study_main_up_left{
-         align-items: center;
-         justify-content: center;
-         display: flex;
-         span{
-           margin-left: 10px;
-         }
-       }
-       img {
-         width: 30px !important;
-         height: 30px;
-       }
-     }
-   }
-   .study_main_but {
-     margin-top: 25px;
-     .study_main_but_left {
-       align-items: center;
-         display: flex;
-         span{
-           margin-left: 10px;
-         }
-       img {
-         width: 30px;
-         height: 30px;
-       }
-     }
-     .upload-demo{
-         margin-top: 15px;
-         .el-button {
-           margin-right: 0px;
-           height: 30px;
-           width: 125px;
-         }
-       }
-       .is-underline:nth-child(1){
-         margin-left: 26px;
-       }
-       .is-underline:nth-child(2){
-         margin-left: 36px;
-       }
-       .study_main_but_foot{
-         margin-top: 20px;
-       }
-   }
- }
- 
- // 设置表格行高度
- :deep(.el-table__body tr,
- .el-table__body td) {
-   padding: 0;
-   height: 40px !important;
-   border: 2px solid #8CA4EC;
- }
- 
- 
- :deep(.el-table__body tr:nth-child(6),
- .el-table__body td) {
-   padding: 0;
-   height: 40px !important;
-   color: #FF8C01;
- }
- ::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td {
-    background: #F2F5FB;
- }
- 
- ::v-deep .study_main_up_foot .el-table {
-   --el-table-border-color: #8CA4EC;
- }
- 
- ::v-deep .study_main_but_foot .el-table {
-   --el-table-border-color: #9E74FF;
- }
- ::v-deep .el-table__header-wrapper{
-   background: red;
- }
- .reportPromptFile{
-   font-size: 12px;
-     line-height: 7px;
-     font-family: '微软雅黑';
-     font-weight: 300;
- }
- </style>
- 
\ No newline at end of file
+  setTimeout(() => {
+    cerateGrade();
+  }, 300);
+
+  setTimeout(() => {
+    getReports();
+  }, 600);
+});
+const cerateGrade = () => {
+  API.academicRecordEnquiry(data.value).then((res) => {
+    let currentId = 1;
+    const tableData3 = res.data.map((item) => {
+      const weight1 = parseInt(item.scoreWeight * 100);
+      const weight2 = `${weight1}%`;
+      if (item.learningProjects === "知识概要") {
+        const score = parseFloat(item.scoringCriteria);
+        const time = reactive({ value: "/" });
+        if (item.completionStatus !== null) {
+          time.value = parseFloat(item.completionStatus);
+        }
+        tableData4.value[0].scoringCriteria = `阅读1分钟得${score}分,1分钟以下不得分`;
+        tableData4.value[0].completionStatus = `阅读${time.value}分钟`;
+        tableData4.value[0].scoreProject = item.scoreProject;
+        tableData4.value[0].scoreWeight = weight2;
+        tableData4.value[0].schedule = item.schedule + "%";
+      }
+      if (item.learningProjects === "实验实训") {
+        const score = parseFloat(item.scoringCriteria);
+        const time = reactive({ value: "/" });
+        if (item.completionStatus !== null) {
+          time.value = parseFloat(item.completionStatus);
+        }
+        tableData4.value[3].scoringCriteria = `输错/选错次数扣${score}分`;
+        tableData4.value[3].completionStatus = `输错/选错 ${time.value}次`;
+        tableData4.value[3].scoreProject = item.scoreProject;
+        tableData4.value[3].scoreWeight = weight2;
+        tableData4.value[3].schedule = item.schedule + "%";
+      }
+      if (item.learningProjects === "资源学习") {
+        const score = parseFloat(item.scoringCriteria);
+        const time = reactive({ value: "/" });
+        if (item.completionStatus !== null) {
+          time.value = parseFloat(item.completionStatus);
+        }
+        tableData4.value[1].scoringCriteria = `观看资源1分钟得${score}分`;
+        tableData4.value[1].completionStatus = `观看${time.value}分钟`;
+        tableData4.value[1].scoreProject = item.scoreProject;
+        tableData4.value[1].scoreWeight = weight2;
+        tableData4.value[1].schedule = item.schedule + "%";
+      }
+      if (item.learningProjects === "学习测评") {
+        const time = reactive({ value: "/" });
+        if (item.completionStatus !== null) {
+          time.value = parseFloat(item.completionStatus);
+        }
+        const score = parseFloat(item.scoringCriteria);
+        tableData4.value[2].scoringCriteria = `${score}分/道`;
+        tableData4.value[2].completionStatus = `错${time.value}道`;
+        tableData4.value[2].scoreProject = item.scoreProject;
+        tableData4.value[2].scoreWeight = weight2;
+        tableData4.value[2].schedule = item.schedule + "%";
+      }
+      if (item.learningProjects === "实训报告") {
+        tableData4.value[4].scoringCriteria = `提交实训报告，教师评分`;
+        tableData4.value[4].completionStatus = item.completionStatus;
+        if (item.scoreProject !== null) {
+          tableData4.value[4].scoreProject = item.scoreProject;
+        }
+        tableData4.value[4].scoreWeight = weight2;
+        tableData4.value[4].schedule = item.schedule + "%";
+      }
+      return {
+        ...item,
+      };
+    });
+    if (isUpdate.value) {
+      return;
+    }
+    tableData.value.push(...tableData3);
+    calculateAverageScore();
+  });
+};
+
+const updateReportGrade = () => {
+  getReports();
+  cerateGrade();
+};
+</script>
+<style lang="scss" scoped>
+.study_main {
+  margin-top: 15px;
+  width: 1443px;
+  .study_main_up {
+    .el-button {
+      margin-right: 0px;
+      height: 28px;
+      width: 125px;
+      background: #0e64fe;
+    }
+    .study_main_up_top {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 10px;
+      .study_main_up_left {
+        align-items: center;
+        justify-content: center;
+        display: flex;
+        span {
+          margin-left: 10px;
+        }
+      }
+      img {
+        width: 30px !important;
+        height: 30px;
+      }
+    }
+  }
+  .study_main_but {
+    margin-top: 25px;
+    .study_main_but_left {
+      align-items: center;
+      display: flex;
+      span {
+        margin-left: 10px;
+      }
+      img {
+        width: 30px;
+        height: 30px;
+      }
+    }
+    .upload-demo {
+      margin-top: 15px;
+      .el-button {
+        margin-right: 0px;
+        height: 30px;
+        width: 125px;
+      }
+    }
+    .is-underline:nth-child(1) {
+      margin-left: 26px;
+    }
+    .is-underline:nth-child(2) {
+      margin-left: 36px;
+    }
+    .study_main_but_foot {
+      margin-top: 20px;
+    }
+  }
+}
+
+// 设置表格行高度
+:deep(.el-table__body tr, .el-table__body td) {
+  padding: 0;
+  height: 40px !important;
+  border: 2px solid #8ca4ec;
+}
+
+:deep(.el-table__body tr:nth-child(6), .el-table__body td) {
+  padding: 0;
+  height: 40px !important;
+  color: #ff8c01;
+}
+::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td {
+  background: #f2f5fb;
+}
+
+::v-deep .study_main_up_foot .el-table {
+  --el-table-border-color: #8ca4ec;
+}
+
+::v-deep .study_main_but_foot .el-table {
+  --el-table-border-color: #9e74ff;
+}
+::v-deep .el-table__header-wrapper {
+  background: red;
+}
+.reportPromptFile {
+  font-size: 12px;
+  line-height: 7px;
+  font-family: "微软雅黑";
+  font-weight: 300;
+}
+</style>
diff --git a/src/views/learningCenter/evaluation.vue b/src/views/learningCenter/evaluation.vue
index f205d2f..e586d8e 100644
--- a/src/views/learningCenter/evaluation.vue
+++ b/src/views/learningCenter/evaluation.vue
@@ -1,5 +1,5 @@
 <template>
-   <el-scrollbar height="850px" always>
+   
      <div class="app-container">
        <div class="tl_top">
          <div class="eval_top">
@@ -26,6 +26,7 @@
          </div>
          <hr />
        </div>
+       <el-scrollbar height="800px" always>
        <div
          class="eval_main"
          v-for="(item, index) in mlist"
@@ -153,8 +154,8 @@
            </div>
          </div>
        </div>
+      </el-scrollbar>
      </div>
-   </el-scrollbar>
  </template>
  <script setup>
 //  import { useRouter } from "vue-router";
diff --git a/src/views/portraitModel/index.vue b/src/views/portraitModel/index.vue
index 43054d8..5ba8305 100644
--- a/src/views/portraitModel/index.vue
+++ b/src/views/portraitModel/index.vue
@@ -1,12 +1,7 @@
 <template>
-  <div class="content">
+  <div class="content app-container">
     <div class="tabList">
-      <div
-        class="tabs"
-        v-for="item in tabList"
-        :key="item.id"
-        @click="changeTab(item)"
-      >
+      <div class="tabs" v-for="item in tabList" :key="item.id" @click="changeTab(item)">
         <div style="display: flex; align-items: center">
           <img :src="item.backImg" alt="" />
           <span>{{ item.title }}</span>
@@ -20,16 +15,7 @@
           <img src="@/assets/images/图标1.png" alt="" />
           <span>内置表</span>
         </div>
-        <el-menu
-          default-active="1"
-          @open="handleOpen"
-          @close="handleClose"
-          @select="handleChange"
-          background-color="#041C49"
-          style="border-right: none"
-          active-text-color="#ffffff"
-          text-color="#9BD1FF"
-        >
+        <el-menu default-active="1" @open="handleOpen" @close="handleClose" @select="handleChange" background-color="#041C49" style="border-right: none" active-text-color="#ffffff" text-color="#9BD1FF">
           <el-menu-item index="1">
             <span>用户属性表</span>
           </el-menu-item>
@@ -365,12 +351,12 @@ const getTableData = (name) => {
     .getUserTableData({
       userId: 492,
       tableName: name,
-      size:10,
-      index:1
+      size: 10,
+      index: 1,
     })
     .then((res) => {
       // fileTable.value.push(res.data.list);
-      fileTable.value = res.data.list
+      fileTable.value = res.data.list;
       // console.log(res,'--');
     })
     .catch((error) => {});
@@ -400,7 +386,7 @@ const submit = () => {
 };
 const retrain = () => {
   contentRef.value.retrainMethod();
-}
+};
 // defineExpose({
 //   submit,
 // });
diff --git a/src/views/visual-analysis/index.vue b/src/views/visual-analysis/index.vue
new file mode 100644
index 0000000..09185ed
--- /dev/null
+++ b/src/views/visual-analysis/index.vue
@@ -0,0 +1,19 @@
+<!--
+ * @Author: qinzhenpen qzp1807@126.com
+ * @Date: 2024-08-16 09:16:26
+ * @LastEditors: qinzhenpen qzp1807@126.com
+ * @LastEditTime: 2024-08-16 09:18:05
+ * @FilePath: \vue3\src\views\visual-analysis\index.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+ <div>
+  <iframe src="http://118.31.7.2:96" width="100%" height="900" scrolling="no" frameborder="0"></iframe>
+ </div>
+</template>
+<script setup>
+
+</script>
+<style lang='scss'  scoped>
+        
+</style>
\ No newline at end of file