fix

virgo.wzfrontend/workark/src/api/ai.js

@@ -45,3 +45,27 @@ export function getAIDataList(data) {
 		data: data
 	})
 }
+/* 
+ * 保存html代码
+ * 
+ * 
+ */
+export function saveHtmlData(data) {
+	return request({
+		url: `/api/ai/htmlCode`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 获取保存html代码
+ * 
+ * 
+ */
+export function getHtmlData(data) {
+	return request({
+		url: `/api/ai/htmlCode/query`,
+		method: 'post',
+		data: data
+	})
+}

virgo.wzfrontend/workark/src/components/work/common/aiChat.vue

@@ -29,7 +29,7 @@
 						</div>
 						<div class="message-header-label">{{user.userName}}</div>
 					</div>
-					<div class="message-content" v-html="returnUserInputs(message.inputs)"></div>
+					<div class="message-content" v-html="message.userInput"></div>
 					<div class="message-time">
 						{{ formatTime(message.date) }}
 					</div>
@@ -53,9 +53,10 @@
 							</el-button>
 						</div>
 						<div class="ai-website-boxs" v-else>
-							<div class="ai-website-box" v-html="extractContentBetween(message.outputs)"></div>
+							<div class="ai-website-box" v-html="message.AIInput"></div>
 							<div class="ai-website-mask">
-								<el-button size="mini" type="primary" @click="preview(message)">
+								<el-button size="mini" type="primary"
+									@click="$emit('previewWebSite', message.AIInput,message.simpleUUID)">
 									预览
 								</el-button>
 							</div>
@@ -111,15 +112,22 @@
 				visible: false,
 				timer: null,
 				formData: {
-					site_name: '网站名称',
-					site_type: '网站类型',
-					color_scheme: '布局风格',
-					layout_style: '主色调',
-					sections: '主要模块',
-					logo_url: 'LOGO'
+					company_name: '企业名称',
+					logo_url: '企业logo',
+					company_sub_name: '企业简称',
+					business_scope: '核心业务',
+					key_features: '核心优势',
+					contact_info: '联系方式',
+					industry_sector: '行业领域',
+					create_time: '成立时间',
+					create_place: '成立地点',
+					all_style: '整体风格',
+					model: '主要模块',
+					color_scheme: '主色调'
 				},
 				user: {},
-				htmlCode: ''
+				htmlCode: '',
+				simpleUUID: ''
 			}
 		},
 		mounted() {
@@ -146,10 +154,15 @@
 					userId: this.$store.getters.user.userId
 				}).then(res => {
 					if (res.state) {
-						this.messageList = res.data;
+						this.messageList = res.data.map(node => {
+							node['userInput'] = this.returnUserInputs(node.inputs);
+							node['AIInput'] = this.extractContentBetween(node.outputs, node.simpleUUID);
+							return node;
+						});
 						if (this.messageList.length > 0) {
 							let data = this.messageList[this.messageList.length - 1];
 							if (data.status === 'running') this.initStaus(data.simpleUUID);
+							this.$emit('previewWebSite', this.htmlCode, this.simpleUUID);
 						}
 					}
 				})
@@ -164,19 +177,29 @@
 							if (data.status === 'succeeded' || data.status === 'error') {
 								this.clearTimer();
 								this.loading = false;
+								data['userInput'] = this.returnUserInputs(data.inputs);
+								data['AIInput'] = this.extractContentBetween(data.outputs, data
+									.simpleUUID);
 								this.messageList[this.messageList.length - 1] = data;
+								this.$emit('previewWebSite', this.htmlCode, this.simpleUUID);
 							}
 						}
 					})
-				}, 10000)
+				}, 20000)
 			},
 			returnUserInputs(obj) {
 				if (!obj) return '';
 				let html = '';
 				let objs = JSON.parse(obj);
-				if (objs['site_name']) {
+				if (objs['company_name']) {
 					for (let key in objs) {
-						html += this.formData[key] + ':' + objs[key] + "<br />";
+						if (objs[key].indexOf('https://file-node.oss-cn-shanghai.aliyuncs.com/youji/') > -1) {
+							html += this.formData[key] + ':<img class="message-image" src="' + objs[key] +
+								'" alt="aa"/><br />';
+						} else {
+							html += this.formData[key] + ':' + objs[key] + "<br />";
+						}
+
 					}
 				} else {
 					html = objs.adjustments;
@@ -224,26 +247,28 @@
 					this.init();
 				}
 			},
-			extractContentBetween(html) {
+			extractContentBetween(html, simpleUUID) {
 				if (!html) return '';
 				// 使用正则表达式匹配 ```html 和 ``` 之间的内容
 				let regex = /```html([\s\S]*?)```/;
 				let match = html.match(regex);
-				let htmls = match && match[1] ? match[1].trim() : ''
+				let htmls = match && match[1] ? match[1].trim() : '';
+				this.htmlCode = htmls;
+				this.simpleUUID = simpleUUID;
 				return htmls;
-			},
-			preview(message) {
-				this.htmlCode = this.extractContentBetween(message.outputs);
-				this.$emit('previewWebSite', this.htmlCode);
 			}
 		}
 	}
 </script>
 
+<style>
+	.message-image {
+		width: 30px;
+	}
+</style>
 <style scoped lang="scss">
 	.ai-chat-container {
 		width: 100%;
-		max-width: 900px;
 		height: 100%;
 		background: white;
 		border-radius: 16px;
@@ -294,6 +319,7 @@
 		display: flex;
 		flex-direction: column;
 		gap: 15px;
+		overflow-x: hidden;
 	}
 
 	.message {
@@ -306,7 +332,7 @@
 	}
 
 	.user-message {
-		background: $--color-primary;
+		background: #7a72cf;
 		color: white;
 		margin-left: auto;
 		border-bottom-right-radius: 4px;
@@ -332,6 +358,8 @@
 		border-radius: 30px;
 		overflow: hidden;
 		margin-right: 5px;
+		background-color: #fff;
+		border: 2px solid #fff;
 	}
 
 	.message-header-label {

virgo.wzfrontend/workark/src/components/work/common/websiteForm.vue

@@ -2,23 +2,56 @@
 	<div class="hui-flex hui-dialog">
 		<div class="hui-flex-box hui-dialog-content">
 			<el-form :model="form" label-position="top">
-				<el-form-item label="网站名称">
-					<el-input type="text" v-model="form.site_name" placeholder="请输入网站名称"></el-input>
+				<el-form-item label="企业名称">
+					<el-input type="text" v-model="form.company_name" placeholder="请输入企业名称"></el-input>
 				</el-form-item>
-				<el-form-item label="网站类型">
-					<el-input type="text" v-model="form.site_type" placeholder="请输入网站类型"></el-input>
+				<el-form-item label="企业简称">
+					<el-input type="text" v-model="form.company_sub_name" placeholder="请输入企业简称"></el-input>
 				</el-form-item>
-				<el-form-item label="布局风格">
-					<el-input type="text" v-model="form.layout_style" placeholder="请输入布局风格"></el-input>
+				<el-form-item label="行业领域">
+					<el-select v-model="form.industry_sector" placeholder="请选择行业领域">
+						<el-option :label="item" :value="item" v-for="(item,index) in industryType" :key="index">
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="核心业务">
+					<el-input type="text" v-model="form.business_scope" placeholder="请输入核心业务"></el-input>
+				</el-form-item>
+				<el-form-item label="成立时间">
+					<el-input type="text" v-model="form.create_time" placeholder="请输入成立时间"></el-input>
+				</el-form-item>
+				<el-form-item label="成立地点">
+					<el-input type="text" v-model="form.create_place" placeholder="请输入成立地点"></el-input>
+				</el-form-item>
+				<el-form-item label="主要模块">
+					<el-select v-model="model" placeholder="请选择主要模块" multiple>
+						<el-option :label="item" :value="item" v-for="(item,index) in modelList" :key="index">
+						</el-option>
+					</el-select>
 				</el-form-item>
 				<el-form-item label="主色调">
-					<el-color-picker v-model="form.color_scheme"></el-color-picker>
+					<div style="display: flex;">
+						<el-input type="text" v-model="form.color_scheme" disabled></el-input>
+						<el-color-picker v-model="form.color_scheme" style="margin-left: 10px;"></el-color-picker>
+					</div>
+				</el-form-item>
+				<el-form-item label="整体风格">
+					<el-select v-model="all_style" placeholder="请选择整体风格" multiple>
+						<el-option :label="item" :value="item" v-for="(item,index) in style" :key="index">
+						</el-option>
+					</el-select>
 				</el-form-item>
 				<el-form-item label="LOGO" class="hui-textarea">
 					<upload ref="listDisplayImage" :list="listDisplayImage" type="insert" :maxLen="1"></upload>
 				</el-form-item>
-				<el-form-item label="主要模块" class="hui-textarea">
-					<el-input type="textarea" v-model="form.sections" placeholder="请输入主要模块" resize="none">
+				<el-form-item label="核心优势" class="hui-textarea">
+					<el-input type="textarea" v-model="form.key_features" placeholder="技术创新、极致性价比、独特服务、行业经验、品牌信誉"
+						resize="none">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="联系方式" class="hui-textarea">
+					<el-input type="textarea" v-model="form.contact_info"
+						placeholder="例如：手机号：137xxxxxxxx,邮箱：xxx@xxx,com" resize="none">
 					</el-input>
 				</el-form-item>
 			</el-form>
@@ -39,14 +72,24 @@
 		data() {
 			return {
 				form: {
-					site_name: '',
-					site_type: '',
-					color_scheme: '',
-					layout_style: '',
-					sections: ''
+					company_name: '',
+					company_sub_name: '',
+					industry_sector: '',
+					business_scope: '',
+					create_place: '',
+					create_time: '',
+					color_scheme: '#006AFF',
+					key_features: '',
+					contact_info: '',
+					all_style: ''
 				},
 				loading: false,
-				listDisplayImage: []
+				listDisplayImage: [],
+				industryType: ['科技', '制造', '教育', '金融', '医疗', '咨询', '电商', '餐饮'],
+				style: ['专业严谨', '现代简约', '高端奢华', '科技智能', '创新活力', '温馨亲和', '环保自然'],
+				all_style: [],
+				modelList: ['首页', '产品介绍', '解决方案', '成功案例', '关于我们', '联系我们'],
+				model: []
 			}
 		},
 		components: {
@@ -58,6 +101,8 @@
 				let postData = JSON.parse(JSON.stringify(this.form));
 				let fileBox = this.$refs.listDisplayImage.fileList;
 				if (fileBox && fileBox.length > 0) postData['logo_url'] = fileBox[0].url;
+				postData['all_style'] = this.all_style.join('、');
+				postData['model'] = this.model.join('、');
 				createAIData(2, postData).then(this.successFunc)
 			},
 			successFunc(res) {

virgo.wzfrontend/workark/src/views/work/oa/ai/website.vue

@@ -14,14 +14,16 @@
 				<span></span>
 			</div>
 			<div class="hui-flex-box">
-				<div class="no-empty" v-if="!websiteHtml">
-					<el-empty description="预览网站"></el-empty>
+				<div class="no-empty" v-if="!websiteUrl">
+					<el-empty description="请先预览网站"></el-empty>
+				</div>
+				<div class="html-box" v-else v-loading="loading">
+					<iframe :src="websiteUrl" width="100%" height="100%" frameborder="0" @load="onloadIframe">
+					</iframe>
 				</div>
-				<div class="html-box" v-else v-html="websiteHtml"></div>
 			</div>
 			<div class="hui-drawer-submit">
-				<el-button type="primary" size="mini" :disabled="!websiteHtml">保存</el-button>
-				<el-button type="primary" size="mini" :disabled="!websiteHtml">发布</el-button>
+				<el-button type="primary" size="mini" :disabled="!websiteUrl" @click="submit">发布</el-button>
 			</div>
 		</div>
 	</div>
@@ -29,7 +31,9 @@
 
 <script>
 	import {
-		getAIData
+		getAIData,
+		saveHtmlData,
+		getHtmlData
 	} from '@/api/ai'
 	import aiChat from '@/components/work/common/aiChat.vue'
 	export default {
@@ -38,14 +42,43 @@
 		},
 		data() {
 			return {
-				websiteHtml: ''
+				websiteUrl: '',
+				loading: false,
+				simpleUUID: ''
 			}
 		},
-		mounted() {
-		},
+		mounted() {},
 		methods: {
-			previewWebSite(html) {
-				this.websiteHtml = html;
+			async previewWebSite(html, simpleUUID) {
+				if (this.simpleUUID === simpleUUID) return;
+				this.loading = true;
+				this.simpleUUID = simpleUUID;
+				let htmlData = await getHtmlData({
+					simpleUUID: simpleUUID
+				})
+				if (!htmlData.state) return this.websiteUrl = '';
+				if (htmlData.data.length > 0) return this.websiteUrl =
+					`https://workark.com/api/enterprise/${simpleUUID}`
+				let saveData = await saveHtmlData({
+					data: html,
+					simpleUUID: simpleUUID
+				})
+				if (!saveData.state) return this.websiteUrl = '';
+				this.websiteUrl = `https://workark.com/api/enterprise/${simpleUUID}`;
+			},
+			submit() {
+				this.$confirm('是否发布该官网？', () => {
+					this.$prompt('发布连接', 'WorkArk提示', {
+						confirmButtonText: '打开链接',
+						cancelButtonText: '取消',
+						inputValue: `https://workark.com/api/enterprise/${this.simpleUUID}`
+					}).then(() => {
+						window.open(`https://workark.com/api/enterprise/${this.simpleUUID}`, "_blank");
+					}).catch(() => {});
+				})
+			},
+			onloadIframe() {
+				this.loading = false;
 			},
 			handleSend() {
 
@@ -61,6 +94,7 @@
 		.html-box {
 			width: 100%;
 			overflow: hidden;
+			height: 100%;
 		}
 
 		.iframe-class {