|
|
@@ -384,9 +384,11 @@ ${arr.map(row => `<tr>
|
|
|
if (resultData.CH) analysisData.CH = resultData.CH;
|
|
|
return resolve({ data: analysisData })
|
|
|
} else if (assistantData.id == "bfe844b1-7a45-11ef-9b30-005056b86db5") {//课堂活动光谱图
|
|
|
+
|
|
|
let resultData = await this.getSpectrogram(_result, fileId, content, assistantData)
|
|
|
+ console.log("管谱图数据",resultData)
|
|
|
if (resultData.message) analysisData.content = resultData.message;
|
|
|
- if (resultData.eCharts) analysisData.getSpectrogram = resultData.eCharts;
|
|
|
+ if (resultData.eCharts) analysisData.spectrogramData = resultData.eCharts;
|
|
|
return resolve({ data: analysisData })
|
|
|
}
|
|
|
} catch (error) {
|
|
|
@@ -969,10 +971,9 @@ CH：${_CH}
|
|
|
getSpectrogram(_dataList, fileId, content, assistant) {
|
|
|
return new Promise(async (resolve) => {
|
|
|
try {
|
|
|
- this.getContentTableMixin(content).then(async res => {
|
|
|
- if (res.length <= 0) {
|
|
|
- resolve({ data: 1, err: "无表格数据" })
|
|
|
- }
|
|
|
+ let _msg = assistant.tips;
|
|
|
+ let message = await this.getAiContentMixin({ _msg: _msg, fileId: fileId })
|
|
|
+ this.getContentTableMixin(message.data).then(async res => {
|
|
|
let _tableData = res;
|
|
|
let _delIndex = _tableData.findIndex(i => i.includes("时间点"))
|
|
|
_tableData = _tableData.slice(_delIndex + 1)
|
|
|
@@ -984,6 +985,7 @@ CH：${_CH}
|
|
|
let upTime = '00:00:00';
|
|
|
|
|
|
_dataList.forEach((item, index) => {
|
|
|
+ if(!item.role)return;
|
|
|
if (index == 0) {
|
|
|
//第一个
|
|
|
identity = item.role;
|
|
|
@@ -1022,7 +1024,7 @@ CH：${_CH}
|
|
|
|
|
|
let breakpoint = [];
|
|
|
|
|
|
- breakpoint = _tableData.map(i => this.convertToSeconds(i[0]))
|
|
|
+ // breakpoint = _tableData.map(i => this.convertToSeconds(i[0]))
|
|
|
|
|
|
_result = _result.filter(
|
|
|
i =>
|
|
|
@@ -1038,9 +1040,7 @@ CH：${_CH}
|
|
|
_data.data = _result.map(i => ({ role: i.identity, type: i.identity == "老师" ? 0 : 1, value: i.sumTime }));
|
|
|
_data.breakpoint = breakpoint;
|
|
|
|
|
|
- let _msg = assistant.tips;
|
|
|
|
|
|
- let message = await this.getAiContentMixin({ _msg: _msg, fileId: fileId })
|
|
|
|
|
|
if (message.data == 1) {
|
|
|
return resolve({ eCharts: _data, message: "" })
|
|
|
@@ -1052,6 +1052,7 @@ CH：${_CH}
|
|
|
|
|
|
});
|
|
|
} catch (e) {
|
|
|
+ console.log("光谱生成失败",e)
|
|
|
return resolve({ data: 1, err: e })
|
|
|
}
|
|
|
})
|
|
|
@@ -1685,22 +1686,29 @@ CH：${_CH}
|
|
|
// 初始化图表
|
|
|
let myChart = echarts.init(hiddenDiv);
|
|
|
|
|
|
+ console.log(option)
|
|
|
|
|
|
- myChart.on("finished", () => {
|
|
|
+ let time;
|
|
|
+ myChart.on("rendered", async () => {
|
|
|
// console.log("生成echarts成功")
|
|
|
// 获取图表的图片
|
|
|
- let base64Image = myChart.getDataURL({
|
|
|
- type: "png", // 图片格式
|
|
|
- pixelRatio: 0.9, // 图像清晰度
|
|
|
- backgroundColor: "#fff" // 背景颜色
|
|
|
- });
|
|
|
|
|
|
- resolve(base64Image);
|
|
|
- // 清除隐藏的div和图表实例
|
|
|
- document.body.removeChild(hiddenDiv);
|
|
|
- myChart.dispose();
|
|
|
+ clearTimeout(time)
|
|
|
+ time = setTimeout(()=>{
|
|
|
+ let base64Image = myChart.getDataURL({
|
|
|
+ type: "png", // 图片格式
|
|
|
+ pixelRatio: 0.9, // 图像清晰度
|
|
|
+ backgroundColor: "#fff" // 背景颜色
|
|
|
+ });
|
|
|
+
|
|
|
+ resolve(base64Image);
|
|
|
+ // 清除隐藏的div和图表实例
|
|
|
+ document.body.removeChild(hiddenDiv);
|
|
|
+ myChart.dispose();
|
|
|
+ },200)
|
|
|
+
|
|
|
}).on("error", (error) => {
|
|
|
- // console.log("生成echarts失败",error)
|
|
|
+ console.log("生成echarts失败",error)
|
|
|
resolve("#")
|
|
|
});
|
|
|
|
SanHQin