@@ -286,33 +286,14 @@ export default defineComponent({
},
mousewheel:{
mounted (el) {
- let parent = el.parentNode
- // el.style.width='100%'
- // el.style.height='100%'
- let num = 0
- let width = el.offsetWidth
- let parentWidth = parent.offsetWidth
-
- el.addEventListener('mouseover',()=>{
- width = el.offsetWidth
- parentWidth = parent.offsetWidth
- })
- el.addEventListener('mousewheel',(e:MouseEvent)=>{
-
- if(0>(e as WheelEvent).deltaY && width>parentWidth){
- num+=15
- if(num >= 0){
- num = 0
- }
- }else if(0<(e as WheelEvent).deltaY && width>parentWidth){
- num-=15
- if(num<=parentWidth - width){
- num = parentWidth - width
- }
-
+ el.addEventListener('wheel',(e:WheelEvent)=>{
+ let num = 0
+ if(e.deltaY > 0){
+ num = 25
+ }else{
+ num = -25
}
-
- el.style.marginLeft = num+'px'
+ el.scrollBy(num, 0);
})
}
}
@@ -867,6 +848,34 @@ export default defineComponent({
display: flex;
flex: 1;
align-items: center;
+ overflow-x: auto;
+ &.model_img::-webkit-scrollbar {
+ /* 竖轴的宽度 */
+ width: 1rem;
+ /* 横轴的高度 */
+ height: 1rem;
+ transition: all .3s;
+ }
+ /* 进度 */
+ &.model_img::-webkit-scrollbar-thumb {
+ border-radius: 1rem;
+ background: rgba(238, 238, 244, 0);
+ }
+ /* 轨道 */
+ &.model_img::-webkit-scrollbar-track {
+ border-radius: 1rem;
+ background: rgba(238, 238, 244, 0);
+ }
+ &.model_img:hover {
+ // overflow-x: scroll;
+ &.model_img::-webkit-scrollbar-thumb {
+ background: #543087;
+ }
+ /* 轨道 */
+ &.model_img::-webkit-scrollbar-track {
+ background: rgba(84, 48, 135,.2);
+ }
+ }
>div{
display: flex;
diff --git a/src/component/Detail/setDesignItem.vue b/src/component/Detail/setDesignItem.vue
index 1866682c..c4102ac8 100644
--- a/src/component/Detail/setDesignItem.vue
+++ b/src/component/Detail/setDesignItem.vue
@@ -376,6 +376,7 @@ export default defineComponent({
this.loadingShow = false
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
designItemDetail.designItemUrl = rv.designItemUrl
+ designItemDetail.ifSubmit = true
designItemDetail.currentFullBodyView = rv.currentFullBodyView
rv.clothes.forEach((item)=>{
designItemDetail.clothes.forEach((i)=>{
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 0b452093..8d4f8d2f 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -270,15 +270,8 @@ export default defineComponent({
type1: "generate",
type2: prop.msg,
},
- workspaceCom:{}
};
},
- watch:{
- workspaceCom(newVal,oldVal){
- this.workspace = newVal
- this.getPosition()
- },
- },
mounted() {
// this.fileList.forEach((item,index)=>{
// item.checked = true
@@ -288,9 +281,6 @@ export default defineComponent({
// this.store.commit("addGenerateFils", this.fileList);
this.token = getCookie("token") || "";
this.uploadUrl = getUploadUrl();
- this.workspaceCom = computed(()=>{
- return this.store?.state?.Workspace?.workspace
- })
},
computed: {
getSketchLabel(value: any) {
@@ -312,28 +302,7 @@ export default defineComponent({
data.resData = JSON.parse(JSON.stringify(data))
this.store.commit("addGenerateMaterialFils", data);
},
- getPosition(){
- let params
- if(this.workspace.sex == 'Female'){
- params = 'FemalePosition'
- }else{
- params = 'MalePosition'
- }
- Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
- if (rv) {
- let arr:any = []
- rv.forEach((item:any) => {
- let obj = {
- value:item.name,
- label:item.name,
- }
- arr.push(obj)
- });
-
- this.sketchCatecoryList = arr
- }
- })
- },
+
beforeUpload(file: any) {
const isJpgOrPng =
file.type === "image/jpeg" ||
@@ -493,7 +462,6 @@ export default defineComponent({
}
},
likeFile(item:any,str:string){
-
if(str == 'like'){
let data = {
generateDetailId:item.id,
diff --git a/src/component/HomePage/Material.vue b/src/component/HomePage/Material.vue
index 963017aa..a4c2350d 100644
--- a/src/component/HomePage/Material.vue
+++ b/src/component/HomePage/Material.vue
@@ -125,7 +125,6 @@ export default defineComponent({
type2:prop.msg
},
store: useStore(),
- workspaceCom:{}
}
},
directives:{
@@ -175,9 +174,7 @@ export default defineComponent({
},
},
mounted () {
- this.workspaceCom = computed(()=>{
- return this.store?.state?.Workspace?.workspace
- })
+
// let loding = document.getElementsByClassName("material_content_list_loding")[0]
// let bodyLoding = document.getElementsByClassName("material_content_body")[0]
// const ob = new IntersectionObserver(callback,{
@@ -200,10 +197,6 @@ export default defineComponent({
// }
},
watch:{
- workspaceCom(newVal,oldVal){
- this.workspace = newVal
- this.getPosition()
- },
sketchboardList:{
handler(newVal:any,oldVal:any){
// this.store.state.Workspace.workspace
@@ -260,27 +253,6 @@ export default defineComponent({
this.getLibraryList()
},
- getPosition(){
- let params
- if(this.workspace.sex == 'Female'){
- params = 'FemalePosition'
- }else{
- params = 'MalePosition'
- }
- Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
- if (rv) {
- let arr:any = []
- rv.forEach((item:any) => {
- let obj = {
- value:item.name,
- label:item.name,
- }
- arr.push(obj)
- });
- this.disignTypeList = arr
- }
- })
- },
selectImgItem(imgData:any){
imgData.type_ = this.type_
imgData.resData = JSON.parse(JSON.stringify(imgData))
@@ -341,7 +313,6 @@ export default defineComponent({
}
aa.push(item)
});
-
this.imgList = aa
this.total = rv.total
this.isShowLoading = false
diff --git a/src/component/HomePage/RobotAssist.vue b/src/component/HomePage/RobotAssist.vue
index 3534ba19..02892ac0 100644
--- a/src/component/HomePage/RobotAssist.vue
+++ b/src/component/HomePage/RobotAssist.vue
@@ -241,10 +241,10 @@ export default defineComponent({
this.clearTimer()
this.timeTop = setInterval(() => {
this.robotTop = false
- }, 10000);
+ }, 15000);
this.timeInput = setInterval(() => {
this.robotInput = false
- }, 5000);
+ }, 10000);
}
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue
index 75a4c074..6925f765 100644
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -346,6 +346,7 @@ export default defineComponent({
}else{
params = 'MalePosition'
}
+
Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
if (rv) {
let arr:any = []
@@ -356,6 +357,8 @@ export default defineComponent({
}
arr.push(obj)
});
+ (this.$refs.Generate as any).sketchCatecoryList = arr
+ (this.$refs.Material as any).disignTypeList = arr
this.sketchCatecoryList = arr
}
diff --git a/src/component/LibraryPage/ModelPlacement.vue b/src/component/LibraryPage/ModelPlacement.vue
index cfc5d93d..ad37ec2d 100644
--- a/src/component/LibraryPage/ModelPlacement.vue
+++ b/src/component/LibraryPage/ModelPlacement.vue
@@ -154,7 +154,7 @@ export default defineComponent({
placement_sacle:30,
perviewUrl:'',//预览的图片地址
isShowMark:false,
- modelType:'library',
+ modelType:'Library',
sex:'Male',
sexList: [
@@ -220,7 +220,7 @@ export default defineComponent({
},
{
title:'HAND',
- pointList:[{type:'handLeft',color:'#CCFF7B',show:true,field:'hand'},{type:'handRight',color:'#CCFF7B',show:true,field:'hand'}]
+ pointList:[{type:'handLeft',color:'#d88e8e',show:true,field:'hand'},{type:'handRight',color:'#d88e8e',show:true,field:'hand'}]
},
]
if(this.printObject.templateId){//编辑
@@ -604,6 +604,7 @@ export default defineComponent({
width: 100%;
.ant-select-selector{
padding: 0;
+ width: 100%;
margin: 0;
background: rgba(0, 0, 0, 0);
font-size: 1.3rem;
@@ -615,6 +616,10 @@ export default defineComponent({
.ant-select-selection-item, .select_block .ant-select-single .ant-select-selector .ant-select-selection-placeholder{
font-weight: 300 !important;
line-height: 1.5715 !important;
+ width: 100%;
+ display: block;
+ position: relative;
+ padding: 0;
}
}
diff --git a/src/tool/GO.ts b/src/tool/GO.ts
index 289a6364..26cc176e 100644
--- a/src/tool/GO.ts
+++ b/src/tool/GO.ts
@@ -51,6 +51,10 @@ export default {
})
}
})
-
},
+ // magnifying(normalEl,binEl,mouseWH:any){
+ // let mouseW = mouseWH.width?mouseWH.width:10+'rem'
+ // let mouseH = mouseWH.height?mouseWH.height:10+'rem'
+ // normalEl.offsetWidth
+ // }
}
\ No newline at end of file
diff --git a/src/tool/https.js b/src/tool/https.js
index 05ac597a..15739c14 100644
--- a/src/tool/https.js
+++ b/src/tool/https.js
@@ -25,7 +25,8 @@ import { message } from 'ant-design-vue';
// }else{
// httpIp = ''
// }
-let httpIp = process.env.NODE_ENV == 'development' ? "http://192.168.1.10:10086" : "";
+let httpIp = process.env.NODE_ENV == 'development' ? "" : "";
+// let httpIp = process.env.NODE_ENV == 'development' ? "http://192.168.1.10:10086" : "";
console.log(httpIp);
axios.defaults.baseURL = process.env.VUE_APP_BASE_URL; //配置接口地址
// console.log(process.env.VUE_APP_BASE_URL);
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 18a75b44..c8570d99 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -66,8 +66,8 @@