style: 历史列表操作菜单排版,颜色版上传/从收藏选择图片排版
This commit is contained in:
@@ -1,12 +1,6 @@
|
||||
<<<<<<< HEAD
|
||||
VITE_USER_NODE_ENV = 'development'
|
||||
VITE_APP_BASE_URL = 'https://test.api.aida.com.hk'
|
||||
# VITE_APP_BASE_URL = 'https://api.aida.com.hk'
|
||||
=======
|
||||
NODE_ENV = 'development'
|
||||
# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
|
||||
VUE_APP_BASE_URL = 'https://test.api.aida.com.hk'
|
||||
>>>>>>> 5d8304ce3ece21dd3200ffffb0c76e3ef55dd213
|
||||
|
||||
# VITE_APP_BASE_URL = 'http://18.167.251.121:10086'
|
||||
# VITE_APP_BASE_URL = 'http://192.168.1.9:5567'
|
||||
|
||||
2
components.d.ts
vendored
2
components.d.ts
vendored
@@ -18,6 +18,7 @@ declare module 'vue' {
|
||||
AMenu: typeof import('ant-design-vue/es')['Menu']
|
||||
AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
|
||||
AModal: typeof import('ant-design-vue/es')['Modal']
|
||||
APagination: typeof import('ant-design-vue/es')['Pagination']
|
||||
APopover: typeof import('ant-design-vue/es')['Popover']
|
||||
ARangePicker: typeof import('ant-design-vue/es')['RangePicker']
|
||||
ASelect: typeof import('ant-design-vue/es')['Select']
|
||||
@@ -27,6 +28,7 @@ declare module 'vue' {
|
||||
ASwitch: typeof import('ant-design-vue/es')['Switch']
|
||||
ATable: typeof import('ant-design-vue/es')['Table']
|
||||
AUpload: typeof import('ant-design-vue/es')['Upload']
|
||||
ElCascader: typeof import('element-plus/es')['ElCascader']
|
||||
RouterLink: typeof import('vue-router')['RouterLink']
|
||||
RouterView: typeof import('vue-router')['RouterView']
|
||||
}
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="detailText">{{$t('DesignPrintOperation.Colorfromimage')}}</div>
|
||||
<div class="uploadImage flex flex-align-center flex-justify-around">
|
||||
<div class="upload-container flex flex-column flex-align-center" :class="{'hide': !showLibrary}">
|
||||
<div class="uploadImage flex flex-align-center flex-justify-center">
|
||||
<div class="upload-container" :class="{'hide': !showLibrary}">
|
||||
<upload ref="uploadRef" @selectUplpadColor="selectUplpadColor" @selectFile="showLibrary = false" @deleteColor="showLibrary = true"></upload>
|
||||
<div class="upload-text" v-show="showLibrary"> {{ $t('LibraryPage.Upload') }} </div>
|
||||
</div>
|
||||
<div class="upload-container flex flex-column flex-align-center" v-show="showLibrary">
|
||||
<div class="upload-container " v-show="showLibrary">
|
||||
<!-- <i class="fi fi-rr-followcollection"></i> -->
|
||||
<SvgIcon name="CLibrary" size="40" @click="handleOpenLibrary" />
|
||||
<SvgIcon name="CLibrary" class="svg-btn" size="20" @click="handleOpenLibrary" />
|
||||
<div class="upload-text"> {{ $t('LibraryPage.library') }} </div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -268,9 +268,7 @@ export default defineComponent({
|
||||
selectImages.value.init()
|
||||
}
|
||||
const handleImageSelect = (item:any)=>{
|
||||
console.log('item',item)
|
||||
UrlToFile(item.url,item.name).then((file:any)=>{
|
||||
console.log('file',file)
|
||||
// 构造符合 fileUploadChange 期望的数据结构
|
||||
const fileData = {
|
||||
file: {
|
||||
@@ -280,7 +278,6 @@ export default defineComponent({
|
||||
}
|
||||
uploadRef.value.fileUploadChange(fileData)
|
||||
})
|
||||
// uploadRef.value.selectColor(item)
|
||||
}
|
||||
const handleShowListChange=(val:boolean)=>{
|
||||
console.log('val',val)
|
||||
@@ -451,12 +448,17 @@ export default defineComponent({
|
||||
height: 10rem;
|
||||
width: 100%;
|
||||
border-radius: .5rem;
|
||||
column-gap: 2rem;
|
||||
.upload-container{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-evenly;
|
||||
align-items: center;
|
||||
background-color: #EDEDED;
|
||||
padding: 1rem 2rem;
|
||||
border-radius: 1rem;
|
||||
width: 8rem;
|
||||
height: 8rem;
|
||||
width: 7rem;
|
||||
height: 7rem;
|
||||
// row-gap: 1rem;
|
||||
&.hide{
|
||||
width: initial;
|
||||
height: initial;
|
||||
@@ -466,6 +468,11 @@ export default defineComponent({
|
||||
background-color: transparent;
|
||||
padding-left: 1rem;
|
||||
}
|
||||
.svg-btn{
|
||||
cursor: pointer;
|
||||
width: initial;
|
||||
height: initial;
|
||||
}
|
||||
:deep(.ant-upload){
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
@@ -181,8 +181,8 @@ export default defineComponent({
|
||||
<style lang="less" scoped>
|
||||
.upload{
|
||||
// width: 34rem;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
// width: 100%;
|
||||
// height: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
:deep(.ant-upload-picture-card-wrapper){
|
||||
@@ -204,7 +204,7 @@ export default defineComponent({
|
||||
}
|
||||
.upload_tip_block{
|
||||
i{
|
||||
font-size: 4rem;
|
||||
font-size: 2rem;
|
||||
display: flex;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,20 +30,14 @@
|
||||
<div class="operate_list" v-if="column?.Operations">
|
||||
<div
|
||||
class="operate_item"
|
||||
v-if="
|
||||
record.process ==='SERIES_DESIGN' ||
|
||||
record.process ==='SINGLE_DESIGN'
|
||||
"
|
||||
:class="{ 'operate_item_hidden': !(record.process ==='SERIES_DESIGN' || record.process ==='SINGLE_DESIGN') }"
|
||||
@click="turnToDetail(record)"
|
||||
>
|
||||
{{ $t('HistoryPage.Detail') }}
|
||||
</div>
|
||||
<div
|
||||
class="operate_item"
|
||||
v-if="
|
||||
record.process ==='SERIES_DESIGN' ||
|
||||
record.process ==='SINGLE_DESIGN'
|
||||
"
|
||||
:class="{ 'operate_item_hidden': !(record.process ==='SERIES_DESIGN' || record.process ==='SINGLE_DESIGN') }"
|
||||
@click="renameCollection(record, index)"
|
||||
>
|
||||
{{ $t('LibraryPage.Rename') }}
|
||||
@@ -725,6 +719,11 @@ export default defineComponent({
|
||||
font-weight: 400;
|
||||
color: #007ee5;
|
||||
cursor: pointer;
|
||||
|
||||
&.operate_item_hidden {
|
||||
visibility: hidden;
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user