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

修复颜色页面bug

Browse Source
This commit is contained in:
X1627315083
2024-08-06 10:05:50 +08:00
parent 12ea743827
commit ffa1da742f
11 changed files with 185 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.dev
View File

@@ -6,6 +6,6 @@ NODE_ENV = 'development'
VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
# VUE_APP_BASE_URL = 'https://api.aida.com.hk' # VUE_APP_BASE_URL = 'https://api.aida.com.hk'
# 佩佩 # 佩佩
# VUE_APP_BASE_URL = 'http://192.168.1.7:5567' VUE_APP_BASE_URL = 'http://192.168.1.7:5567'
# 海波 # 海波
# VUE_APP_BASE_URL = 'http://192.168.1.9:5567' # VUE_APP_BASE_URL = 'http://192.168.1.9:5567'

23
src/assets/style/style.css
View File

@@ -1096,7 +1096,7 @@ li {
margin-right: 15px; margin-right: 15px;
flex-shrink: 0; flex-shrink: 0;
display: block; display: block;
width: 100px; width: 10rem;
text-align: right; text-align: right;
} }
.admin_page .admin_state_item > input { .admin_page .admin_state_item > input {
@@ -1144,13 +1144,13 @@ li {
.admin_page .admin_table_search .admin_state_list .admin_state_list_item { .admin_page .admin_table_search .admin_state_list .admin_state_list_item {
cursor: pointer; cursor: pointer;
width: auto; width: auto;
border-radius: 1rem; border-radius: 10px;
padding: 1rem 2rem; padding: 5px 10px;
border: 1px solid #b6b6b6; border: 1px solid #b6b6b6;
background: #39215b; background: #39215b;
color: #fff; color: #fff;
margin: 0 2rem 2rem 0; margin: 0 10px 10px 0;
font-size: 1.8rem; font-size: 1.4rem;
font-weight: 600; font-weight: 600;
} }
.admin_page .admin_table_search .admin_state_list .admin_state_list_item:last-child { .admin_page .admin_table_search .admin_state_list .admin_state_list_item:last-child {
@@ -1209,6 +1209,19 @@ li {
.admin_page .admin_table_content .ant-table-body::-webkit-scrollbar { .admin_page .admin_table_content .ant-table-body::-webkit-scrollbar {
width: 0 !important; width: 0 !important;
} }
.admin_page .admin_table_content .ant-table-body::-webkit-scrollbar-horizontal {
height: 2px !important;
width: 2px !important;
}
.admin_page .admin_table_content .ant-table-body::-webkit-scrollbar-thumb:horizontal {
background-color: #8a8a8a;
/* 水平滚动条手柄颜色 */
border-radius: 5px;
}
.admin_page .admin_table_content .ant-table-body::-webkit-scrollbar-track:horizontal {
background-color: #f1f1f1;
/* 水平滚动条轨道颜色 */
}
.admin_page .admin_table_content .ant-table-thead > tr > th { .admin_page .admin_table_content .ant-table-thead > tr > th {
background: #ffffff; background: #ffffff;
border-bottom: none; border-bottom: none;

24
src/assets/style/style.less
View File

@@ -1224,7 +1224,8 @@ input:focus{
flex-shrink: 0; flex-shrink: 0;
display: block; display: block;
// min-width: 20%; // min-width: 20%;
width: 100px; // width: 100px;
width: 10rem;
text-align: right; text-align: right;
} }
>input{ >input{
@@ -1273,13 +1274,13 @@ input:focus{
.admin_state_list_item{ .admin_state_list_item{
cursor: pointer; cursor: pointer;
width: auto; width: auto;
border-radius: 1rem; border-radius: 10px;
padding: 1rem 2rem; padding: 5px 10px;
border: 1px solid #b6b6b6; border: 1px solid #b6b6b6;
background: #39215b; background: #39215b;
color: #fff; color: #fff;
margin: 0 2rem 2rem 0; margin: 0 10px 10px 0;
font-size: 1.8rem; font-size: 1.4rem;
font-weight: 600; font-weight: 600;
} }
.admin_state_list_item:last-child{ .admin_state_list_item:last-child{
@@ -1339,10 +1340,21 @@ input:focus{
overflow-y: auto !important; overflow-y: auto !important;
-ms-overflow-style: none; -ms-overflow-style: none;
overflow: -moz-scrollbars-none; overflow: -moz-scrollbars-none;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 0 !important; width: 0 !important;
} }
&::-webkit-scrollbar-horizontal {
height: 2px !important;
width: 2px !important;
}
&::-webkit-scrollbar-thumb:horizontal {
background-color: #8a8a8a; /* 水平滚动条手柄颜色 */
border-radius: 5px;
}
&::-webkit-scrollbar-track:horizontal {
background-color: #f1f1f1; /* 水平滚动条轨道颜色 */
}
} }
.ant-table-thead > tr > th { .ant-table-thead > tr > th {
background: #ffffff; background: #ffffff;

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

@@ -187,17 +187,21 @@ export default defineComponent({
value: "", value: "",
}, },
{ {
label: "visitor", label:'visitor',
value: "1", value:'0',
}, },
{ {
label: "trial", label:'yearly',
value: "2", value:'1',
}, },
{ {
label: "official", label:'monthly',
value: "3", value:'2',
}, },
{
label:'trial',
value:'3',
},
{ {
label: "userInEvent", label: "userInEvent",
value: "4", value: "4",

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

@@ -21,7 +21,7 @@
</div> </div>
<div class="allUserPoeration_center admin_page"> <div class="allUserPoeration_center admin_page">
<div class="admin_state_item"> <div class="admin_state_item">
<span style="width: 100px;">User Name:</span> <span>User Name:</span>
<input <input
:readonly="title != 'Add'" :readonly="title != 'Add'"
:class="{active:title != 'Add'}" :class="{active:title != 'Add'}"
@@ -32,7 +32,7 @@
/> />
</div> </div>
<div class="admin_state_item"> <div class="admin_state_item">
<span style="width: 100px;">User Email:</span> <span>User Email:</span>
<input <input
:readonly="title != 'Add'" :readonly="title != 'Add'"
:class="{active:title != 'Add'}" :class="{active:title != 'Add'}"
@@ -43,7 +43,7 @@
/> />
</div> </div>
<div class="admin_state_item"> <div class="admin_state_item">
<span style="width: 100px;">Create Time:</span> <span>Create Time:</span>
<a-date-picker :disabled="title != 'Add'" style="width: 250px" valueFormat="YYYY-MM-DDTHH:mm:ss" class="range_picker" show-time placeholder="Create Time" v-model:value="validStartTime"> <a-date-picker :disabled="title != 'Add'" style="width: 250px" valueFormat="YYYY-MM-DDTHH:mm:ss" class="range_picker" show-time placeholder="Create Time" v-model:value="validStartTime">
<template #suffixIcon> <template #suffixIcon>
<span <span
@@ -53,7 +53,7 @@
</a-date-picker> </a-date-picker>
</div> </div>
<div class="admin_state_item"> <div class="admin_state_item">
<span style="width: 100px;">End Time:</span> <span>End Time:</span>
<a-date-picker style="width: 250px" valueFormat="YYYY-MM-DDTHH:mm:ss" class="range_picker" show-time placeholder="End Time" v-model:value="validEndTime"> <a-date-picker style="width: 250px" valueFormat="YYYY-MM-DDTHH:mm:ss" class="range_picker" show-time placeholder="End Time" v-model:value="validEndTime">
<template #suffixIcon> <template #suffixIcon>
<span <span
@@ -63,7 +63,7 @@
</a-date-picker> </a-date-picker>
</div> </div>
<div class="admin_state_item"> <div class="admin_state_item">
<span style="width: 100px;">User Type:</span> <span>User Type:</span>
<a-select <a-select
v-model:value="systemUser" v-model:value="systemUser"
size="large" size="large"
@@ -76,7 +76,7 @@
></a-select> ></a-select>
</div> </div>
<div class="admin_state_item"> <div class="admin_state_item">
<span style="width: 100px;">Credits:</span> <span>Credits:</span>
<input <input
v-model="credits" v-model="credits"
placeholder="Please enter credits" placeholder="Please enter credits"
@@ -86,7 +86,7 @@
</div> </div>
<div class="admin_state_item"> <div class="admin_state_item">
<span style="width: 100px;">Country:</span> <span>Country:</span>
<input <input
:readonly="title != 'Add'" :readonly="title != 'Add'"
:class="{active:title != 'Add'}" :class="{active:title != 'Add'}"
@@ -190,9 +190,14 @@ export default defineComponent({
} }
let setTime = (time) =>{ let setTime = (time) =>{
const date = new Date(time); if(time){
const timestamp = date.getTime(); // 转换为秒数 const date = new Date(time);
return timestamp const timestamp = date.getTime(); // 转换为秒数
return timestamp
}else{
return ''
}
} }
let setAddData = ()=>{ let setAddData = ()=>{
setTime(operationsData.validStartTime) setTime(operationsData.validStartTime)
@@ -296,7 +301,9 @@ export default defineComponent({
} }
.allUserPoeration_center{ .allUserPoeration_center{
height: 85%; height: 85%;
overflow-y: auto overflow-y: auto;
flex-direction: row;
flex-wrap: wrap;
} }
} }
</style> </style>

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

@@ -73,6 +73,8 @@ export default defineComponent({
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 10,
total: 0, total: 0,
order: "", //'Ascending 升序 Descending 降序'
orderBy:'',
}) })
let renameData: any = ref({}); //修改名字选中的数据 let renameData: any = ref({}); //修改名字选中的数据
const columns: any = computed(() => { const columns: any = computed(() => {
@@ -215,10 +217,20 @@ export default defineComponent({
]; ];
}); });
//改变页码 //改变页码
let changePage = (e: any) => { let changePage = (e: any, filters:any, sorter:any) => {
filterData.currentPage = e.current; filterData.currentPage = e.current;
filterData.pageSize = e.pageSize; filterData.pageSize = e.pageSize;
// gettrialList(); if(sorter.order){
if(sorter.columnKey == 'id'){
filterData.orderBy = 'id'
}else if(sorter.columnKey == "createDate"){
filterData.orderBy = 'time'
}else if(sorter.columnKey == "credits"){
filterData.orderBy = 'credits'
}
}
filterData.order = sorter.order == "descend" ? "Descending" : "Ascending";
gettrialList();
} }
//查询列表 //查询列表
@@ -241,8 +253,10 @@ export default defineComponent({
startTime:startDate, startTime:startDate,
size:filterData.pageSize, size:filterData.pageSize,
page:filterData.currentPage, page:filterData.currentPage,
order: filterData.order,
orderBy: filterData.orderBy,
} }
Https.axiosGet(Https.httpUrls.recentActiveUser,{params:data}).then((rv: any) => { Https.axiosPost(Https.httpUrls.recentActiveUser,data).then((rv: any) => {
if (rv) { if (rv) {
// this.dataList = rv // this.dataList = rv
filter.dataList = rv.records filter.dataList = rv.records

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

@@ -25,7 +25,7 @@
</div> </div>
<div class="admin_state_item"> <div class="admin_state_item">
<span>Type:</span> <span>Type:</span>
<a-select v-model:value="userType" size="large" style="width:280px" optionFilterProp="label" :options="state" placeholder="Please select" allowClear show-search></a-select> <a-select v-model:value="systemUser" size="large" style="width:280px" optionFilterProp="label" :options="state" placeholder="Please select" allowClear show-search></a-select>
</div> </div>
</div> </div>
<div class="admin_search"> <div class="admin_search">
@@ -46,6 +46,7 @@
:data-source="dataList" :data-source="dataList"
:scroll="{ y: historyTableHeight }" :scroll="{ y: historyTableHeight }"
@change="changePage" @change="changePage"
:showSorterTooltip='false'
:pagination="{ :pagination="{
showSizeChanger: true, showSizeChanger: true,
current: currentPage, current: currentPage,
@@ -76,7 +77,9 @@ export default defineComponent({
currentPage: 1, currentPage: 1,
pageSize: 10, pageSize: 10,
total: 0, total: 0,
userType:'', systemUser:'',
order: "", //'Ascending 升序 Descending 降序'
orderBy:'',
}) })
let state:any = ref([ let state:any = ref([
{ {
@@ -103,27 +106,30 @@ export default defineComponent({
let renameData: any = ref({}); //修改名字选中的数据 let renameData: any = ref({}); //修改名字选中的数据
const columns: any = computed(() => { const columns: any = computed(() => {
return [ return [
{ {
title: 'User Id', title: "User Id",
align: "center", align: "center",
ellipsis: true,
dataIndex: "id", dataIndex: "id",
key: "id", key: "id",
fixed: 'left' width:100,
fixed: "left",
sorter: true,
}, },
{ {
title: 'Email', title: "Email",
align: "center", align: "center",
ellipsis: true,
dataIndex: "userEmail", dataIndex: "userEmail",
key: "userEmail", key: "userEmail",
width:200,
ellipsis:true
}, },
{ {
title: 'User Name', title: "User Name",
align: "center", align: "center",
ellipsis: 200,
dataIndex: "userName", dataIndex: "userName",
key: "userName", key: "userName",
width:150,
ellipsis:true
// customRender: (record: any) => { // customRender: (record: any) => {
// let time = formatTime( // let time = formatTime(
// record.text / 1000, // record.text / 1000,
@@ -132,109 +138,125 @@ export default defineComponent({
// return time; // return time;
// }, // },
}, },
{ {
title: 'language', title: "language",
align: "center", align: "center",
ellipsis: true,
dataIndex: "language", dataIndex: "language",
key: "language", key: "language",
width:100,
ellipsis:true,
}, },
{ {
title: 'Valid Start Time', title: "Valid Start Time",
align: "center", align: "center",
ellipsis: true,
dataIndex: "validstartTime", dataIndex: "validstartTime",
key: "validstartTime", key: "validstartTime",
width:200,
ellipsis:true
}, },
{ {
title: 'Valid End Time', title: "Valid End Time",
align: "center", align: "center",
ellipsis: true,
dataIndex: "validendTime", dataIndex: "validendTime",
key: "validendTime", key: "validendTime",
width:200,
ellipsis:true
}, },
{ {
title: 'Country', title: "Country",
align: "center", align: "center",
ellipsis: true,
dataIndex: "country", dataIndex: "country",
key: "country", key: "country",
width:100,
}, },
{ {
title: 'Create Date', title: "Create Date",
align: "center", align: "center",
ellipsis: true,
dataIndex: "createDate", dataIndex: "createDate",
key: "createDate", key: "createDate",
width:200,
sorter: true,
}, },
{ {
title: 'Is Beginner', title: "Is Beginner",
align: "center", align: "center",
ellipsis: true,
dataIndex: "isBeginner", dataIndex: "isBeginner",
key: "isBeginner", key: "isBeginner",
customRender: (record: any) => { width:80,
let str ellipsis:true,
if(record.value == 1){ customRender: (record: any) => {
str ='Yes' let str;
}else{ if (record.value == 1) {
str ='No' str = "Yes";
} } else {
str = "No";
}
return str; return str;
}, },
}, },
{ {
title: 'Machine Room Ip', title: 'Machine Room Ip',
align: "center", align: "center",
ellipsis: true,
dataIndex: "browserIdentifiers", dataIndex: "browserIdentifiers",
key: "browserIdentifiers", key: "browserIdentifiers",
width:200,
sorter: true,
}, },
{ {
title: 'Credits', title: "Credits",
align: "center", align: "center",
ellipsis: true, // width: 150,
// width: 150, // minWidth: 100,
// minWidth: 100, // maxWidth: 200,
// maxWidth: 200, // resizable: true,
// resizable: true,
dataIndex: "credits", dataIndex: "credits",
key: "credits", key: "credits",
width:100,
sorter: true,
}, },
{ {
title: 'User Type', title: 'User Type',
align: "center", align: "center",
ellipsis: true, // width: 150,
// width: 150, // minWidth: 100,
// minWidth: 100, // maxWidth: 200,
// maxWidth: 200, // resizable: true,
// resizable: true,
dataIndex: "systemUser", dataIndex: "systemUser",
key: "systemUser", key: "systemUser",
customRender: (record: any) => { width:100,
let str customRender: (record: any) => {
if(record.value == 0){ let str;
str ='visitor' if (record.value == 0) {
}else if(record.value == 1){ str = "visitor";
str ='yearly' } else if (record.value == 1) {
}else if(record.value == 2){ str = "yearly";
str ='monthly' } else if (record.value == 2) {
}else if(record.value == 3){ str = "monthly";
str ='trial' } else if (record.value == 3) {
}else if(record.value == 4){ str = "trial";
str ='userInEvent' } else if (record.value == 4) {
} str = "userInEvent";
}
return str; return str;
}, },
}, },
]; ];
}); });
//改变页码 //改变页码
let changePage = (e: any) => { let changePage = (e: any, filters:any, sorter:any) => {
filterData.currentPage = e.current; filterData.currentPage = e.current;
filterData.pageSize = e.pageSize; filterData.pageSize = e.pageSize;
// gettrialList(); if(sorter.order){
if(sorter.columnKey == 'id'){
filterData.orderBy = 'id'
}else if(sorter.columnKey == "createDate"){
filterData.orderBy = 'time'
}else if(sorter.columnKey == "credits"){
filterData.orderBy = 'credits'
}
}
filterData.order = sorter.order == "descend" ? "Descending" : "Ascending";
gettrialList();
} }
//查询列表 //查询列表
@@ -257,9 +279,11 @@ export default defineComponent({
startTime:startDate, startTime:startDate,
size:filterData.pageSize, size:filterData.pageSize,
page:filterData.currentPage, page:filterData.currentPage,
userType:filterData.userType, systemUser:filterData.systemUser,
order: filterData.order,
orderBy: filterData.orderBy,
} }
Https.axiosGet(Https.httpUrls.recentNewUser,{params:data}).then((rv: any) => { Https.axiosPost(Https.httpUrls.recentNewUser,data).then((rv: any) => {
if (rv) { if (rv) {
// this.dataList = rv // this.dataList = rv
filter.dataList = rv.records filter.dataList = rv.records

3
src/component/Detail/DesignDetailAlter.vue
View File

@@ -468,6 +468,7 @@ export default defineComponent({
// return this.setGradientAngle(gradient) // return this.setGradientAngle(gradient)
return (gradient)=>{ return (gradient)=>{
let gradientStr = '' let gradientStr = ''
if(!gradient.gradientList)return
gradient.gradientList.sort((a, b) => { gradient.gradientList.sort((a, b) => {
let aArr = a.left.split('%')[0] let aArr = a.left.split('%')[0]
let bArr = b.left.split('%')[0] let bArr = b.left.split('%')[0]
@@ -917,7 +918,7 @@ export default defineComponent({
this.colorList[this.selectIndex].gradient = JSON.parse(JSON.stringify(this.gradient)) this.colorList[this.selectIndex].gradient = JSON.parse(JSON.stringify(this.gradient))
}else{ }else{
this.selectColor = {rgba:this.colorList[this.selectIndex].gradient.gradientList[0].rgba} 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) let colorList =this.colorList.filter((v) => v && Object.keys(v).length)
}, },

3
src/component/HomePage/ColorboardUpload.vue
View File

@@ -281,6 +281,7 @@ export default defineComponent({
// return this.setGradientAngle(gradient) // return this.setGradientAngle(gradient)
return (gradient)=>{ return (gradient)=>{
let gradientStr = '' let gradientStr = ''
if(!gradient.gradientList)return
gradient.gradientList.sort((a, b) => { gradient.gradientList.sort((a, b) => {
let aArr = a.left.split('%')[0] let aArr = a.left.split('%')[0]
let bArr = b.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)) this.colorList[this.selectIndex].gradient = JSON.parse(JSON.stringify(this.gradient))
}else{ }else{
this.selectColor = {rgba:this.colorList[this.selectIndex].gradient.gradientList[0].rgba} 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) let colorList =this.colorList.filter((v) => v && Object.keys(v).length)
this.setColorboardList(colorList) this.setColorboardList(colorList)

2
src/views/Administrator.vue
View File

@@ -131,7 +131,7 @@ export default defineComponent({
isShow:true, isShow:true,
children:[ children:[
{ {
name:'Trial All User', name:'All Trial User',
route:'/administrator/trialAllUser', route:'/administrator/trialAllUser',
icon:'usetime', icon:'usetime',
key:'sub3-1', key:'sub3-1',

1
src/views/HomeMain.vue
View File

@@ -330,6 +330,7 @@ export default defineComponent({
this.store.commit('clearSystemUser') this.store.commit('clearSystemUser')
// WriteCookie("token"); // WriteCookie("token");
clonAllCookie()
// window.location.reload() // window.location.reload()
}, },