Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite
This commit is contained in:
@@ -12,7 +12,7 @@
|
|||||||
<div class="upload_item">
|
<div class="upload_item">
|
||||||
<div class="upload_file_item upload_component">
|
<div class="upload_file_item upload_component">
|
||||||
<a-upload
|
<a-upload
|
||||||
:action="uploadUrl + (upLoadHttpsUrl?upLoadHttpsUrl:'/aida/api/element/upload')"
|
:action="uploadUrl + (upLoadHttpsUrl?upLoadHttpsUrl:'/api/element/upload')"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:capture="null"
|
:capture="null"
|
||||||
:multiple="true"
|
:multiple="true"
|
||||||
|
|||||||
@@ -63,7 +63,7 @@
|
|||||||
<a-upload
|
<a-upload
|
||||||
class="search_upImg"
|
class="search_upImg"
|
||||||
:capture="null"
|
:capture="null"
|
||||||
:action="uploadUrl + '/aida/api/element/upload'"
|
:action="uploadUrl + '/api/element/upload'"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:data="{
|
:data="{
|
||||||
...upload
|
...upload
|
||||||
@@ -161,7 +161,7 @@
|
|||||||
<a-upload
|
<a-upload
|
||||||
class="search_upImg"
|
class="search_upImg"
|
||||||
:capture="null"
|
:capture="null"
|
||||||
:action="uploadUrl + '/aida/api/element/upload'"
|
:action="uploadUrl + '/api/element/upload'"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:data="{
|
:data="{
|
||||||
...upload
|
...upload
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
<div class="upload_file_item upload_component" v-show="fileList.length < 15">
|
<div class="upload_file_item upload_component" v-show="fileList.length < 15">
|
||||||
<a-upload
|
<a-upload
|
||||||
:capture="null"
|
:capture="null"
|
||||||
:action="uploadUrl + '/aida/api/element/upload'"
|
:action="uploadUrl + '/api/element/upload'"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:data="{
|
:data="{
|
||||||
...upload
|
...upload
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="upload_file_item upload_component" v-show="fileList.length < 10">
|
<div class="upload_file_item upload_component" v-show="fileList.length < 10">
|
||||||
<a-upload
|
<a-upload
|
||||||
:action="uploadUrl + '/aida/api/element/upload'"
|
:action="uploadUrl + '/api/element/upload'"
|
||||||
:capture="null"
|
:capture="null"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:data="{
|
:data="{
|
||||||
|
|||||||
@@ -103,7 +103,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<a-upload
|
<a-upload
|
||||||
:capture="null"
|
:capture="null"
|
||||||
:action="uploadUrl + '/aida/api/element/upload'"
|
:action="uploadUrl + '/api/element/upload'"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:data="{
|
:data="{
|
||||||
...upload,
|
...upload,
|
||||||
|
|||||||
@@ -45,7 +45,7 @@
|
|||||||
<div class="upload_item" v-show="uploadList.length < 1">
|
<div class="upload_item" v-show="uploadList.length < 1">
|
||||||
<div class="upload_file_item upload_component">
|
<div class="upload_file_item upload_component">
|
||||||
<a-upload
|
<a-upload
|
||||||
:action="uploadUrl + '/aida/api/history/brandLogoUpload'"
|
:action="uploadUrl + '/api/history/brandLogoUpload'"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:capture="null"
|
:capture="null"
|
||||||
:headers="{ Authorization: token }"
|
:headers="{ Authorization: token }"
|
||||||
|
|||||||
@@ -213,10 +213,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="upload_file_item upload_component">
|
<div class="upload_file_item upload_component">
|
||||||
<!-- :action="uploadUrl + '/aida/api/history/toProductImageElementUpload'" -->
|
<!-- :action="uploadUrl + '/api/history/toProductImageElementUpload'" -->
|
||||||
<a-upload
|
<a-upload
|
||||||
:action="
|
:action="
|
||||||
getUploadUrl() + '/aida/api/history/toProductImageElementUpload'
|
getUploadUrl() + '/api/history/toProductImageElementUpload'
|
||||||
"
|
"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:capture="null"
|
:capture="null"
|
||||||
|
|||||||
@@ -60,7 +60,7 @@
|
|||||||
>
|
>
|
||||||
|
|
||||||
<a-upload
|
<a-upload
|
||||||
:action="uploadUrl + '/aida/api/element/upload'"
|
:action="uploadUrl + '/api/element/upload'"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:capture="null"
|
:capture="null"
|
||||||
:data="{
|
:data="{
|
||||||
|
|||||||
@@ -54,7 +54,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="upload_file_item upload_component" v-show="printboardList.length < 16">
|
<div class="upload_file_item upload_component" v-show="printboardList.length < 16">
|
||||||
<a-upload
|
<a-upload
|
||||||
:action="uploadUrl + '/aida/api/element/upload'"
|
:action="uploadUrl + '/api/element/upload'"
|
||||||
:capture="null"
|
:capture="null"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:before-upload="beforeUpload"
|
:before-upload="beforeUpload"
|
||||||
@@ -415,7 +415,7 @@ export default defineComponent({
|
|||||||
file:data.originFileObj
|
file:data.originFileObj
|
||||||
}
|
}
|
||||||
let fileUid = data.uid
|
let fileUid = data.uid
|
||||||
Https.axiosPost('/aida/api/element/upload', new_data,{headers:{'Content-Type': 'multipart/form-data'}}).then(
|
Https.axiosPost('/api/element/upload', new_data,{headers:{'Content-Type': 'multipart/form-data'}}).then(
|
||||||
(rv: any) => {
|
(rv: any) => {
|
||||||
if (rv) {
|
if (rv) {
|
||||||
for(let file of this.fileList){
|
for(let file of this.fileList){
|
||||||
@@ -491,7 +491,7 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
this.isUpload = true
|
this.isUpload = true
|
||||||
const hide = message.loading('loading', 0);
|
const hide = message.loading('loading', 0);
|
||||||
Https.axiosPost('/aida/api/element/upload', new_data,{headers:{'Content-Type': 'multipart/form-data'}}).then(
|
Https.axiosPost('/api/element/upload', new_data,{headers:{'Content-Type': 'multipart/form-data'}}).then(
|
||||||
(rv: any) => {
|
(rv: any) => {
|
||||||
for(let file of this.fileList){
|
for(let file of this.fileList){
|
||||||
if(fileData.uid === file.uid){
|
if(fileData.uid === file.uid){
|
||||||
|
|||||||
@@ -70,7 +70,7 @@
|
|||||||
v-show="sketchboardList.length < 20"
|
v-show="sketchboardList.length < 20"
|
||||||
>
|
>
|
||||||
<a-upload
|
<a-upload
|
||||||
:action="uploadUrl + '/aida/api/element/upload'"
|
:action="uploadUrl + '/api/element/upload'"
|
||||||
:capture="null"
|
:capture="null"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:data="{
|
:data="{
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
:options="[{value:'product',label:'product'},{value:'sketch',label:'sketch'}]"
|
:options="[{value:'product',label:'product'},{value:'sketch',label:'sketch'}]"
|
||||||
></a-select>
|
></a-select>
|
||||||
</div> -->
|
</div> -->
|
||||||
<selectList @selectImgItem="selectImgItem" :deReconstructionList="segmentationTypeList" :isSegmentation="true" upLoadHttpsUrl="/aida/api/element/imageSegmentation" level1Type="Sketchboard" :randomId="false" type="sketch" :catecoryList="sketchCatecoryList">
|
<selectList @selectImgItem="selectImgItem" :deReconstructionList="segmentationTypeList" :isSegmentation="true" upLoadHttpsUrl="/api/element/imageSegmentation" level1Type="Sketchboard" :randomId="false" type="sketch" :catecoryList="sketchCatecoryList">
|
||||||
<template v-slot:selectSex>
|
<template v-slot:selectSex>
|
||||||
<div class="generalModel_state" style="margin-left: auto">
|
<div class="generalModel_state" style="margin-left: auto">
|
||||||
<div class="generalModel_state_item smail" style="margin-right: 0">
|
<div class="generalModel_state_item smail" style="margin-right: 0">
|
||||||
|
|||||||
@@ -390,7 +390,7 @@ export default defineComponent({
|
|||||||
// //fetch get请求携带token
|
// //fetch get请求携带token
|
||||||
|
|
||||||
|
|
||||||
// fetch("https://develop.api.aida.com.hk/aida/api/project/getThreeDGlb?threeDSimpleId=1", {
|
// fetch("https://develop.api.aida.com.hk/api/project/getThreeDGlb?threeDSimpleId=1", {
|
||||||
// headers:{
|
// headers:{
|
||||||
// authorization:'Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiI4OCIsInN1YiI6IntcImNvdW50cnlcIjpcIkNoaW5hXCIsXCJpZFwiOjg4LFwibGFuZ3VhZ2VcIjpcIkVOR0xJU0hcIixcInVzZXJuYW1lXCI6XCJzaGJcIn0iLCJpYXQiOjE3NDMzNDkwNjQsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE3NTE5ODkwNjR9.gmL0JufYy9wd23qCY-ibwhgpXZ2X68WAiHSeC99I4x7cipWyxLaQmuIBk2SJSdWBm0tTN2Mx-etXO9a7MtQmpw',
|
// authorization:'Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiI4OCIsInN1YiI6IntcImNvdW50cnlcIjpcIkNoaW5hXCIsXCJpZFwiOjg4LFwibGFuZ3VhZ2VcIjpcIkVOR0xJU0hcIixcInVzZXJuYW1lXCI6XCJzaGJcIn0iLCJpYXQiOjE3NDMzNDkwNjQsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE3NTE5ODkwNjR9.gmL0JufYy9wd23qCY-ibwhgpXZ2X68WAiHSeC99I4x7cipWyxLaQmuIBk2SJSdWBm0tTN2Mx-etXO9a7MtQmpw',
|
||||||
// }
|
// }
|
||||||
|
|||||||
@@ -78,7 +78,7 @@
|
|||||||
<div class="upload_file_item">
|
<div class="upload_file_item">
|
||||||
<a-upload
|
<a-upload
|
||||||
key="common"
|
key="common"
|
||||||
:action="getUploadUrl() + '/aida/api/history/toProductImageElementUpload'"
|
:action="getUploadUrl() + '/api/history/toProductImageElementUpload'"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:capture="null"
|
:capture="null"
|
||||||
:data="{
|
:data="{
|
||||||
@@ -111,7 +111,7 @@
|
|||||||
<a-upload
|
<a-upload
|
||||||
key="lastframes"
|
key="lastframes"
|
||||||
:action="
|
:action="
|
||||||
getUploadUrl() + '/aida/api/history/toProductImageElementUpload'
|
getUploadUrl() + '/api/history/toProductImageElementUpload'
|
||||||
"
|
"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:capture="null"
|
:capture="null"
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
<div class="upload_item item" v-show="!isDesignPage">
|
<div class="upload_item item" v-show="!isDesignPage">
|
||||||
<div class="upload_file_item">
|
<div class="upload_file_item">
|
||||||
<a-upload
|
<a-upload
|
||||||
:action="uploadUrl + '/aida/api/history/toProductImageElementUpload'"
|
:action="uploadUrl + '/api/history/toProductImageElementUpload'"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:capture="null"
|
:capture="null"
|
||||||
:data="{
|
:data="{
|
||||||
|
|||||||
@@ -471,7 +471,6 @@ export const Https = {
|
|||||||
uploadVideoComplete: '/api/global-award/uploads/video/complete', // 上传video完成
|
uploadVideoComplete: '/api/global-award/uploads/video/complete', // 上传video完成
|
||||||
submitForm: '/api/global-award/contestants/save', // 提交表单
|
submitForm: '/api/global-award/contestants/save', // 提交表单
|
||||||
getContestantByID: '/api/global-award/contestants/' // 获取表单
|
getContestantByID: '/api/global-award/contestants/' // 获取表单
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
axiosGet(url, config) {
|
axiosGet(url, config) {
|
||||||
|
|||||||
@@ -338,7 +338,7 @@
|
|||||||
<a-upload
|
<a-upload
|
||||||
class="search_upImg"
|
class="search_upImg"
|
||||||
:capture="null"
|
:capture="null"
|
||||||
:action="uploadUrl + '/aida/api/element/upload'"
|
:action="uploadUrl + '/api/element/upload'"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:before-upload="beforeUpload"
|
:before-upload="beforeUpload"
|
||||||
:data="{
|
:data="{
|
||||||
@@ -387,7 +387,7 @@
|
|||||||
<a-upload
|
<a-upload
|
||||||
class="search_upImg"
|
class="search_upImg"
|
||||||
:capture="null"
|
:capture="null"
|
||||||
:action="uploadUrl + '/aida/api/element/upload'"
|
:action="uploadUrl + '/api/element/upload'"
|
||||||
list-type="picture-card"
|
list-type="picture-card"
|
||||||
:data="{
|
:data="{
|
||||||
...upload,
|
...upload,
|
||||||
|
|||||||
Reference in New Issue
Block a user