Merge branch 'debug' of http://8.136.199.33:3000/eta_gn_front/eta_front into debug

src/views/operation_manage/AIQA/AIQA.vue

@@ -30,17 +30,6 @@
                     <p>{{activeWindowId<=0?$t('ToolBox.AIQuestion.new_window'):activeWindow.TopicName||''}}</p>
                     <span>{{activeWindowId<=0?$t('ToolBox.AIQuestion.AI_use_intro'):`${historyList.length||0} messages`}}</span>
                 </div>
-                <div class="select-box">
-                    <el-select v-model="model" :class="{'hint':showHint}" :disabled="isTyping||(windowContentLoading&&windowContentLoading.visible)" ref="modelSelect" 
-                        @click.native="selectClick"
-                        @change="changeModel">
-                        <el-option v-for="item in modelList" :key="item.label"
-                            :label="item.label"
-                            :value="item.key">
-                            <span style="float:left">{{item.label}}</span>
-                        </el-option>
-                    </el-select>
-                </div>
             </div>
             <!-- 仅这一部分滚动 -->
             <div class="window-content-wrap hidden-scrollbar">
@@ -101,19 +90,6 @@ export default {
             inputText:'',
             model:'Kimi',//当前选择的模型
             modelOldValue:'',
-            modelList:[
-                {
-                    label:'GPT',
-                    key:'GPT-4 Turbo',
-                    icon:require('@/assets/img/icons/gpt-4-turbo.png'),
-                },
-                {
-                    label:'Kimi',
-                    key:'Kimi',
-                    icon:require('@/assets/img/icons/gpt-4-turbo.png'),
-                },
-                
-            ],//模型列表
             showHint:false,//选择模型提示
             isTyping:false,//是否处于打字动画中
             windowContentLoading:null,
@@ -131,10 +107,6 @@ export default {
         }
     },
     computed:{
-        modelIcon(){
-            const modelItem = this.modelList.find(i=>i.label===this.model)
-            return modelItem?modelItem.icon:''
-        }
     },
     methods: {
         //改变活跃窗口
@@ -275,38 +247,7 @@ export default {
                 this.changeActiveWindow({AiChatTopicId})
             })
         },
-        //选择模型
-        changeModel(value){
-            //非新建窗口时,模型之间切换需弹窗提示
-            if(this.activeWindowId!==0&&value!==''){
-                //弹窗提示:切换模型
-                this.$confirm(this.$t('ToolBox.AIQuestion.operation_des'), this.$t('ToolBox.AIQuestion.operation_tips'), {
-                    type: "warning"
-                }).then(()=>{
-                    //将相关值置空
-                    this.activeWindowId=0
-                    this.activeWindow=null
-                    this.historyList=[]
-                    this.aiFileIds=[]
-                    this.isTyping = false
-                    this.$message.success('切换模型成功')
-                }).catch(()=>{
-                    this.model= this.modelOldValue
-                    this.modelOldValue=''
-                })
-
-            }
-            //新建窗口时,若选择了模型,则移除hint效果
-            if(this.activeWindowId===0&&value!==''){
-                this.showHint=false
-            }
-        },
         //点击模型选择框
-        selectClick(){
-            if(this.isTyping){
-                this.$message.warning('请等待回答完成')
-            }
-        },
         //发送消息
         handleSendMsg(e){
             e.preventDefault()

src/views/ppt_manage/newVersion/pptEditor.vue

@@ -288,7 +288,7 @@
             </div>
             <!-- 历史记录编辑 -->
              <div class="history-edit-box" v-if="isVersionHistory">
-                <VersionRecord :PptId="PptId" @handleRestore="handleRestore"/>
+                <VersionRecord ref="version" :PptId="PptId" @handleRestore="handleRestore"/>
              </div>
           </div>
     </div>
@@ -1143,6 +1143,7 @@ export default {
     },
     // 版本记录列表
     handleVersionHistory(item) {
+      this.isEditLayer = false
       this.isVersionHistory = true;
     },
     // 
@@ -1183,6 +1184,7 @@ export default {
       this.isSaved = true
       if(this.$route.query.id||this.pptId){
         await this.editPPT(FirstPage,Content,type)
+        this.$refs.version.getSandBoxList() // 刷新版本列表
       }else{
         // await this.addPPT(FirstPage,Content)
       }

src/views/report_manage/reportV2/normalReport/components/insertContent.vue

@@ -20,7 +20,7 @@
     <!-- 语义分析 -->
     <SemanticAnalysis v-if="actTab==='semanticAnalysis'" @insertHtml="item => {$emit('insertHtml',{item,type:'image'})}"/>
     <!-- 版本记录 -->
-    <VersionRecord v-if="actTab==='versionRecord'" :selectChapterId="selectChapterId" @handleRestore="handleRestore"/>
+    <VersionRecord v-if="actTab==='versionRecord'" ref="version" :selectChapterId="selectChapterId" @handleRestore="handleRestore"/>
     <!-- 知识资源 -->
     <KnowResource v-if="actTab==='knowledgeResources'" @insertHtml="item => {$emit('insertHtml',{item,type:'knowledge'})}"/>
 
@@ -55,6 +55,9 @@ export default {
       },
       handleRestore(data){
           this.$emit('handleRestore',data)
+      },
+      getSandBoxList(){
+        this.$refs.version.getSandBoxList() // 刷新版本列表
       }
   }
 }

src/views/report_manage/reportV2/normalReport/editReport.vue

@@ -74,6 +74,7 @@
 
 						<!-- 可插入内容 -->
 						<insertContent
+							ref="insertContRef"
 							v-show="activeTab"
 							:actTab="activeTab"
 							:selectChapterId="selectChapterId"
@@ -269,7 +270,9 @@ export default {
 				})
 				if(res.Ret !== 200) return
 				resolve(true)
-	
+				if(type !== '')  {
+					this.$refs.insertContRef.getSandBoxList() // 刷新版本列表
+				}
 				this.lastsavetime = http.dateFormatter(new Date(), true);
 				type==='save' && this.$message.success(res.Msg);
 
@@ -388,7 +391,9 @@ export default {
 				}).then((res) => {
 					if (res.Ret === 200) {
 						resolve(true)
-
+						if(IsManualSave)  {
+                            this.$refs.insertContRef.getSandBoxList() // 刷新版本列表
+                        }
 						this.lastsavetime = http.dateFormatter(new Date(), true);
 						type==='save' && this.$message.success(res.Msg);
 					}

src/views/report_manage/reportV2/smartReport/editReport.vue

@@ -175,7 +175,7 @@
                                 :style="{fontFamily:item.family,fontSize:(item.size*2)+'px',fontWeight:item.weight,textAlign:item.align,color:item.color,
                                     width:item.width,height:item.height,left:item.left,top:item.top
                                 }">
-                                    {{ layoutBaseInfo[item.value] }}
+                                    {{ layoutBaseInfo[item.value] }}111
                                 </div>
                             </div>
                         </div>
@@ -215,7 +215,7 @@
                         <!-- 语义分析 -->
                         <SemanticAnalysis v-if="rightType==='semanticAnalysis'"/>
                         <!-- 版本记录 -->
-                        <VersionRecord v-if="rightType==='versionRecord'" :selectChapterId="selectChapterId" @handleRestore="handleRestore"/>
+                        <VersionRecord v-if="rightType==='versionRecord'" ref="version" :selectChapterId="selectChapterId" @handleRestore="handleRestore"/>
                         <!-- 版图资源库 -->
                         <ImgSource v-if="rightType==='imgSource'" @change="handleInsertImgSource" @close="handleCloseRight"/>
                         <!-- 知识资源 -->
@@ -504,7 +504,9 @@ export default {
                 })
                 if(res.Ret !== 200) return 
                 resolve(true)
-
+                if(type !== '')  {
+					this.$refs.version.getSandBoxList() // 刷新版本列表
+				}
                 type==='save' && this.$message.success(res.Msg);
             })
 		},
@@ -1215,6 +1217,9 @@ export default {
                         if(!isAutoSave){
                             this.$message.success(this.$t('MsgPrompt.saved_msg'))
                         }
+                        if(IsManualSave)  {
+                            this.$refs.version.getSandBoxList() // 刷新版本列表
+                        }
                     }
                 })
             })
@@ -1591,7 +1596,7 @@ div{
     width: 800px;
     flex-shrink: 0;
     margin-left: 90px;
-    margin-right: 60px;
+    margin-right: 10px;
     margin-top: 30px;
     position: relative;
     .report-comp-wrap{
@@ -1842,7 +1847,7 @@ div{
         flex: 1;
         position: relative;
         padding-top: 30px;
-        padding-left: 75px;
+        padding-left: 40px;
         padding-right: 30px;
         padding-bottom: 30px;
         &::before{