Search
@@ -67,14 +102,22 @@ export default defineComponent({
let filter:any = reactive({
dataList:[],
tableLoading:false,
+ allUserList: [],
+ allCountry:[]
})
let filterData:any = reactive({
rangePickerValue:[],
currentPage: 1,
pageSize: 10,
total: 0,
- order: "", //'Ascending 升序 Descending 降序'
+ country: "",
+ email: "",
+ userType: "",
+ ids: [],
+ occupation: "",
+ order: "", //'Ascending 升序 Descending 降序'
orderBy:'',
+ userName: "",
})
let renameData: any = ref({}); //修改名字选中的数据
@@ -144,7 +187,7 @@ export default defineComponent({
];
});
//改变页码
- let changePage = (e: any, filters, sorter) => {
+ let changePage = (e: any, filters:any, sorter:any) => {
filterData.currentPage = e.current;
filterData.pageSize = e.pageSize;
if(sorter.order){
@@ -176,10 +219,16 @@ export default defineComponent({
let data = {
endTime:endDate,
startTime:startDate,
- size:filterData.pageSize,
- page:filterData.currentPage,
- order: filterData.order,
+ size: filterData.pageSize,
+ page: filterData.currentPage,
+ country: filterData.country,
+ email: filterData.email,
+ userType: filterData.userType,
+ ids: filterData.ids,
+ occupation: filterData.occupation,
+ order: filterData.order,
orderBy: filterData.orderBy,
+ userName: filterData.userName,
}
Https.axiosPost(Https.httpUrls.inquiryGetTrial,data).then((rv: any) => {
if (rv) {
@@ -192,6 +241,10 @@ export default defineComponent({
}
})
}
+ let filterOption = (input: any, option: any) => {
+ // 使用 option.label 进行搜索
+ return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+ };
let lastGeTrialList = (str:string)=>{
let currentDate = new Date();
let currentTimestamp = Math.floor(currentDate.getTime() / 1000);
@@ -204,11 +257,18 @@ export default defineComponent({
}else if(str == 'week'){
thirtyDaysAgoTimestamp = currentTimestamp - (7 * 24 * 60 * 60);
}
- filterData.rangePickerValue[0] = formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD')
- filterData.rangePickerValue[1] = formatTime(currentTimestamp,'YYYY-MM-DD')
+ filterData.rangePickerValue = [formatTime(thirtyDaysAgoTimestamp,'YYYY-MM-DD'),formatTime(currentTimestamp,'YYYY-MM-DD')]
gettrialList();
}
onMounted(()=>{
+ let allUserList: any = sessionStorage.getItem("allUserList");
+ if (allUserList) {
+ filter.allUserList = JSON.parse(allUserList);
+ }
+ let allCountry: any = sessionStorage.getItem("allCountry");
+ if (allCountry) {
+ filter.allCountry = JSON.parse(allCountry);
+ }
lastGeTrialList('month')
})
return {
@@ -217,6 +277,7 @@ export default defineComponent({
columns,
renameData,
changePage,
+ filterOption,
searchHistoryList,
lastGeTrialList,
gettrialList,
@@ -239,4 +300,11 @@ export default defineComponent({
},
});
-
\ No newline at end of file
+
+
+
diff --git a/src/component/Administrator/trialUserConversionRateChart.vue b/src/component/Administrator/trialUserConversionRateChart.vue
index 88a99a3a..71e6fd42 100644
--- a/src/component/Administrator/trialUserConversionRateChart.vue
+++ b/src/component/Administrator/trialUserConversionRateChart.vue
@@ -50,9 +50,18 @@ export default defineComponent({
let entries:any = Object.entries(rv);
let data: any = [];
for (let [key, value] of entries) {
+ let str
+ console.log(key);
+
+
if(key != 'conversionRate'){
+ if(key == 'trialToOfficialCount'){
+ str = 'Trial To Official'
+ }else{
+ str = 'Trial User'
+ }
let obj = {
- name: key,
+ name: str,
value: value
}
data.push(obj);
@@ -92,7 +101,7 @@ export default defineComponent({
formatter: '{a}
{b} : {c} ({d}%)'
},
legend: {
- top: '5%',
+ top: '10%',
left: 'center'
},
series: [
diff --git a/src/component/Administrator/trialUserCountry.vue b/src/component/Administrator/trialUserCountry.vue
index 183f35ea..191b434c 100644
--- a/src/component/Administrator/trialUserCountry.vue
+++ b/src/component/Administrator/trialUserCountry.vue
@@ -113,7 +113,7 @@ export default defineComponent({
{
type: "pie",
radius: "55%",
- center: ["40%", "50%"],
+ center: ["50%", "55%"],
data: data,
emphasis: {
itemStyle: {
diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue
index 6a792084..c92962f5 100644
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -813,6 +813,7 @@ export default defineComponent({
// this.store.commit("setTemplateData", event);
// },
async setWorkspaceStyle(data: any){
+
// this.workspaceItem.styleId = data.id
this.workspaceItem.styleName = data.name
this.workspaceItem.style = data.value
@@ -820,6 +821,9 @@ export default defineComponent({
if(data.isRevampModel){
await this.getMannequins(true)
}
+ if(!this.workspaceItem.overallSingle){
+ this.workspaceItem.position = 'Overall'
+ }
this.putWorkspace(this.workspaceItem,this.workspaceItem.id)
},
setStyle(){
diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue
index f64d6ebb..f68d847a 100644
--- a/src/component/HomePage/ColorboardUpload.vue
+++ b/src/component/HomePage/ColorboardUpload.vue
@@ -281,6 +281,7 @@ export default defineComponent({
// return this.setGradientAngle(gradient)
return (gradient)=>{
let gradientStr = ''
+ if(!gradient.gradientList)return
gradient.gradientList.sort((a, b) => {
let aArr = a.left.split('%')[0]
let bArr = b.left.split('%')[0]
@@ -771,7 +772,7 @@ export default defineComponent({
this.colorList[this.selectIndex].gradient = JSON.parse(JSON.stringify(this.gradient))
}else{
this.selectColor = {rgba:this.colorList[this.selectIndex].gradient.gradientList[0].rgba}
- this.colorList[this.selectIndex].gradient = {}
+ this.colorList[this.selectIndex].gradient = null
}
let colorList =this.colorList.filter((v) => v && Object.keys(v).length)
this.setColorboardList(colorList)
diff --git a/src/tool/https.js b/src/tool/https.js
index b7c6d270..d7c6be83 100644
--- a/src/tool/https.js
+++ b/src/tool/https.js
@@ -250,8 +250,8 @@ export const Https = {
getAllUserId:`/api/inquiry/getAllUserId`,//获取所有用户id和Name
adminAddUser:`/api/inquiry/addUser`,//添加用户
modifyUser:`/api/inquiry/modifyUser`,//修改用户
-
-
+
+
getTasksList:`/api/tasks/getList`,//获取w为执行完的所有任务
getTasksHistory:`/api/tasks/getAllTask`,//获取所有任务列表
prepareForSR:`/api/python/prepareForSR`,//超分
diff --git a/src/views/HomeMain.vue b/src/views/HomeMain.vue
index 32db65c9..4a4698b9 100644
--- a/src/views/HomeMain.vue
+++ b/src/views/HomeMain.vue
@@ -400,9 +400,9 @@ export default defineComponent({
},
//教程
getTutorial(){
- let url = 'https://code-create.com.hk/wp-content/uploads/2024/07/aida_3.0-使用手册-0705.pdf'
+ let url = 'https://code-create.com.hk/wp-content/uploads/2024/08/aida_3.0-Manual-0705-CN.pdf'
if(this.locale == 'ENGLISH'){
- url = 'https://code-create.com.hk/wp-content/uploads/2024/07/aida_3.0-Manual-0705-1.pdf'
+ url = 'https://code-create.com.hk/wp-content/uploads/2024/08/aida_3.0-Manual-0705-EN.pdf'
showViewVideo({url:'https://code-create.com.hk/wp-content/uploads/2024/07/AiDA-demo-video_0709_EN.webm'})
}else{
showViewVideo({url:'https://code-create.com.hk/wp-content/uploads/2024/07/AiDA-demo-video_0709_CN.webm'})
diff --git a/src/views/feedbackSurvey.vue b/src/views/feedbackSurvey.vue
index a3144df1..145ff306 100644
--- a/src/views/feedbackSurvey.vue
+++ b/src/views/feedbackSurvey.vue
@@ -725,6 +725,7 @@ export default defineComponent({
forbid.value = true
for (const iterator in data) {
if(typeof data[iterator] == 'object'){
+ feedbackData[iterator] = []
data[iterator].forEach((item:any)=>{
if(item*1){
feedbackData[iterator].push(item)