xinyin025/geekai
1
0
Fork 0
mirror of https://github.com/yangjian102621/geekai.git synced 2025-11-09 18:53:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
RockYang
2024-03-12 18:03:24 +08:00
parent be379b6d63 2de655a1cf
commit 72f80a96bc
239 changed files with 602 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/assets/css/image-mj.css
View File

@@ -386,12 +386,12 @@
font-size: 50px;
margin-bottom: 10px;
}
.page-mj .inner .task-list-box .task-list-inner .job-list-box .el-image.upscale {
max-height: 310px;
}
.page-mj .inner .task-list-box .task-list-inner .job-list-box .el-image.upscale img {
height: 310px;
}
.page-mj .inner .task-list-box .task-list-inner .job-list-box .el-image.upscale .image-slot {
height: 310px;
}
.page-mj .inner .task-list-box .task-list-inner .job-list-box .el-image.upscale .el-image-viewer__wrapper img {
width: auto;
height: auto;

6
web/src/assets/css/image-sd.css
View File

@@ -271,12 +271,12 @@
font-size: 50px;
margin-bottom: 10px;
}
.page-sd .inner .task-list-box .task-list-inner .job-list-box .el-image.upscale {
max-height: 310px;
}
.page-sd .inner .task-list-box .task-list-inner .job-list-box .el-image.upscale img {
height: 310px;
}
.page-sd .inner .task-list-box .task-list-inner .job-list-box .el-image.upscale .image-slot {
height: 310px;
}
.page-sd .inner .task-list-box .task-list-inner .job-list-box .el-image.upscale .el-image-viewer__wrapper img {
width: auto;
height: auto;

6
web/src/assets/css/task-list.styl
View File

@@ -275,12 +275,14 @@
}
.el-image.upscale {
max-height 310px
img {
height 310px
}
.image-slot {
height 310px
}
.el-image-viewer__wrapper {
img {
width auto

2
web/src/components/ChatPrompt.vue
View File

@@ -9,7 +9,7 @@
<div class="content" v-html="content"></div>
<div class="bar" v-if="createdAt !== ''">
<span class="bar-item"><el-icon><Clock/></el-icon> {{ createdAt }}</span>
<span class="bar-item">算力消耗: {{ finalTokens }}</span>
<span class="bar-item">Tokens: {{ finalTokens }}</span>
</div>
</div>
</div>

7
web/src/components/ChatReply.vue
View File

@@ -9,12 +9,12 @@
<div class="content" v-html="content"></div>
<div class="bar" v-if="createdAt !== ''">
<span class="bar-item"><el-icon><Clock/></el-icon> {{ createdAt }}</span>
<span class="bar-item">算力消耗: {{ tokens }}</span>
<span class="bar-item">Tokens: {{ tokens }}</span>
<el-tooltip
class="box-item"
effect="light"
effect="dark"
content="复制回答"
placement="top"
placement="bottom"
>
<el-button type="info" class="copy-reply" :data-clipboard-text="orgContent">
<el-icon>
@@ -24,7 +24,6 @@
</el-tooltip>
</div>
</div>
</div>
</div>
</template>

13
web/src/components/ConfigDialog.vue
View File

@@ -12,17 +12,8 @@
<el-form-item label="账户">
<span>{{ user.username }}</span>
</el-form-item>
<el-form-item label="剩余对话次数">
<el-tag>{{ user['calls'] }}</el-tag>
</el-form-item>
<el-form-item label="剩余绘图次数">
<el-tag>{{ user['img_calls'] }}</el-tag>
</el-form-item>
<el-form-item label="本月算力消耗">
<el-tag type="info">{{ user['tokens'] }}</el-tag>
</el-form-item>
<el-form-item label="累计算力消耗">
<el-tag type="info">{{ user['total_tokens'] }}</el-tag>
<el-form-item label="剩余算力">
<el-tag>{{ user['power'] }}</el-tag>
</el-form-item>
<el-form-item label="会员到期时间" v-if="user['expired_time'] > 0">
<el-tag type="danger">{{ dateFormat(user['expired_time']) }}</el-tag>

7
web/src/components/InviteList.vue
View File

@@ -9,12 +9,7 @@
--el-table-text-color:#d1d1d1">
<el-table-column prop="username" label="用户"/>
<el-table-column prop="invite_code" label="邀请码"/>
<el-table-column label="邀请奖励">
<template #default="scope">
<span>对话：{{ scope.row['reward']['chat_calls'] }}次</span>，
<span>绘图：{{ scope.row['reward']['img_calls'] }}次</span>
</template>
</el-table-column>
<el-table-column prop="remark" label="邀请奖励"/>
<el-table-column label="注册时间">
<template #default="scope">

9
web/src/components/UserOrder.vue
View File

@@ -17,14 +17,9 @@
</el-table-column>
<el-table-column prop="subject" label="产品名称"/>
<el-table-column prop="amount" label="订单金额"/>
<el-table-column label="对话次数">
<el-table-column label="订单算力">
<template #default="scope">
<span>{{ scope.row.remark?.calls }}</span>
</template>
</el-table-column>
<el-table-column label="绘图次数">
<template #default="scope">
<span>{{ scope.row.remark?.img_calls ?? 0 }}</span>
<span>{{ scope.row.remark?.power }}</span>
</template>
</el-table-column>

16
web/src/components/UserProfile.vue
View File

@@ -29,17 +29,8 @@
<el-image v-if="user.vip" :src="vipImg" style="height: 25px;margin-left: 10px"/>
</el-tooltip>
</el-form-item>
<el-form-item label="剩余对话次数">
<el-tag>{{ user['calls'] }}</el-tag>
</el-form-item>
<el-form-item label="剩余绘图次数">
<el-tag>{{ user['img_calls'] }}</el-tag>
</el-form-item>
<el-form-item label="本月算力消耗">
<el-tag type="info">{{ user['tokens'] }}</el-tag>
</el-form-item>
<el-form-item label="累计算力消耗">
<el-tag type="info">{{ user['total_tokens'] }}</el-tag>
<el-form-item label="剩余算力">
<el-tag>{{ user['power'] }}</el-tag>
</el-form-item>
<el-form-item label="会员到期时间" v-if="user['expired_time'] > 0">
<el-tag type="danger">{{ dateFormat(user['expired_time']) }}</el-tag>
@@ -67,8 +58,7 @@ const user = ref({
nickname: '',
avatar: '',
mobile: '',
calls: 0,
tokens: 0,
power: 0,
})
const vipImg = ref("/images/vip.png")

82
web/src/views/ImageMj.vue
View File

@@ -163,7 +163,7 @@
</el-form>
</div>
</div>
<div class="task-list-box">
<div class="task-list-box" @scrollend="handleScrollEnd">
<div class="task-list-inner" :style="{ height: listBoxHeight + 'px' }">
<div class="extra-params">
<el-form>
@@ -240,7 +240,7 @@
</el-tooltip>
</div>
<div>
<el-button type="primary" @click="translatePrompt(false)" :disabled="loading">
<el-button type="primary" @click="translatePrompt(false)" :disabled="translating">
<el-icon style="margin-right: 6px;font-size: 18px;">
<Refresh/>
</el-icon>
@@ -254,7 +254,7 @@
content="使用 AI 翻译并重写提示词，<br/>增加更多细节，风格等描述"
placement="top-end"
>
<el-button type="success" @click="rewritePrompt" :disabled="loading">
<el-button type="success" @click="rewritePrompt" :disabled="translating">
<el-icon style="margin-right: 6px;font-size: 18px;">
<Refresh/>
</el-icon>
@@ -281,7 +281,7 @@
</el-icon>
</el-tooltip>
</div>
<el-button type="primary" @click="translatePrompt(true)" :disabled="loading">
<el-button type="primary" @click="translatePrompt(true)" :disabled="translating">
<el-icon style="margin-right: 6px;font-size: 18px;">
<Refresh/>
</el-icon>
@@ -391,7 +391,7 @@
</div>
<h2>创作记录</h2>
<div class="finish-job-list">
<div class="finish-job-list" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.7)">
<ItemList :items="finishedJobs" v-if="finishedJobs.length > 0" :width="240" :gap="16">
<template #default="scope">
<div class="job-item">
@@ -438,7 +438,7 @@
<template #default>
<div class="mj-list-item-prompt">
<span>{{ scope.item.prompt }}</span>
<el-icon class="copy-prompt"
<el-icon class="copy-prompt-mj"
:data-clipboard-text="scope.item.prompt">
<DocumentCopy/>
</el-icon>
@@ -485,7 +485,7 @@
</template>
<script setup>
import {onMounted, ref} from "vue"
import {nextTick, onMounted, onUnmounted, ref} from "vue"
import {
ChromeFilled,
Delete,
@@ -581,7 +581,7 @@ const finishedJobs = ref([])
const socket = ref(null)
const imgCalls = ref(0)
const loading = ref(false)
const translating = ref(false)
const userId = ref(0)
if (isMobile()) {
@@ -589,18 +589,18 @@ if (isMobile()) {
}
const rewritePrompt = () => {
loading.value = true
translating.value = true
httpPost("/api/prompt/rewrite", {"prompt": params.value.prompt}).then(res => {
params.value.prompt = res.data
loading.value = false
translating.value = false
}).catch(e => {
loading.value = false
translating.value = false
ElMessage.error("翻译失败：" + e.message)
})
}
const translatePrompt = (negative) => {
loading.value = true
translating.value = true
let prompt = params.value.prompt
if (negative) {
prompt = params.value.neg_prompt
@@ -611,9 +611,9 @@ const translatePrompt = (negative) => {
} else {
params.value.prompt = res.data
}
loading.value = false
translating.value = false
}).catch(e => {
loading.value = false
translating.value = false
ElMessage.error("翻译失败：" + e.message)
})
}
@@ -652,8 +652,8 @@ const connect = () => {
_socket.addEventListener('message', event => {
if (event.data instanceof Blob) {
fetchRunningJobs(userId.value)
fetchFinishJobs(userId.value)
fetchRunningJobs()
fetchFinishJobs(1)
}
});
@@ -662,32 +662,37 @@ const connect = () => {
});
}
const clipboard = ref(null)
onMounted(() => {
checkSession().then(user => {
imgCalls.value = user['img_calls']
userId.value = user.id
fetchRunningJobs(userId.value)
fetchFinishJobs(userId.value)
fetchRunningJobs()
fetchFinishJobs(1)
connect()
}).catch(() => {
router.push('/login')
});
const clipboard = new Clipboard('.copy-prompt');
clipboard.on('success', () => {
clipboard.value = new Clipboard('.copy-prompt-mj');
clipboard.value.on('success', () => {
ElMessage.success("复制成功！");
})
clipboard.on('error', () => {
clipboard.value.on('error', () => {
ElMessage.error('复制失败！');
})
})
onUnmounted(() => {
clipboard.value.destroy()
})
// 获取运行中的任务
const fetchRunningJobs = (userId) => {
httpGet(`/api/mj/jobs?status=0&user_id=${userId}`).then(res => {
const fetchRunningJobs = () => {
httpGet(`/api/mj/jobs?status=0`).then(res => {
const jobs = res.data
const _jobs = []
for (let i = 0; i < jobs.length; i++) {
@@ -710,9 +715,25 @@ const fetchRunningJobs = (userId) => {
})
}
const fetchFinishJobs = (userId) => {
const handleScrollEnd = () => {
page.value += 1
fetchFinishJobs(page.value)
};
const page = ref(1)
const pageSize = ref(15)
const isOver = ref(false)
const loading = ref(false)
const fetchFinishJobs = (page) => {
if (isOver.value === true) {
ElMessage.info("全部数据加载完毕！")
return
}
loading.value = true
// 获取已完成的任务
httpGet(`/api/mj/jobs?status=1&user_id=${userId}`).then(res => {
httpGet(`/api/mj/jobs?status=1&page=${page}&page_size=${pageSize.value}`).then(res => {
const jobs = res.data
for (let i = 0; i < jobs.length; i++) {
if (jobs[i]['use_proxy']) {
@@ -729,8 +750,17 @@ const fetchFinishJobs = (userId) => {
jobs[i]['can_opt'] = true
}
}
finishedJobs.value = jobs
if (jobs.length < pageSize.value) {
isOver.value = true
}
if (page === 1) {
finishedJobs.value = jobs
} else {
finishedJobs.value = finishedJobs.value.concat(jobs)
}
nextTick(() => loading.value = false)
}).catch(e => {
loading.value = false
ElMessage.error("获取任务失败：" + e.message)
})
}

75
web/src/views/ImageSd.vue
View File

@@ -241,7 +241,7 @@
</div>
</div>
<div class="param-line" v-loading="loading" element-loading-background="rgba(122, 122, 122, 0.8)">
<div class="param-line" v-loading="translating" element-loading-background="rgba(122, 122, 122, 0.8)">
<el-input
v-model="params.prompt"
:autosize="{ minRows: 4, maxRows: 6 }"
@@ -305,7 +305,7 @@
<el-button color="#47fff1" :dark="false" round @click="generate">立即生成</el-button>
</div>
</div>
<div class="task-list-box">
<div class="task-list-box" @scrollend="handleScrollEnd">
<div class="task-list-inner" :style="{ height: listBoxHeight + 'px' }">
<div class="job-list-box">
<h2>任务列表</h2>
@@ -350,7 +350,7 @@
<el-empty :image-size="100" v-else/>
</div>
<h2>创作记录</h2>
<div class="finish-job-list">
<div class="finish-job-list" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.7)">
<ItemList :items="finishedJobs" v-if="finishedJobs.length > 0" :width="240" :gap="16">
<template #default="scope">
<div class="job-item animate" @click="showTask(scope.item)">
@@ -411,7 +411,7 @@
</el-divider>
<div class="prompt">
<span>{{ item.prompt }}</span>
<el-icon class="copy-prompt" :data-clipboard-text="item.prompt">
<el-icon class="copy-prompt-sd" :data-clipboard-text="item.prompt">
<DocumentCopy/>
</el-icon>
</div>
@@ -424,7 +424,7 @@
</el-divider>
<div class="prompt">
<span>{{ item.params.negative_prompt }}</span>
<el-icon class="copy-prompt" :data-clipboard-text="item.params.negative_prompt">
<el-icon class="copy-prompt-sd" :data-clipboard-text="item.params.negative_prompt">
<DocumentCopy/>
</el-icon>
</div>
@@ -511,7 +511,7 @@
</template>
<script setup>
import {onMounted, ref} from "vue"
import {onMounted, onUnmounted, ref} from "vue"
import {Delete, DocumentCopy, InfoFilled, Orange, Picture, Refresh} from "@element-plus/icons-vue";
import {httpGet, httpPost} from "@/utils/http";
import {ElMessage, ElMessageBox, ElNotification} from "element-plus";
@@ -526,7 +526,7 @@ const mjBoxHeight = ref(window.innerHeight - 150)
const fullImgHeight = ref(window.innerHeight - 60)
const showTaskDialog = ref(false)
const item = ref({})
const loading = ref(false)
const translating = ref(false)
window.onresize = () => {
listBoxHeight.value = window.innerHeight - 40
@@ -562,23 +562,23 @@ if (_params) {
const imgCalls = ref(0)
const rewritePrompt = () => {
loading.value = true
translating.value = true
httpPost("/api/prompt/rewrite", {"prompt": params.value.prompt}).then(res => {
params.value.prompt = res.data
loading.value = false
translating.value = false
}).catch(e => {
loading.value = false
translating.value = false
ElMessage.error("翻译失败：" + e.message)
})
}
const translatePrompt = () => {
loading.value = true
translating.value = true
httpPost("/api/prompt/translate", {"prompt": params.value.prompt}).then(res => {
params.value.prompt = res.data
loading.value = false
translating.value = false
}).catch(e => {
loading.value = false
translating.value = false
ElMessage.error("翻译失败：" + e.message)
})
}
@@ -619,8 +619,8 @@ const connect = () => {
_socket.addEventListener('message', event => {
if (event.data instanceof Blob) {
fetchRunningJobs(userId.value)
fetchFinishJobs(userId.value)
fetchRunningJobs()
fetchFinishJobs(1)
}
});
@@ -629,26 +629,31 @@ const connect = () => {
});
}
const clipboard = ref(null)
onMounted(() => {
checkSession().then(user => {
imgCalls.value = user['img_calls']
userId.value = user.id
fetchRunningJobs(user.id)
fetchFinishJobs(user.id)
fetchRunningJobs()
fetchFinishJobs()
connect()
}).catch(() => {
router.push('/login')
});
const clipboard = new Clipboard('.copy-prompt');
clipboard.on('success', () => {
clipboard.value = new Clipboard('.copy-prompt-sd');
clipboard.value.on('success', () => {
ElMessage.success("复制成功！");
})
clipboard.on('error', () => {
clipboard.value.on('error', () => {
ElMessage.error('复制失败！');
})
})
onUnmounted(() => {
clipboard.value.destroy()
})
const fetchRunningJobs = (userId) => {
// 获取运行中的任务
httpGet(`/api/sd/jobs?status=0&user_id=${userId}`).then(res => {
@@ -673,11 +678,35 @@ const fetchRunningJobs = (userId) => {
})
}
const handleScrollEnd = () => {
page.value += 1
fetchFinishJobs(page.value)
}
const page = ref(1)
const pageSize = ref(15)
const isOver = ref(false)
const loading = ref(false)
// 获取已完成的任务
const fetchFinishJobs = (userId) => {
httpGet(`/api/sd/jobs?status=1&user_id=${userId}`).then(res => {
finishedJobs.value = res.data
const fetchFinishJobs = (page) => {
if (isOver.value === true) {
ElMessage.info("全部数据加载完毕！")
return
}
loading.value = true
httpGet(`/api/sd/jobs?status=1&page=${page}&page_size=${pageSize.value}`).then(res => {
if (res.data.length < pageSize.value) {
isOver.value = true
}
if (page === 1) {
finishedJobs.value = res.data
} else {
finishedJobs.value = finishedJobs.value.concat(res.data)
}
loading.value = false
}).catch(e => {
loading.value = false
ElMessage.error("获取任务失败：" + e.message)
})
}

19
web/src/views/ImagesWall.vue
View File

@@ -53,7 +53,7 @@
content="复制提示词"
placement="top"
>
<el-icon class="copy-prompt" :data-clipboard-text="slotProp.item.prompt">
<el-icon class="copy-prompt-wall" :data-clipboard-text="slotProp.item.prompt">
<DocumentCopy/>
</el-icon>
</el-tooltip>
@@ -143,7 +143,7 @@
</el-divider>
<div class="prompt">
<span>{{ item.prompt }}</span>
<el-icon class="copy-prompt" :data-clipboard-text="item.prompt">
<el-icon class="copy-prompt-wall" :data-clipboard-text="item.prompt">
<DocumentCopy/>
</el-icon>
</div>
@@ -156,7 +156,7 @@
</el-divider>
<div class="prompt">
<span>{{ item.params.negative_prompt }}</span>
<el-icon class="copy-prompt" :data-clipboard-text="item.params.negative_prompt">
<el-icon class="copy-prompt-wall" :data-clipboard-text="item.params.negative_prompt">
<DocumentCopy/>
</el-icon>
</div>
@@ -243,7 +243,7 @@
</template>
<script setup>
import {nextTick, onMounted, ref} from "vue"
import {nextTick, onMounted, onUnmounted, ref} from "vue"
import {DocumentCopy, Picture} from "@element-plus/icons-vue";
import {httpGet} from "@/utils/http";
import {ElMessage} from "element-plus";
@@ -314,17 +314,22 @@ const getNext = () => {
getNext()
const clipboard = ref(null)
onMounted(() => {
const clipboard = new Clipboard('.copy-prompt');
clipboard.on('success', () => {
clipboard.value = new Clipboard('.copy-prompt-wall');
clipboard.value.on('success', () => {
ElMessage.success("复制成功！");
})
clipboard.on('error', () => {
clipboard.value.on('error', () => {
ElMessage.error('复制失败！');
})
})
onUnmounted(() => {
clipboard.value.destroy()
})
const changeImgType = () => {
document.getElementById('waterfall-box').scrollTo(0, 0)
page.value = 0