Kaynağa Gözat

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

lsc 7 ay önce
ebeveyn
işleme
5a42915bb7

+ 1 - 1
dist/index.html

@@ -32,7 +32,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.63e68f0227fe8c05f949183b9ec6b33f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.de15001ce66f032e9274.js></script><script type=text/javascript src=./static/js/app.f561f5cefbf5f28936e7.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.87876c0da4fa9580258686d33eda1a80.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.de15001ce66f032e9274.js></script><script type=text/javascript src=./static/js/app.2b1b1534a3f29d953aa3.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/app.87876c0da4fa9580258686d33eda1a80.css


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/css/app.87876c0da4fa9580258686d33eda1a80.css.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/app.2b1b1534a3f29d953aa3.js


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/app.2b1b1534a3f29d953aa3.js.map


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


+ 3 - 3
src/components/pages/appStore/views/appManagement.vue

@@ -1239,7 +1239,7 @@ export default {
 }
 
 .ac_c_item {
-  width: calc(100% / 5 - (15px * 4) / 5);
+  width: calc(100% / 4 - (15px * 4) / 4);
   height: 250px;
   background-color: #fff;
   border-radius: 10px;
@@ -1265,9 +1265,9 @@ export default {
 
 @media screen and (min-width: 1400px) {
   .ac_c_item {
-    width: calc(100% / 5 - (15px * 4) / 5) !important;
+    width: calc(100% / 4 - (15px * 3) / 4) !important;
   }
-  .ac_c_item:nth-child(5n) {
+  .ac_c_item:nth-child(4n) {
     margin-right: 0px !important;
     /* background-color: red; */
   }

+ 81 - 6
src/components/pages/test/checkAi/aiLeader.vue

@@ -20,16 +20,21 @@
             minHeight: item.loading ? '38px' : 'unset',
             minWidth: item.loading ? '50px' : 'unset'
           }" class="content">
+
+            <span class="vditor-reset" v-html="item.aiContent"></span>
+            <span class="createTime" v-text="item.createtime"></span>
+
+            <div class="eChartView" v-if="item.echartData && !item.loading">
+              <eChartTemplate :data="item.echartData"/>
+            </div>
             <div class="loadingDiv" v-if="item.loading">
               <span>小可努力生成中,请稍等片刻</span>
               <img :src="loadingImg" class="loadingImg" />
             </div>
-            <span class="vditor-reset" v-html="item.aiContent"></span>
-            <span class="createTime" v-text="item.createtime"></span>
           </div>
 
           <div class="ai_btn_box" v-if="!pan(item.aiContent).length && !item.loading">
-            <!-- <div class="popoverBox" v-if="item.uid.length>0">
+            <div class="popoverBox" v-if="item.uid.length>0">
               <div class="showBox" v-if="showPopoverUid===item.uid" v-click-outside="handleBlur">
                 <span @click="generateChart(item,0)">柱状图</span>
                 <span @click="generateChart(item,1)">折线图</span>
@@ -38,7 +43,7 @@
               <div class="btnBox" @click.stop="showPopoverUid===item.uid?showPopoverUid = null:showPopoverUid = item.uid">
                 <img src="https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/default%2F%E5%9B%BE%E8%A1%A81735027853698.png">
               </div>
-            </div> -->
+            </div>
             <img src="../../../../assets/icon/course/pasete.png" @click="onCopy(item.aiContent)" />
             <!-- <img src="../../../../assets/icon/test/test_bianji.png" v-if="index >= 2" @click="edit(index)" /> -->
           </div>
@@ -343,6 +348,7 @@ import checkIsImg from "../../../../assets/icon/sourceFile/check_is.png";
 import { v4 as uuidv4 } from "uuid";
 import MarkdownIt from "markdown-it";
 import TurndownService from "turndown";
+import eChartTemplate from "./eChartTemplate.vue";
 const OpenCC = require("opencc-js");
 let converter = OpenCC.Converter({
   from: "cn",
@@ -367,6 +373,9 @@ const clickOutside = {
   }
 };
 export default {
+  components:{
+    eChartTemplate
+  },
   props: {
     courseId: {
       type: String,
@@ -1806,7 +1815,68 @@ export default {
       this.showPopoverUid = null;
 
       if(_tableData && _tableData.length>0){
-        console.log(_tableData,type)
+
+        let _echartsType= {
+          '0':{text:`{"xAxis":{"type":"category","data":["数据1","数据2","数据3","数据4","数据5","数据6","数据7"]},"yAxis":{"type":"value"},"series":[{"data":[120,200,150,80,70,110,130],"type":"bar"}]}`,label:"柱状图"},
+          '1':{text:`{"xAxis":{"type":"category","data":["数据1","数据2","数据3","数据4","数据5","数据6","数据7"]},"yAxis":{"type":"value"},"series":[{"data":[150,230,224,218,135,147,260],"type":"line"}]}`,label:"折线图"},
+          '2':{text:`{"tooltip":{"trigger":"item"},"series":[{"name":"表单名称","type":"pie","radius":"50%","data":[{"value":1048,"name":"数据1"},{"value":735,"name":"数据2"},{"value":580,"name":"数据3"},{"value":484,"name":"数据4"},{"value":300,"name":"数据5"}]}]}`,label:"圆饼图"}
+        }
+
+        let _msg = `ATTENTION: Use '##' to SPLIT SECTIONS, not '#'. Output format carefully referenced "Format example".
+Instruction: Based on the context, follow "Format example", write content
+
+#Context
+##角色描述
+你是一位数据分析师,你需要根据用户的提问,读取并统计表格内容中的信息,以所需要的格式输出JSON数据来生成echarts图表
+##上下文
+你需要学习《完整版图表类型》《可视化图表的源数据格式》,并理解不同图表类型适用的场景以及绘制不同图表需要源数据表的格式。
+##任务描述
+你需要理解用户需求,并通过筛选关键信息、读取并检索文档中的相关信息并进行数据分析与统计,最后以Format example的形式输出统计结果。具体步骤如下:
+1、读取内容表格信息,了解文档中的数据内容。
+2、根据用户的需求,选择合适的可视化图表的类型(图表类型的选择可以从柱状图、折线图、饼状图中进行选择。)如果用户提出的需求中已经指定图表类型,可以根据用户指定的输出。
+3、根据图表类型确定源数据格式,确定每行每列的字段,并在用户上传的数据文档中,检索相关字段的信息,进行统计。源数据表的格式可以参考知识库中“可视化图表的源数据格式”进行统计。
+4、输出结果需要与Format example格式一致,不需要输出多余的内容
+
+##表格内容
+${JSON.stringify(_tableData)}
+
+##图表类型
+${_echartsType[type].label}
+
+##Format example
+${_echartsType[type].text}
+
+`
+        let params = {
+          model: "gpt-4o-2024-11-20",
+          temperature: 0,
+          max_tokens: 4096,
+          top_p: 1,
+          frequency_penalty: 0,
+          presence_penalty: 0,
+          messages: [{ role: "user", content: _msg }],
+          uid: uuidv4(),
+          mind_map_question: "",
+          stream: false
+        }
+        this.array.find(i=>i.uid===item.uid).loading = true;
+        this.ajax.post("https://gpt4.cocorobo.cn/chat", params).then(res => {
+          let _data = res.data.FunctionResponse.choices[0].message.content;
+          _data = _data.replaceAll("```json", "").replaceAll("```", "");
+          // const match = _data.match(/{[^{}]*"start"[\s\S]*?"end":\s*""[^{}]*}/);
+           // let _result = JSON.parse(match[0]) || null;
+          console.log("👉",_data)
+           // console.log("👉",_result)
+
+
+          this.$forceUpdate();
+          this.array.find(i=>i.uid===item.uid).loading = false;
+          this.array.find(i=>i.uid===item.uid).echartData = JSON.parse(_data);
+
+        }).catch(e=>{
+          console.log(e)
+          this.$message.error(`生成${_echartsType[type].label}失败`)
+        })
       }else{
         return this.$message.error('未提取到表格内容')
       }
@@ -1848,7 +1918,7 @@ export default {
     },
     handleBlur(){
       this.showPopoverUid = null;
-    }
+    },
   },
   computed: {
     localFormList() {
@@ -2972,4 +3042,9 @@ export default {
 .showBox>span:hover{
   background-color: #e2e2e2;
 }
+
+.eChartView{
+  width: 100%;
+  height: 300px;
+}
 </style>

+ 46 - 0
src/components/pages/test/checkAi/eChartTemplate.vue

@@ -0,0 +1,46 @@
+<template>
+	<div class="chart" id="charts_canvas" ref="chartRef"></div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+export default {
+	props: {
+		data: {
+			type: Object,
+			default: () => {},
+		},
+	},
+	data() {
+		return {
+			chartObj: null,
+			chartData: null,
+		};
+	},
+	watch: {
+		data() {
+			this.getChartData();
+		},
+	},
+	methods: {
+		getChartData() {
+			this.chartObj = echarts.init(this.$refs.chartRef);
+			this.chartObj.setOption(this.data);
+			window.addEventListener("resize", () => {
+					this.chartObj.resize();
+      });
+		},
+	},
+	mounted() {
+		this.getChartData();
+	},
+};
+</script>
+
+<style scoped>
+.chart {
+	max-width: 100%;
+	width: 100%;
+	height: 100%;
+}
+</style>

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor