Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS into zdg_dev

# Conflicts:
#	src/renderer/src/AixPPTist/src/views/Editor/EditorHeader/index.vue

src/renderer/src/views/prepare/container/ai-pptistV2.vue

@@ -10,8 +10,8 @@
           <div class="paragraphs">
             {{ outputText }}
           </div>
-         <el-button style="margin-bottom: 5px;" type="primary" @click="addMessage">从新生成</el-button>
+         <el-button style="margin-bottom: 5px;" type="primary" @click="addMessage">{{ outputText ? '重新生产' : '生成大纲' }}</el-button>
-        <el-button style="margin-bottom: 5px;" type="primary" @click="activeStep = 1">下一步</el-button>
+        <el-button style="margin-bottom: 5px;" type="primary" @click="activeStep = 1" :disabled="!outputText">下一步</el-button>
       </el-card>
       <el-card v-if="activeStep === 1">
         <div style="padding-bottom: 10px">ppt模板选择</div>
@@ -57,7 +57,7 @@
         </el-row>
         <div>
           <el-button style="margin-bottom: 5px;" type="primary" @click="activeStep = 0">上一步</el-button>
-          <el-button style="margin-bottom: 5px;" type="primary" v-loading="createPPTLoading" @click="outlineCreatePPT()">生成PPT</el-button>
+          <el-button style="margin-bottom: 5px;" type="primary" :loading="createPPTLoading" @click="outlineCreatePPT()">生成PPT</el-button>
         </div>
       </el-card>
       <el-card v-if="activeStep === 2">
@@ -177,6 +177,8 @@ const outlineCreatePPT = () => {
     };
 
     checkProgress();
+  }).finally(()=>{
+    createPPTLoading.value = false
   })
 };
 

src/renderer/src/views/teachingDesign/container/left.vue

@@ -93,6 +93,9 @@ emitter.on('onGetMain', (item) => {
 const emit = defineEmits([''])
 const onSelect = (item) =>{
   actId.value = item.id
+  item.child.forEach(el =>{
+    el.aiShow = false
+  })
   emitter.emit('changeMode', item)
 }
 

src/renderer/src/views/teachingDesign/container/right.vue

@@ -14,8 +14,7 @@
           <el-option v-for="item in modeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
         <el-button type="primary" :disabled="!(resultList.length)" @click="getCompletion">一键研读</el-button>
-        <el-button type="primary">生成大纲</el-button>
+        <el-button type="danger" @click="onCreate">生成PPT</el-button>
-        <el-button type="danger" @click="pptDialog = true">生成PPT</el-button>
       </div>
     </div>
     <div class="right-con flex" ref="listRef">
@@ -137,6 +136,16 @@ emitter.on('changeMode', (item) => {
   getTempResult(item.id)
 })
 
+const onCreate = () =>{
+  let isAnswer = resultList.value.every(item => !item.answer)
+  if(isAnswer){
+    ElMessage.warning('请先进行研读')
+    return
+  }
+  pptDialog.value = true
+}
+
+
 
 // 一键研读
 const getCompletion = async () => {