aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/StableVersion' into dev_vite

Browse Source
This commit is contained in:
X1627315083
2025-09-22 14:10:18 +08:00
parent da241402f2 4f5a02bcf3
commit f4854cdb10
22 changed files with 105 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/component/Account/account.vue
View File

@@ -50,10 +50,10 @@
<div v-if="!isEditEmail">{{ userDetail.email }}</div> <div v-if="!isEditEmail">{{ userDetail.email }}</div>
<input v-else type="text" :value="editEmail"> <input v-else type="text" :value="editEmail">
</div> </div>
<div class="icon"> <!-- <div class="icon">
<i v-if="!isEditEmail" class="fi fi-rr-edit" @click="openEdit('email')"></i> <i v-if="!isEditEmail" class="fi fi-rr-edit" @click="openEdit('email')"></i>
<i v-else class="fi fi-br-check" @click="editChek('email')"></i> <i v-else class="fi fi-br-check" @click="editChek('email')"></i>
</div> </div> -->
</div> </div>
</div> </div>
<div class="content_item_user_left_detail_bottom"> <div class="content_item_user_left_detail_bottom">

2
src/component/Account/frontPage/mylnformation.vue
View File

@@ -28,7 +28,7 @@
optionFilterProp="label" optionFilterProp="label"
:options="countryList" :options="countryList"
:field-names="{ label: locale == 'CHINESE_SIMPLIFIED'?'labelCn':'label' }" :field-names="{ label: locale == 'CHINESE_SIMPLIFIED'?'labelCn':'label' }"
placeholder="Please select" :placeholder="`${$t('account.plaseSelect')} ${$t('account.Country')}`"
allowClear allowClear
show-search show-search
></a-select> ></a-select>

2
src/component/Administrator/SE/allUser/index.vue
View File

@@ -22,7 +22,7 @@
</a-range-picker> </a-range-picker>
</div> </div>
<!-- <div class="admin_state_item"> <!-- <div class="admin_state_item">
<span>Country:</span> <span>Country or Region:</span>
<a-select <a-select
v-model:value="country" v-model:value="country"
:allowClear="true" :allowClear="true"

4
src/component/Administrator/SE/recentActiveChart.vue
View File

@@ -77,10 +77,12 @@ import { PieChart } from 'echarts/charts';
import { LabelLayout } from 'echarts/features'; import { LabelLayout } from 'echarts/features';
import { useStore } from "vuex"; import { useStore } from "vuex";
import { CanvasRenderer } from 'echarts/renderers'; import { CanvasRenderer } from 'echarts/renderers';
import { useI18n } from 'vue-i18n'
export default defineComponent({ export default defineComponent({
components: { components: {
}, },
setup() { setup() {
const {t} = useI18n()
const store:any = useStore() const store:any = useStore()
let filter:any = reactive({ let filter:any = reactive({
dataList:computed(()=>{ dataList:computed(()=>{
@@ -115,7 +117,7 @@ export default defineComponent({
let data:any = [] let data:any = []
rv.names.forEach((item:any,index:number) => { rv.names.forEach((item:any,index:number) => {
let obj = { let obj = {
name : item, name : t(`admin.${item}`),
value:rv.values[index], value:rv.values[index],
} }
data.push(obj) data.push(obj)

6
src/component/Administrator/Transaction/TransactionTable.vue
View File

@@ -22,7 +22,7 @@
</a-range-picker> </a-range-picker>
</div> </div>
<div class="admin_state_item"> <div class="admin_state_item">
<span>Country:</span> <span>Country or Region:</span>
<a-select <a-select
v-model:value="country" v-model:value="country"
:allowClear="true" :allowClear="true"
@@ -365,11 +365,11 @@ export default defineComponent({
ellipsis:true ellipsis:true
}, },
{ {
title: "Country", title: "Country or Region",
align: "center", align: "center",
dataIndex: "country", dataIndex: "country",
key: "country", key: "country",
width:150, width:200,
ellipsis:true ellipsis:true
}, },
{ {

6
src/component/Administrator/allUser.vue
View File

@@ -26,7 +26,7 @@
<a-select v-model:value="userType" size="large" style="width:250px" optionFilterProp="label" :options="state" placeholder="Please select" allowClear show-search></a-select> <a-select v-model:value="userType" size="large" style="width:250px" optionFilterProp="label" :options="state" placeholder="Please select" allowClear show-search></a-select>
</div> --> </div> -->
<div class="admin_state_item"> <div class="admin_state_item">
<span>Country:</span> <span>Country or Region:</span>
<a-select <a-select
v-model:value="country" v-model:value="country"
:allowClear="true" :allowClear="true"
@@ -292,11 +292,11 @@ export default defineComponent({
}, },
}, },
{ {
title: "Country", title: "Country or Region",
align: "center", align: "center",
dataIndex: "country", dataIndex: "country",
key: "country", key: "country",
width:100, width:200,
}, },
{ {
title: "Create Date", title: "Create Date",

2
src/component/Administrator/allUserPoerations.vue
View File

@@ -92,7 +92,7 @@
/> />
</div> </div>
<div class="admin_state_item"> <div class="admin_state_item">
<span>Country:</span> <span>Country or Region:</span>
<input <input
:disabled="title != 'Add'" :disabled="title != 'Add'"
:class="{active:title != 'Add'}" :class="{active:title != 'Add'}"

4
src/component/Administrator/recentActiveUser.vue
View File

@@ -150,11 +150,11 @@ export default defineComponent({
}, },
}, },
{ {
title: "Country", title: "Country or Region",
align: "center", align: "center",
dataIndex: "country", dataIndex: "country",
key: "country", key: "country",
width:100, width:200,
}, },
{ {
title: "Create Date", title: "Create Date",

4
src/component/Administrator/recentNewUser.vue
View File

@@ -177,11 +177,11 @@ export default defineComponent({
}, },
}, },
{ {
title: "Country", title: "Country or Region",
align: "center", align: "center",
dataIndex: "country", dataIndex: "country",
key: "country", key: "country",
width:100, width:200,
}, },
{ {
title: "Create Date", title: "Create Date",

2
src/component/Administrator/trialAllUser.vue
View File

@@ -23,7 +23,7 @@
</a-range-picker> </a-range-picker>
</div> </div>
<div class="admin_state_item"> <div class="admin_state_item">
<span>Country:</span> <span>Country or Region:</span>
<a-select <a-select
v-model:value="country" v-model:value="country"
:allowClear="true" :allowClear="true"

2
src/component/Canvas/CanvasEditor/components/LiquifyPanel.vue
View File

@@ -519,7 +519,7 @@ function showPanel(event) {
} }
visible.value = true; visible.value = true;
closePanel.value = true // closePanel.value = true
isEditing.value = true; isEditing.value = true;
// 初始化液化管理器并准备液化环境 // 初始化液化管理器并准备液化环境

2
src/component/HomePage/Generate.vue
View File

@@ -743,7 +743,7 @@ export default defineComponent({
data = data.filter((item:any) => item !== element.taskId); data = data.filter((item:any) => item !== element.taskId);
console.log(data) console.log(data)
this.fileList = this.fileList.filter((item:any) => item.taskId !== element.taskId); this.fileList = this.fileList.filter((item:any) => item.taskId !== element.taskId);
message.info(this.t('Generate.everyTimeEffectPoor')); // message.info(this.t('Generate.everyTimeEffectPoor'));
} }
}); });
if((data.length == 0)){ if((data.length == 0)){

49
src/component/HomePage/scaleImage.vue
View File

@@ -608,30 +608,31 @@ export default defineComponent({
setImageIndex(index:any){ setImageIndex(index:any){
if(this.isNext)return if(this.isNext)return
let this_ = this let this_ = this
if(this.imgType == 'Printboard' || this.imgType == 'Sketchboard'){ // if(this.imgType == 'Printboard' || this.imgType == 'Sketchboard'){
this.isNext = true // this.isNext = true
new Promise((resolve,reject)=>{ // new Promise((resolve,reject)=>{
Modal.confirm({ // Modal.confirm({
title: this.t('scaleImage.submitCanvas'), // title: this.t('scaleImage.submitCanvas'),
icon: createVNode(ExclamationCircleOutlined), // icon: createVNode(ExclamationCircleOutlined),
okText: 'Yes', // okText: 'Yes',
cancelText: 'No', // cancelText: 'No',
mask:false, // mask:false,
centered:true, // centered:true,
onOk() { // onOk() {
this_.scaleImageIndex = index // this_.scaleImageIndex = index
this_.isNext = false // this_.isNext = false
resolve('') // resolve('')
}, // },
onCancel(){ // onCancel(){
this_.isNext = false // this_.isNext = false
resolve('') // resolve('')
} // }
}); // });
}) // })
}else{ // }else{
this.scaleImageIndex = index // this.scaleImageIndex = index
} // }
this.scaleImageIndex = index
}, },
LikeFile(item:any,str:string){ LikeFile(item:any,str:string){
let parent:any = this.$parent let parent:any = this.$parent

2
src/component/LoginPage/login/enterprise.vue
View File

@@ -105,7 +105,7 @@
<span> <span>
I agree to the I agree to the
<a href="https://code-create.com.hk/aida-terms-and-conditions/" style="text-decoration: underline;color: #000;">Terms</a>, <a href="https://code-create.com.hk/aida-terms-and-conditions/" style="text-decoration: underline;color: #000;">Terms</a>,
<a href="aida.com.hk/privacy-policy.html" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</a>, <a href="https://aida.com.hk/privacy-policy.html" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</a>,
and Fees. and Fees.
</span> </span>
</label> </label>

2
src/component/LoginPage/login/personal.vue
View File

@@ -88,7 +88,7 @@
<span> <span>
I agree to the I agree to the
<a href="https://code-create.com.hk/aida-terms-and-conditions/" style="text-decoration: underline;color: #000;">Terms</a>, <a href="https://code-create.com.hk/aida-terms-and-conditions/" style="text-decoration: underline;color: #000;">Terms</a>,
<a href="aida.com.hk/privacy-policy.html" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</a>, <a href="https://aida.com.hk/privacy-policy.html" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</a>,
and Fees. and Fees.
</span> </span>
</label> </label>

2
src/component/LoginPage/login/school.vue
View File

@@ -109,7 +109,7 @@
<span> <span>
I agree to the I agree to the
<a href="https://code-create.com.hk/aida-terms-and-conditions/" style="text-decoration: underline;color: #000;">Terms</a>, <a href="https://code-create.com.hk/aida-terms-and-conditions/" style="text-decoration: underline;color: #000;">Terms</a>,
<a href="aida.com.hk/privacy-policy.html" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</a>, <a href="https://aida.com.hk/privacy-policy.html" target="_blank" style="text-decoration: underline;color: #000;">Privacy Policy</a>,
and Fees. and Fees.
</span> </span>
</label> </label>

2
src/component/WorksPage/newScaleImage.vue
View File

@@ -441,6 +441,8 @@ export default defineComponent({
if(userDetail.value.systemList.indexOf(1) == -1){ if(userDetail.value.systemList.indexOf(1) == -1){
return message.info(t('newScaleImage.jsContent1')) return message.info(t('newScaleImage.jsContent1'))
} }
return message.info(t('newScaleImage.jsContent2'))
if(imgData.scaleImageData.openSource == 0){ if(imgData.scaleImageData.openSource == 0){
return message.info(t('newScaleImage.jsContent2')) return message.info(t('newScaleImage.jsContent2'))
} }

51
src/component/home/design/editDesignType/index.vue
View File

@@ -812,31 +812,32 @@ methods: {
}, },
setImageIndex(index:any){ setImageIndex(index:any){
if(this.isNext)return if(this.isNext)return
let this_ = this // let this_ = this
if(this.isCanvas){ // if(this.isCanvas){
this.isNext = true // this.isNext = true
new Promise((resolve,reject)=>{ // new Promise((resolve,reject)=>{
Modal.confirm({ // Modal.confirm({
title: this.t('scaleImage.submitCanvas'), // title: this.t('scaleImage.submitCanvas'),
icon: createVNode(ExclamationCircleOutlined), // icon: createVNode(ExclamationCircleOutlined),
okText: 'Yes', // okText: 'Yes',
cancelText: 'No', // cancelText: 'No',
mask:false, // mask:false,
centered:true, // centered:true,
onOk() { // onOk() {
this_.scaleImageIndex = index // this_.scaleImageIndex = index
this_.isNext = false // this_.isNext = false
resolve('') // resolve('')
}, // },
onCancel(){ // onCancel(){
this_.isNext = false // this_.isNext = false
resolve('') // resolve('')
} // }
}); // });
}) // })
}else{ // }else{
this.scaleImageIndex = index // this.scaleImageIndex = index
} // }
this.scaleImageIndex = index
}, },
LikeFile(item:any,str:string){ LikeFile(item:any,str:string){
let parent:any = this.$parent let parent:any = this.$parent

14
src/lang/cn.ts
View File

@@ -752,7 +752,8 @@ export default {
editUser: "修改个人信息", editUser: "修改个人信息",
notModifiable: "没有修改次数", notModifiable: "没有修改次数",
remainingModifications: "本月剩余次数：", remainingModifications: "本月剩余次数：",
Country: "国家", plaseSelect:"请选择",
Country: "国家或地区",
CompanyName: "职业", CompanyName: "职业",
Status: "状态", Status: "状态",
Valid: "有效", Valid: "有效",
@@ -1375,5 +1376,16 @@ export default {
jsContent1:'邮箱格式有误', jsContent1:'邮箱格式有误',
jsContent2:'请检查所有带 * 号的内容', jsContent2:'请检查所有带 * 号的内容',
jsDelete:'确定删除这一项吗', jsDelete:'确定删除这一项吗',
Design:'设计',
SingleDesign:'单品设计',
MoodBoard:'情绪版',
PrintBoard:'印花板',
SketchBoard:'线稿板',
Pattern:'设计',
Logo:'标志',
Slogan:'标语',
ToProductImage:'产品图',
Relight:'打光',
ChatRobot:'对话生成',
}, },
}; };

14
src/lang/en.ts
View File

@@ -752,7 +752,8 @@ export default {
editUser: "Change Information", editUser: "Change Information",
notModifiable: "Not modifiable", notModifiable: "Not modifiable",
remainingModifications: "Remaining this month:", remainingModifications: "Remaining this month:",
Country: "Country", plaseSelect:"Please select",
Country: "Country or Region",
CompanyName: "Occupation", CompanyName: "Occupation",
Status: "Status", Status: "Status",
Valid: "Valid", Valid: "Valid",
@@ -1375,5 +1376,16 @@ export default {
jsContent1:'The email format is incorrect', jsContent1:'The email format is incorrect',
jsContent2:'Please check the input box marked with *', jsContent2:'Please check the input box marked with *',
jsDelete:'Are you sure you want to delete this item?', jsDelete:'Are you sure you want to delete this item?',
Design:'Design',
SingleDesign:'SingleDesign',
MoodBoard:'MoodBoard',
PrintBoard:'PrintBoard',
SketchBoard:'SketchBoard',
Pattern:'Pattern',
Logo:'Logo',
Slogan:'Slogan',
ToProductImage:'ToProductImage',
Relight:'Relight',
ChatRobot:'ChatRobot',
}, },
}; };

2
src/store/userHabit/userHabit.ts
View File

@@ -266,7 +266,7 @@ const userHabit : Module<UserHabit,RootState> = {
// data.systemUser = 0 // data.systemUser = 0
state.userDetail.affiliate = data.affiliate state.userDetail.affiliate = data.affiliate
state.userDetail.systemUser = data.systemUser state.userDetail.systemUser = data.systemUser
// state.userDetail.systemUser = 1 // state.userDetail.systemUser = 7
// 身份列表1：可以使用aida系统，2:可以使用affiliate页面，3：系统管理员用户 // 身份列表1：可以使用aida系统，2:可以使用affiliate页面，3：系统管理员用户
state.userDetail.systemList = [] state.userDetail.systemList = []
if(data.systemUser != 0)state.userDetail.systemList.push(1) if(data.systemUser != 0)state.userDetail.systemList.push(1)

2
src/views/HomeView/library.vue
View File

@@ -1823,7 +1823,7 @@ export default defineComponent({
}else if(element.status == 'Fail' || element.status == 'Invalid'){ }else if(element.status == 'Fail' || element.status == 'Invalid'){
data = data.filter((item:any) => item !== element.taskId); data = data.filter((item:any) => item !== element.taskId);
this.generateList[str] = this.generateList[str].filter((item:any) => item.taskId !== element.taskId); this.generateList[str] = this.generateList[str].filter((item:any) => item.taskId !== element.taskId);
message.info(this.t('Generate.everyTimeEffectPoor')); // message.info(this.t('Generate.everyTimeEffectPoor'));
} }
}); });
if((data.length == 0)){ if((data.length == 0)){