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
2024-12-18 17:38:43 +08:00
parent a6ae63e7cd a65477353f
commit 4a65772ca9
90 changed files with 3220 additions and 865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/component/LibraryPage/ModelPlacement.vue
View File

@@ -33,7 +33,7 @@
</div>
</div>
</div>
<div class="plcaement_point_content" v-if="userInfo.userId == 88 || userInfo.userId == 83">
<div class="plcaement_point_content" v-if="userDetail.userId == 88 || userDetail.userId == 83">
<div style="display: flex; align-items: center;">
<div style="display: flex; align-items: center;">
<input type="checkbox" model="false" @click="()=>{modelType = 'System'}">
@@ -62,7 +62,7 @@
</a-select> -->
<div>{{ sex.label }}</div>
</div>
<div class="placement_point_item" v-for="(point,index) in pointList" :key="index" @touchmove="touchmove($event)">
<div class="placement_point_item" v-for="(point,index) in pointList" :key="index" @mousemove="mouseMove" @touchmove="touchmove($event)">
<div class="ponit_title">{{point.title}}</div>
<div class="point_list">
<div class="point_item" v-for="item in point.pointList" :key="item.color" :style="{borderColor:item.color,visibility:item.show?'inherit':'hidden'}" @mousedown="AddDian(item)" @touchstart="AddDian(item)"><div class="point_block" :style="{background:item.color}"></div></div>
@@ -137,10 +137,9 @@
</template>
<script lang="ts">
import { defineComponent,ref,createVNode,nextTick} from 'vue'
import { defineComponent,ref,createVNode,nextTick,computed} from 'vue'
import { Https } from "@/tool/https";
import {dataURLtoFile,base64toFile} from "@/tool/util"
import { getCookie } from "@/tool/cookie";
import 'vue-cropper/dist/index.css'
import { VueCropper } from "vue-cropper";
import { useStore } from "vuex";
@@ -154,6 +153,9 @@ export default defineComponent({
},
setup() {
const store = useStore()
let userDetail:any= computed(()=>{
return store.state.UserHabit.userDetail
})
let oldLocationList:any = ref([])
let locationList:any = ref([])
let printObject:any = ref({})
@@ -164,7 +166,6 @@ export default defineComponent({
let pointList:any = ref([])
let isSubmit:any = ref(false) //判断历史是否有提交过
let manager:any = ref(false)
let userInfo:any = ref()
let sex:any = ref({})
let sexList:any = ref([
@@ -174,6 +175,7 @@ export default defineComponent({
let {t} = useI18n()
return {
store,
userDetail,
oldLocationList,
locationList,
printObject,
@@ -184,7 +186,6 @@ export default defineComponent({
pointList,
isSubmit,
manager,
userInfo,
sex,
sexList,
cropperTime,
@@ -239,8 +240,6 @@ export default defineComponent({
}
},
mounted(){
let userInfo:any = getCookie("userInfo")
this.userInfo = JSON.parse(userInfo);
// this.getSex()
},
methods:{
@@ -589,7 +588,7 @@ export default defineComponent({
// })
let cropper:any = this.$refs.cropper,
that = this
if((this.modelType == 'System' && this.userInfo.userId == 88) || (this.modelType == 'System' &&this.userInfo.userId == 83)){
if((this.modelType == 'System' && this.userDetail.userId == 88) || (this.modelType == 'System' &&this.userDetail.userId == 83)){
if(this.printObject.templateId){
this.printObject.id = this.printObject.relationId
this.confrimSubmit()
@@ -631,7 +630,7 @@ export default defineComponent({
},
async confrimSubmit(){
let modelType = 'Library'
if(this.userInfo.userId == 88 || this.userInfo.userId == 83){
if(this.userDetail.userId == 88 || this.userDetail.userId == 83){
modelType = this.modelType
}
let param = {
@@ -659,7 +658,7 @@ export default defineComponent({
customRequest(){
let modelType = 'Library'
if(this.userInfo.userId == 88 || this.userInfo.userId == 83){
if(this.userDetail.userId == 88 || this.userDetail.userId == 83){
modelType = this.modelType
}
let new_data = {

21
src/component/LibraryPage/ModelPlacementMobile.vue
View File

@@ -33,7 +33,7 @@
</div>
</div>
</div>
<div class="plcaement_point_content" v-if="userInfo.userId == 88 || userInfo.userId == 83">
<div class="plcaement_point_content" v-if="userDetail.userId == 88 || userDetail.userId == 83">
<div style="display: flex; align-items: center;">
<div style="display: flex; align-items: center;">
<input type="checkbox" model="false" @click="()=>{modelType = 'System'}">
@@ -137,10 +137,9 @@
</template>
<script lang="ts">
import { defineComponent,ref,createVNode,nextTick} from 'vue'
import { defineComponent,ref,createVNode,nextTick,computed} from 'vue'
import { Https } from "@/tool/https";
import {dataURLtoFile,base64toFile} from "@/tool/util"
import { getCookie } from "@/tool/cookie";
import 'vue-cropper/dist/index.css'
import { VueCropper } from "vue-cropper";
import { useStore } from "vuex";
@@ -164,7 +163,6 @@ export default defineComponent({
let pointList:any = ref([])
let isSubmit:any = ref(false) //判断历史是否有提交过
let manager:any = ref(false)
let userInfo:any = ref()
let sex:any = ref({})
let sexList:any = ref([
@@ -172,6 +170,9 @@ export default defineComponent({
let cropperTime:any = ref()
let {t} = useI18n()
let userDetail:any= computed(()=>{
return store.state.UserHabit.userDetail
})
return {
store,
oldLocationList,
@@ -184,13 +185,13 @@ export default defineComponent({
pointList,
isSubmit,
manager,
userInfo,
sex,
sexList,
cropperTime,
t,
getMousePosition
getMousePosition,
userDetail
}
},
data(){
@@ -236,8 +237,6 @@ export default defineComponent({
}
},
mounted(){
let userInfo:any = getCookie("userInfo")
this.userInfo = JSON.parse(userInfo);
// this.getSex()
},
methods:{
@@ -586,7 +585,7 @@ export default defineComponent({
// })
let cropper:any = this.$refs.cropper,
that = this
if((this.modelType == 'System' && this.userInfo.userId == 88) || (this.modelType == 'System' &&this.userInfo.userId == 83)){
if((this.modelType == 'System' && this.userDetail.userId == 88) || (this.modelType == 'System' &&this.userDetail.userId == 83)){
if(this.printObject.templateId){
this.printObject.id = this.printObject.relationId
this.confrimSubmit()
@@ -628,7 +627,7 @@ export default defineComponent({
},
async confrimSubmit(){
let modelType = 'Library'
if(this.userInfo.userId == 88 || this.userInfo.userId == 83){
if(this.userDetail.userId == 88 || this.userDetail.userId == 83){
modelType = this.modelType
}
let param = {
@@ -656,7 +655,7 @@ export default defineComponent({
customRequest(){
let modelType = 'Library'
if(this.userInfo.userId == 88 || this.userInfo.userId == 83){
if(this.userDetail.userId == 88 || this.userDetail.userId == 83){
modelType = this.modelType
}
let new_data = {

18
src/component/LibraryPage/ModelPlacementUpdata.vue
View File

@@ -32,7 +32,7 @@
</div>
</div>
</div>
<div class="plcaement_point_content" v-if="userInfo.userId == 88 || userInfo.userId == 83">
<div class="plcaement_point_content" v-if="userDetail.userId == 88 || userDetail.userId == 83">
<div style="display: flex; align-items: center;">
<div style="display: flex; align-items: center;">
<input type="checkbox" model="false" @click="()=>{modelType = 'System'}">
@@ -107,10 +107,9 @@
</template>
<script lang="ts">
import { defineComponent,ref,createVNode} from 'vue'
import { defineComponent,ref,createVNode,computed} from 'vue'
import { Https } from "@/tool/https";
import {dataURLtoFile} from "@/tool/util"
import { getCookie } from "@/tool/cookie";
import { useStore } from "vuex";
import { Modal,message } from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
@@ -127,8 +126,9 @@ export default defineComponent({
let pointList:any = ref([])
let isSubmit:any = ref(false) //判断历史是否有提交过
let manager:any = ref(false)
let userInfo:any = ref()
let userDetail:any= computed(()=>{
return store.state.UserHabit.userDetail
})
return {
store,
oldLocationList,
@@ -141,7 +141,7 @@ export default defineComponent({
pointList,
isSubmit,
manager,
userInfo
userDetail
}
},
data(){
@@ -162,8 +162,6 @@ export default defineComponent({
}
},
mounted(){
let userInfo:any = getCookie("userInfo")
this.userInfo = JSON.parse(userInfo);
this.getSex()
},
methods:{
@@ -398,7 +396,7 @@ export default defineComponent({
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
...this.getPrintLocation()
}
if(this.userInfo.userId == 88 || this.userInfo.userId == 83){
if(this.userDetail.userId == 88 || this.userDetail.userId == 83){
// param.modelType = this.modelType
}
this.isShowMark = true
@@ -424,7 +422,7 @@ export default defineComponent({
modelType:'System',
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
}
if(this.userInfo.userId == 88 || this.userInfo.userId == 83){
if(this.userDetail.userId == 88 || this.userDetail.userId == 83){
// new_data.modelType = this.modelType
new_data.sex = this.sex
}

1
src/component/LibraryPage/searchLabel.vue
View File

@@ -82,7 +82,6 @@ import { defineComponent,ref,createVNode,watch,nextTick,inject} from 'vue'
import { Https } from "@/tool/https";
// import {dataURLtoFile,base64toFile} from "@/tool/util"
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
// import { getCookie } from "@/tool/cookie";
import 'vue-cropper/dist/index.css'
import { VueCropper } from "vue-cropper";
// import { useStore } from "vuex";

1
src/component/LibraryPage/setLabel.vue
View File

@@ -53,7 +53,6 @@ import { defineComponent,ref,createVNode,watch,nextTick,inject} from 'vue'
import { Https } from "@/tool/https";
// import {dataURLtoFile,base64toFile} from "@/tool/util"
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
// import { getCookie } from "@/tool/cookie";
import 'vue-cropper/dist/index.css'
import { VueCropper } from "vue-cropper";
// import { useStore } from "vuex";