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

fix

Browse Source
This commit is contained in:
X1627315083
2023-12-14 17:41:11 +08:00
parent f3d658ae49
commit a917bf66d2
4 changed files with 62 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1472,6 +1472,9 @@ export default defineComponent({
transform: translate(-.6rem,-.4rem);
}
}
.vc-chrome-alpha-wrap{
display: none;
}
.vc-chrome-hue-wrap{
margin-bottom: .5rem;
}

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

@@ -814,6 +814,9 @@ export default defineComponent({
transform: translate(-.6rem,-.4rem);
}
}
.vc-chrome-alpha-wrap{
display: none;
}
.vc-chrome-hue-wrap{
margin-bottom: .5rem;
}

6
src/tool/https.js
View File

@@ -161,6 +161,12 @@ export const Https = {
generateDislike:'/api/generate/dislike',//喜欢ganerate图片
elementUpload:`/api/element/upload`,//上传图片
sketchBoardsBoundingBox:`/api/design/sketchBoardsBoundingBox`,//裁剪sketch图片
trialOrderList:`/api/account/trialOrderList`,//获取审批列表
switchIsAutoApproval:`/api/account/switchIsAutoApproval`,//切换是否自动审批
switchIsAutoApproval:`/api/account/getIsAutoApproval`,//获取是否自动审批
trialOrderApproval:`/api/account/trialOrderApproval`,//通过审批
},
axiosGet(url,config) {

100
src/views/trialApproval.vue
View File

@@ -1,5 +1,5 @@
<template>
<div class="history_page">
<div class="trial_page">
<div class="page_content">
<img
class="page_content_bg"
@@ -7,21 +7,36 @@
/>
<div class="page_content_body">
<HeaderComponent></HeaderComponent>
<div class="history_page_body">
<div class="history_header">{{ $t('HistoryPage.History') }}</div>
<div class="history_table_search">
<div class="trial_page_body">
<div class="trial_table_search">
<a-range-picker class="range_picker" v-model:value="rangePickerValue" :placeholder="[$t('HistoryPage.StartDate'), $t('HistoryPage.EndDate')]" valueFormat="YYYY-MM-DD">
<template #suffixIcon>
<span class="icon iconfont range_picker_icon icon-rili"></span>
</template>
</a-range-picker>
<div class="trial_state">
<div>all</div>
<div class="header_user_content marLeft2">
<!-- <span class="icon iconfont icon-yuyan"></span> -->
<span class="username">123123</span>
<div
:class="[
'icon',
'iconfont',
'icon-xiala',
]"
@click.stop=""
></div>
</div>
</div>
<div class="content_search_block">
<input class="search_input" :placeholder="$t('HistoryPage.inputContent1')" v-model="searchCollectionName" @keydown.enter="searchHistoryList()">
<div class="search_icon_block" @click="searchHistoryList()"><span class="icon iconfont icon-sousuo"></span></div>
</div>
</div>
<div class="history_table_content" ref="historyTable">
<div class="trial_table_content" ref="historyTable">
<a-table :columns="columns" :data-source="collectionList" :scroll="{ y: historyTableHeight }" @change="changePage"
:pagination="{
showSizeChanger:true,
@@ -44,8 +59,6 @@
</div>
</div>
</div>
<HistoryDetail ref="historyDetail" :groupDetails="groupDetails" :collectionName="collectionName"></HistoryDetail>
<a-modal class="rename_modal_component"
v-model:visible="renameVisivle"
:footer="null"
@@ -62,7 +75,6 @@
<div class="rename_submit_button" @click="confrimRename()">{{ $t('HistoryPage.Submit') }}</div>
</div>
</a-modal>
<RobotAssist></RobotAssist>
</div>
</template>
<script lang="ts">
@@ -107,14 +119,14 @@ export default defineComponent({
});
let collectionList:any = ref([])
let userInfo:any = {}
let {t} = useI18n()
let status:any = ref(0)
return {
rangePickerValue,
columns,
collectionList,
renameData,
userInfo,
t,
status,
}
},
data(){
@@ -125,7 +137,6 @@ export default defineComponent({
historyTableHeight:0,
newCollectionName:'',
renameVisivle:false,//修改名字弹窗
groupDetails:{},//每个collection的详情
collectionName:'',//选中的名字
searchCollectionName:'',
}
@@ -133,7 +144,7 @@ export default defineComponent({
mounted(){
let historyTable:any = this.$refs.historyTable
this.historyTableHeight = historyTable.clientHeight - 130
this.getHistoryList()
this.gettrialList()
this.userInfo = JSON.parse((getCookie("userInfo") as any));
if(this.userInfo.userId == 83){
@@ -145,7 +156,6 @@ export default defineComponent({
},
methods:{
turnToDetail(record:any){
this.groupDetails = record.groupDetails
let historyDetail:any = this.$refs.historyDetail
this.collectionName = record.name
historyDetail.changeDetailShow()
@@ -156,33 +166,30 @@ export default defineComponent({
changePage(e:any){
this.currentPage = e.current
this.pageSize = e.pageSize
this.getHistoryList()
this.gettrialList()
},
//查询列表
searchHistoryList(){
this.currentPage = 1
this.getHistoryList()
this.gettrialList()
},
getHistoryList(){
let startDate:any = this.rangePickerValue ? new Date(this.rangePickerValue[0]).getTime(): ''
let endDate:any = this.rangePickerValue ? new Date(this.rangePickerValue[1]).getTime(): ''
let data = {
page:this.currentPage,
size:this.pageSize,
collectionName:this.searchCollectionName,
startDate:startDate,
endDate:endDate
}
Https.axiosPost( Https.httpUrls.queryUserGroup, data).then(
(rv: any) => {
this.collectionList = rv.content
this.total = rv.total
}
);
gettrialList(){
let startDate:any = this.rangePickerValue ? new Date(this.rangePickerValue[0]).getTime(): ''
let endDate:any = this.rangePickerValue ? new Date(this.rangePickerValue[1]).getTime(): ''
let data = {
page:this.currentPage,
size:this.pageSize,
status:0,
// startDate:startDate,
// endDate:endDate
}
Https.axiosPost( Https.httpUrls.trialOrderList, data).then(
(rv: any) => {
this.collectionList = rv.content
}
);
},
//删除分组
deleteGroup(record:any,index:number){
let deleteGroupFun = (id:any,index:number) =>{
@@ -191,13 +198,12 @@ export default defineComponent({
}
Https.axiosPost(Https.httpUrls.deleteUserGroup,data).then(
(rv: any) => {
message.success(this.t('HistoryPage.jsContent1'))
this.collectionList.splice(index,1)
}
);
}
Modal.confirm({
title: this.t('HistoryPage.jsContent2'),
title: '11',
icon: createVNode(ExclamationCircleOutlined),
okText: 'Yes',
cancelText: 'No',
@@ -227,7 +233,7 @@ export default defineComponent({
}
Https.axiosPost(Https.httpUrls.updateUserGroupName,data).then(
(rv: any) => {
message.success(this.t('HistoryPage.jsContent3'))
// message.success(this.t('HistoryPage.jsContent3'))
this.collectionList[this.renameData.index].name = this.newCollectionName
this.collectionList[this.renameData.index].updateDate = rv.updateDate
this.renameVisivle = false
@@ -244,7 +250,7 @@ export default defineComponent({
})
</script>
<style lang="less">
.history_page {
.trial_page {
width: 100%;
height: 100%;
padding: 0 9rem;
@@ -266,24 +272,15 @@ export default defineComponent({
height: 100%;
box-sizing: border-box;
.history_page_body{
.trial_page_body{
width: 100%;
height: calc(100% - 7rem);
padding: 0 2.5rem 4rem;
box-sizing: border-box;
.history_header{
font-size: 1.8rem;
height: 6.3rem;
line-height: 6.3rem;
font-weight: 500;
color: #333333;
}
.history_table_search{
.trial_table_search{
display: flex;
align-items: center;
margin-top: 5rem;
.range_picker{
width: 36rem;
height: 4.8rem;
@@ -330,9 +327,12 @@ export default defineComponent({
}
}
}
.trial_state{
}
}
.history_table_content{
.trial_table_content{
margin-top: 2.6rem;
width: 100%;
height: calc(100% - 13.7rem);