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

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

Browse Source
This commit is contained in:
X1627315083
2024-08-13 09:36:32 +08:00
parent a0c3b06b80 3eb8754e0c
commit a8ab30f30c
15 changed files with 305 additions and 131 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://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'

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

@@ -1096,7 +1096,7 @@ li {
margin-right: 15px;
flex-shrink: 0;
display: block;
width: 100px;
width: 10rem;
text-align: right;
}
.admin_page .admin_state_item > input {
@@ -1144,13 +1144,13 @@ li {
.admin_page .admin_table_search .admin_state_list .admin_state_list_item {
cursor: pointer;
width: auto;
border-radius: 1rem;
padding: 1rem 2rem;
border-radius: 10px;
padding: 5px 10px;
border: 1px solid #b6b6b6;
background: #39215b;
color: #fff;
margin: 0 2rem 2rem 0;
font-size: 1.8rem;
margin: 0 10px 10px 0;
font-size: 1.4rem;
font-weight: 600;
}
.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 {
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 {
background: #ffffff;
border-bottom: none;

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

@@ -1224,7 +1224,8 @@ input:focus{
flex-shrink: 0;
display: block;
// min-width: 20%;
width: 100px;
// width: 100px;
width: 10rem;
text-align: right;
}
>input{
@@ -1273,13 +1274,13 @@ input:focus{
.admin_state_list_item{
cursor: pointer;
width: auto;
border-radius: 1rem;
padding: 1rem 2rem;
border-radius: 10px;
padding: 5px 10px;
border: 1px solid #b6b6b6;
background: #39215b;
color: #fff;
margin: 0 2rem 2rem 0;
font-size: 1.8rem;
margin: 0 10px 10px 0;
font-size: 1.4rem;
font-weight: 600;
}
.admin_state_list_item:last-child{
@@ -1339,10 +1340,21 @@ input:focus{
overflow-y: auto !important;
-ms-overflow-style: none;
overflow: -moz-scrollbars-none;
&::-webkit-scrollbar {
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 {
background: #ffffff;

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

@@ -187,17 +187,21 @@ export default defineComponent({
value: "",
},
{
label: "visitor",
value: "1",
},
{
label: "trial",
value: "2",
},
{
label: "official",
value: "3",
},
label:'visitor',
value:'0',
},
{
label:'yearly',
value:'1',
},
{
label:'monthly',
value:'2',
},
{
label:'trial',
value:'3',
},
{
label: "userInEvent",
value: "4",
@@ -249,18 +253,32 @@ export default defineComponent({
{
title: "Valid Start Time",
align: "center",
dataIndex: "validstartTime",
dataIndex: "validStartTime",
key: "validstartTime",
width:200,
ellipsis:true
ellipsis:true,
customRender: (record: any) => {
let time = ''
if(record.text){
time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
}
return time
},
},
{
title: "Valid End Time",
align: "center",
dataIndex: "validendTime",
dataIndex: "validEndTime",
key: "validendTime",
width:200,
ellipsis:true
ellipsis:true,
customRender: (record: any) => {
let time = ''
if(record.text){
time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
}
return time
},
},
{
title: "Country",
@@ -300,7 +318,6 @@ export default defineComponent({
dataIndex: "browserIdentifiers",
key: "browserIdentifiers",
width:200,
sorter: true,
},
{
title: "Credits",

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

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

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

@@ -4,7 +4,7 @@
<div class="admin_state">
<div class="admin_state_item">
<span>State Time:</span>
<span>Start Time:</span>
<a-range-picker
style="width:280px"
class="range_picker"

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

@@ -4,7 +4,7 @@
<div class="admin_state">
<div class="admin_state_item">
<span>State Time:</span>
<span>Start Time:</span>
<a-range-picker
style="width:280px"
class="range_picker"
@@ -73,6 +73,8 @@ export default defineComponent({
currentPage: 1,
pageSize: 10,
total: 0,
order: "", //'Ascending 升序 Descending 降序'
orderBy:'',
})
let renameData: any = ref({}); //修改名字选中的数据
const columns: any = computed(() => {
@@ -120,18 +122,32 @@ export default defineComponent({
{
title: "Valid Start Time",
align: "center",
dataIndex: "validstartTime",
dataIndex: "validStartTime",
key: "validstartTime",
width:200,
ellipsis:true
ellipsis:true,
customRender: (record: any) => {
let time = ''
if(record.text){
time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
}
return time
},
},
{
title: "Valid End Time",
align: "center",
dataIndex: "validendTime",
dataIndex: "validEndTime",
key: "validendTime",
width:200,
ellipsis:true
ellipsis:true,
customRender: (record: any) => {
let time = ''
if(record.text){
time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
}
return time
},
},
{
title: "Country",
@@ -171,7 +187,6 @@ export default defineComponent({
dataIndex: "browserIdentifiers",
key: "browserIdentifiers",
width:200,
sorter: true,
},
{
title: "Credits",
@@ -215,10 +230,20 @@ export default defineComponent({
];
});
//改变页码
let changePage = (e: any) => {
let changePage = (e: any, filters:any, sorter:any) => {
filterData.currentPage = e.current;
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 +266,10 @@ export default defineComponent({
startTime:startDate,
size:filterData.pageSize,
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) {
// this.dataList = rv
filter.dataList = rv.records

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

@@ -4,7 +4,7 @@
<div class="admin_state">
<div class="admin_state_item">
<span>State Time:</span>
<span>Start Time:</span>
<a-range-picker
style="width:280px"
class="range_picker"

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

@@ -4,7 +4,7 @@
<div class="admin_state">
<div class="admin_state_item">
<span>State Time:</span>
<span>Start Time:</span>
<a-range-picker
style="width:280px"
class="range_picker"
@@ -25,7 +25,7 @@
</div>
<div class="admin_state_item">
<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 class="admin_search">
@@ -46,6 +46,7 @@
:data-source="dataList"
:scroll="{ y: historyTableHeight }"
@change="changePage"
:showSorterTooltip='false'
:pagination="{
showSizeChanger: true,
current: currentPage,
@@ -76,7 +77,9 @@ export default defineComponent({
currentPage: 1,
pageSize: 10,
total: 0,
userType:'',
systemUser:'',
order: "", //'Ascending 升序 Descending 降序'
orderBy:'',
})
let state:any = ref([
{
@@ -103,27 +106,30 @@ export default defineComponent({
let renameData: any = ref({}); //修改名字选中的数据
const columns: any = computed(() => {
return [
{
title: 'User Id',
{
title: "User Id",
align: "center",
ellipsis: true,
dataIndex: "id",
key: "id",
fixed: 'left'
width:100,
fixed: "left",
sorter: true,
},
{
title: 'Email',
title: "Email",
align: "center",
ellipsis: true,
dataIndex: "userEmail",
key: "userEmail",
width:200,
ellipsis:true
},
{
title: 'User Name',
{
title: "User Name",
align: "center",
ellipsis: 200,
dataIndex: "userName",
key: "userName",
width:150,
ellipsis:true
// customRender: (record: any) => {
// let time = formatTime(
// record.text / 1000,
@@ -132,109 +138,138 @@ export default defineComponent({
// return time;
// },
},
{
title: 'language',
{
title: "language",
align: "center",
ellipsis: true,
dataIndex: "language",
key: "language",
width:100,
ellipsis:true,
},
{
title: 'Valid Start Time',
title: "Valid Start Time",
align: "center",
ellipsis: true,
dataIndex: "validstartTime",
dataIndex: "validStartTime",
key: "validstartTime",
width:200,
ellipsis:true,
customRender: (record: any) => {
let time = ''
if(record.text){
time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
}
return time
},
},
{
title: 'Valid End Time',
{
title: "Valid End Time",
align: "center",
ellipsis: true,
dataIndex: "validendTime",
dataIndex: "validEndTime",
key: "validendTime",
width:200,
ellipsis:true,
customRender: (record: any) => {
let time = ''
if(record.text){
time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
}
return time
},
},
{
title: 'Country',
{
title: "Country",
align: "center",
ellipsis: true,
dataIndex: "country",
key: "country",
width:100,
},
{
title: 'Create Date',
{
title: "Create Date",
align: "center",
ellipsis: true,
dataIndex: "createDate",
key: "createDate",
width:200,
sorter: true,
},
{
title: 'Is Beginner',
{
title: "Is Beginner",
align: "center",
ellipsis: true,
dataIndex: "isBeginner",
key: "isBeginner",
customRender: (record: any) => {
let str
if(record.value == 1){
str ='Yes'
}else{
str ='No'
}
width:80,
ellipsis:true,
customRender: (record: any) => {
let str;
if (record.value == 1) {
str = "Yes";
} else {
str = "No";
}
return str;
},
},
{
{
title: 'Machine Room Ip',
align: "center",
ellipsis: true,
dataIndex: "browserIdentifiers",
key: "browserIdentifiers",
width:200,
},
{
title: 'Credits',
{
title: "Credits",
align: "center",
ellipsis: true,
// width: 150,
// minWidth: 100,
// maxWidth: 200,
// resizable: true,
// width: 150,
// minWidth: 100,
// maxWidth: 200,
// resizable: true,
dataIndex: "credits",
key: "credits",
width:100,
sorter: true,
},
{
{
title: 'User Type',
align: "center",
ellipsis: true,
// width: 150,
// minWidth: 100,
// maxWidth: 200,
// resizable: true,
// width: 150,
// minWidth: 100,
// maxWidth: 200,
// resizable: true,
dataIndex: "systemUser",
key: "systemUser",
customRender: (record: any) => {
let str
if(record.value == 0){
str ='visitor'
}else if(record.value == 1){
str ='yearly'
}else if(record.value == 2){
str ='monthly'
}else if(record.value == 3){
str ='trial'
}else if(record.value == 4){
str ='userInEvent'
}
width:100,
customRender: (record: any) => {
let str;
if (record.value == 0) {
str = "visitor";
} else if (record.value == 1) {
str = "yearly";
} else if (record.value == 2) {
str = "monthly";
} else if (record.value == 3) {
str = "trial";
} else if (record.value == 4) {
str = "userInEvent";
}
return str;
},
},
];
});
//改变页码
let changePage = (e: any) => {
let changePage = (e: any, filters:any, sorter:any) => {
filterData.currentPage = e.current;
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 +292,11 @@ export default defineComponent({
startTime:startDate,
size:filterData.pageSize,
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) {
// this.dataList = rv
filter.dataList = rv.records

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

@@ -4,7 +4,7 @@
<div class="admin_state">
<div class="admin_state_item">
<span>State Time:</span>
<span>Start Time:</span>
<a-range-picker
style="width:280px"
class="range_picker"

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

@@ -468,6 +468,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]
@@ -917,7 +918,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)
},

33
src/component/Detail/DesignPrintOperation.vue
View File

@@ -318,13 +318,16 @@ export default defineComponent({
this.sketch.height = skecth.height/10+'rem'
skecth.remove()
}
if(this.exhibitionOpenrtionList.overall.length > 0){
if(this.exhibitionOpenrtionList.overall.length > 0 && !this.overallSingle){
let str = 'overall'
this.exhibitionOpenrtionList[str].forEach((item,index)=>{
this.setTemplate(item,index,str)
})
}else if(!this.overallSingle){
let str = 'overall'
this.setOverallPosition(0,str)
}
if(this.exhibitionOpenrtionList.single.length > 0){
if(this.exhibitionOpenrtionList.single.length > 0 && this.overallSingle){
let str = 'single'
this.exhibitionOpenrtionList[str].forEach((item,index)=>{
this.setTemplate(item,index,str)
@@ -664,6 +667,32 @@ export default defineComponent({
designOpenrtionBtn:false
}
},
setOverallPosition(index,str){
nextTick(()=>{
let sketch = document.getElementsByClassName("designOpenrtion_modal")[0]?.getElementsByClassName('designOpenrtion_sketch')[0]
this.printStyleList[str][index]={
centers:{
left:0,
top:0,
},
style:{
left:sketch.offsetWidth / 2 +'px',
top:sketch.offsetHeight / 2 +'px',
right:"auto",
bottom:"auto",
width:'auto',
height:'auto',
zIndex:1
},
transform:{
// scale:scale<.2?.2:scale,//0.2-3
rotateZ:0,
},
designOpenrtionBtn:false
}
})
},
computeZindex(resolve,prints){
prints.sort((a, b) => {
var a_num = a.priority;

38
src/component/Detail/DesignPrintOperationMobile.vue
View File

@@ -98,7 +98,7 @@
<img crossOrigin="anonymous" :src="item?.path" :style="{transform:`rotateZ(${printStyleList[index]?.transform?.rotateZ}deg)`}" class="designOpenrtionMobile_imgItme" draggable="false">
</div>
</div>
<img :src="operationCurrent?.undividedLayer?operationCurrent.undividedLayer:operationCurrent.path" alt="" class="designOpenrtion_sketch">
<img :src="operationCurrent?.undividedLayer?operationCurrent.undividedLayer:operationCurrent.path" alt="" class="designOpenrtionMobile_sketch">
<div class="designOpenrtionMobile_btn">
<ul v-if="overallSingle" v-for="item,index in printStyleList[stateOverallSingle]" :key="item" :class="{active:item?.designOpenrtionBtn?item?.designOpenrtionBtn:false}" class="designOpenrtionMobile_Mousingle" :style="item.style" @touchstart.stop="itemMoveMousedown(index,$event)">
<li class="designOpenrtionMobile_btn_top" @touchstart.stop="itemSizeMousedown('top',$event)"></li>
@@ -309,7 +309,7 @@ export default defineComponent({
if(this.$parent.elementsList)this.designList = JSON.parse(JSON.stringify(this.$parent.printsList))
if(this.overallSingle == false && this.designOpenrtionList.length > 0){
this.designOpenrtionList[0].checked = true
}else{
}else if(this.overallSingle == false && this.designOpenrtionList.length == 0){
this.setpitch(this.designList[0],0)
}
let skecth = new Image
@@ -319,13 +319,16 @@ export default defineComponent({
this.sketch.height = skecth.height/10+'rem'
skecth.remove()
}
if(this.exhibitionOpenrtionList.overall.length > 0){
if(this.exhibitionOpenrtionList.overall.length > 0 && !this.overallSingle){
let str = 'overall'
this.exhibitionOpenrtionList[str].forEach((item,index)=>{
this.setTemplate(item,index,str)
})
}else if(!this.overallSingle){
let str = 'overall'
this.setOverallPosition(0,str)
}
if(this.exhibitionOpenrtionList.single.length > 0){
if(this.exhibitionOpenrtionList.single.length > 0 && this.overallSingle){
let str = 'single'
this.exhibitionOpenrtionList[str].forEach((item,index)=>{
this.setTemplate(item,index,str)
@@ -668,7 +671,34 @@ export default defineComponent({
},
designOpenrtionBtn:false
}
},
setOverallPosition(index,str){
nextTick(()=>{
let sketch = document.getElementsByClassName("designOpenrtionMobile_modal")[0]?.getElementsByClassName('designOpenrtionMobile_sketch')[0]
this.printStyleList[str][index]={
centers:{
left:0,
top:0,
},
style:{
left:sketch.offsetWidth / 2 +'px',
top:sketch.offsetHeight / 2 +'px',
right:"auto",
bottom:"auto",
width:'auto',
height:'auto',
zIndex:1
},
transform:{
// scale:scale<.2?.2:scale,//0.2-3
rotateZ:0,
},
designOpenrtionBtn:false
}
})
},
computeZindex(resolve,prints){
prints.sort((a, b) => {
var a_num = a.priority;

4
src/views/Administrator.vue
View File

@@ -131,7 +131,7 @@ export default defineComponent({
isShow:true,
children:[
{
name:'Trial All User',
name:'All Trial User',
route:'/administrator/trialAllUser',
icon:'usetime',
key:'sub3-1',
@@ -215,7 +215,7 @@ export default defineComponent({
}],
openKeys: [],
selectedKeys: ['sub1'],
nowPageName:'Trial User',//当前页面名称
nowPageName:'All User',//当前页面名称
});
let routers:any = ref([])

1
src/views/HomeMain.vue
View File

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