diff --git a/.env.production b/.env.production index 35a2dbd..2b78f8d 100644 --- a/.env.production +++ b/.env.production @@ -3,8 +3,9 @@ # 页面标题 VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 +VITE_APP_API_BASEURL = http://192.168.2.6:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 35a2dbd..2b78f8d 100644 --- a/.env.production +++ b/.env.production @@ -3,8 +3,9 @@ # 页面标题 VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 +VITE_APP_API_BASEURL = http://192.168.2.6:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/jl.zip b/jl.zip new file mode 100644 index 0000000..40d750d --- /dev/null +++ b/jl.zip Binary files differ diff --git a/.env.production b/.env.production index 35a2dbd..2b78f8d 100644 --- a/.env.production +++ b/.env.production @@ -3,8 +3,9 @@ # 页面标题 VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 +VITE_APP_API_BASEURL = http://192.168.2.6:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/jl.zip b/jl.zip new file mode 100644 index 0000000..40d750d --- /dev/null +++ b/jl.zip Binary files differ diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue index 0a86d38..9491003 100644 --- a/src/components/buttonBox/buttonBox.vue +++ b/src/components/buttonBox/buttonBox.vue @@ -14,7 +14,9 @@ const current = ref('') // 选中的按钮 watch(current, (newValue) => { - emits('changeCurrentButton', newValue) + if (newValue) { + emits('changeCurrentButton', newValue) + } }) watch(() => props.active, (newValue) => { current.value = newValue! diff --git a/.env.production b/.env.production index 35a2dbd..2b78f8d 100644 --- a/.env.production +++ b/.env.production @@ -3,8 +3,9 @@ # 页面标题 VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 +VITE_APP_API_BASEURL = http://192.168.2.6:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/jl.zip b/jl.zip new file mode 100644 index 0000000..40d750d --- /dev/null +++ b/jl.zip Binary files differ diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue index 0a86d38..9491003 100644 --- a/src/components/buttonBox/buttonBox.vue +++ b/src/components/buttonBox/buttonBox.vue @@ -14,7 +14,9 @@ const current = ref('') // 选中的按钮 watch(current, (newValue) => { - emits('changeCurrentButton', newValue) + if (newValue) { + emits('changeCurrentButton', newValue) + } }) watch(() => props.active, (newValue) => { current.value = newValue! diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue index 8369c24..6bfeaa4 100644 --- a/src/views/device/receive/apply/applyList.vue +++ b/src/views/device/receive/apply/applyList.vue @@ -77,16 +77,6 @@ async function getDict() { // 审批状态 const res = await getDictByCode('approvalStatus') - // 审批状态字典 {1：草稿箱} - res.data.forEach((item: any) => { - approvalStatusMap.value[`${item.value}`] = item.name - }) - - // 审批状态字典 {草稿箱: 1} - res.data.forEach((item: any) => { - approvalStatusReserveMap.value[item.name] = `${item.value}` - }) - // 制作右上角的菜单 res.data.forEach((item: dictType) => { if (item.name === '全部' || item.name === '草稿箱' @@ -99,6 +89,15 @@ }) } }) + // 审批状态字典 {1：草稿箱} + res.data.forEach((item: any) => { + approvalStatusMap.value[`${item.value}`] = item.name + }) + + // 审批状态字典 {草稿箱: 1} + res.data.forEach((item: any) => { + approvalStatusReserveMap.value[item.name] = `${item.value}` + }) } // 数据查询 function fetchData(isNowPage = false) { @@ -366,11 +365,15 @@ onMounted(async () => { // 获取字典-审批状态 getDict().then(() => { - if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== 'null') { + if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) { + console.log('找到', window.sessionStorage.getItem('receiveButtonBoxActive')) + active.value = window.sessionStorage.getItem('receiveButtonBoxActive')! console.log(window.sessionStorage.getItem('receiveButtonBoxActive')) } else { + console.log('找不到') + active.value = menu.value.find(item => item.name === '全部')!.id! // 全部 activeTitle.value === '全部' } diff --git a/.env.production b/.env.production index 35a2dbd..2b78f8d 100644 --- a/.env.production +++ b/.env.production @@ -3,8 +3,9 @@ # 页面标题 VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 +VITE_APP_API_BASEURL = http://192.168.2.6:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/jl.zip b/jl.zip new file mode 100644 index 0000000..40d750d --- /dev/null +++ b/jl.zip Binary files differ diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue index 0a86d38..9491003 100644 --- a/src/components/buttonBox/buttonBox.vue +++ b/src/components/buttonBox/buttonBox.vue @@ -14,7 +14,9 @@ const current = ref('') // 选中的按钮 watch(current, (newValue) => { - emits('changeCurrentButton', newValue) + if (newValue) { + emits('changeCurrentButton', newValue) + } }) watch(() => props.active, (newValue) => { current.value = newValue! diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue index 8369c24..6bfeaa4 100644 --- a/src/views/device/receive/apply/applyList.vue +++ b/src/views/device/receive/apply/applyList.vue @@ -77,16 +77,6 @@ async function getDict() { // 审批状态 const res = await getDictByCode('approvalStatus') - // 审批状态字典 {1：草稿箱} - res.data.forEach((item: any) => { - approvalStatusMap.value[`${item.value}`] = item.name - }) - - // 审批状态字典 {草稿箱: 1} - res.data.forEach((item: any) => { - approvalStatusReserveMap.value[item.name] = `${item.value}` - }) - // 制作右上角的菜单 res.data.forEach((item: dictType) => { if (item.name === '全部' || item.name === '草稿箱' @@ -99,6 +89,15 @@ }) } }) + // 审批状态字典 {1：草稿箱} + res.data.forEach((item: any) => { + approvalStatusMap.value[`${item.value}`] = item.name + }) + + // 审批状态字典 {草稿箱: 1} + res.data.forEach((item: any) => { + approvalStatusReserveMap.value[item.name] = `${item.value}` + }) } // 数据查询 function fetchData(isNowPage = false) { @@ -366,11 +365,15 @@ onMounted(async () => { // 获取字典-审批状态 getDict().then(() => { - if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== 'null') { + if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) { + console.log('找到', window.sessionStorage.getItem('receiveButtonBoxActive')) + active.value = window.sessionStorage.getItem('receiveButtonBoxActive')! console.log(window.sessionStorage.getItem('receiveButtonBoxActive')) } else { + console.log('找不到') + active.value = menu.value.find(item => item.name === '全部')!.id! // 全部 activeTitle.value === '全部' } diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue index 4c15e0c..207db34 100644 --- a/src/views/device/receive/solve/solveList.vue +++ b/src/views/device/receive/solve/solveList.vue @@ -306,7 +306,7 @@ onMounted(async () => { await getDict() - if (window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== 'null') { + if (window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== 'null' && window.sessionStorage.getItem('buttonBoxActive') !== null) { active.value = window.sessionStorage.getItem('receiveSolveButtonBoxActive')! } else { diff --git a/.env.production b/.env.production index 35a2dbd..2b78f8d 100644 --- a/.env.production +++ b/.env.production @@ -3,8 +3,9 @@ # 页面标题 VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 +VITE_APP_API_BASEURL = http://192.168.2.6:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/jl.zip b/jl.zip new file mode 100644 index 0000000..40d750d --- /dev/null +++ b/jl.zip Binary files differ diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue index 0a86d38..9491003 100644 --- a/src/components/buttonBox/buttonBox.vue +++ b/src/components/buttonBox/buttonBox.vue @@ -14,7 +14,9 @@ const current = ref('') // 选中的按钮 watch(current, (newValue) => { - emits('changeCurrentButton', newValue) + if (newValue) { + emits('changeCurrentButton', newValue) + } }) watch(() => props.active, (newValue) => { current.value = newValue! diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue index 8369c24..6bfeaa4 100644 --- a/src/views/device/receive/apply/applyList.vue +++ b/src/views/device/receive/apply/applyList.vue @@ -77,16 +77,6 @@ async function getDict() { // 审批状态 const res = await getDictByCode('approvalStatus') - // 审批状态字典 {1：草稿箱} - res.data.forEach((item: any) => { - approvalStatusMap.value[`${item.value}`] = item.name - }) - - // 审批状态字典 {草稿箱: 1} - res.data.forEach((item: any) => { - approvalStatusReserveMap.value[item.name] = `${item.value}` - }) - // 制作右上角的菜单 res.data.forEach((item: dictType) => { if (item.name === '全部' || item.name === '草稿箱' @@ -99,6 +89,15 @@ }) } }) + // 审批状态字典 {1：草稿箱} + res.data.forEach((item: any) => { + approvalStatusMap.value[`${item.value}`] = item.name + }) + + // 审批状态字典 {草稿箱: 1} + res.data.forEach((item: any) => { + approvalStatusReserveMap.value[item.name] = `${item.value}` + }) } // 数据查询 function fetchData(isNowPage = false) { @@ -366,11 +365,15 @@ onMounted(async () => { // 获取字典-审批状态 getDict().then(() => { - if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== 'null') { + if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) { + console.log('找到', window.sessionStorage.getItem('receiveButtonBoxActive')) + active.value = window.sessionStorage.getItem('receiveButtonBoxActive')! console.log(window.sessionStorage.getItem('receiveButtonBoxActive')) } else { + console.log('找不到') + active.value = menu.value.find(item => item.name === '全部')!.id! // 全部 activeTitle.value === '全部' } diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue index 4c15e0c..207db34 100644 --- a/src/views/device/receive/solve/solveList.vue +++ b/src/views/device/receive/solve/solveList.vue @@ -306,7 +306,7 @@ onMounted(async () => { await getDict() - if (window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== 'null') { + if (window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== 'null' && window.sessionStorage.getItem('buttonBoxActive') !== null) { active.value = window.sessionStorage.getItem('receiveSolveButtonBoxActive')! } else { diff --git "a/\350\256\241\351\207\217 \0502\051.zip" "b/\350\256\241\351\207\217 \0502\051.zip" new file mode 100644 index 0000000..dfca0ba --- /dev/null +++ "b/\350\256\241\351\207\217 \0502\051.zip" Binary files differ diff --git a/.env.production b/.env.production index 35a2dbd..2b78f8d 100644 --- a/.env.production +++ b/.env.production @@ -3,8 +3,9 @@ # 页面标题 VITE_APP_TITLE = 计量业务系统 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:21609 +# VITE_APP_API_BASEURL = http://111.198.10.15:21609 # VITE_APP_API_BASEURL = http://192.168.83.213:8085 +VITE_APP_API_BASEURL = http://192.168.2.6:8085 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/jl.zip b/jl.zip new file mode 100644 index 0000000..40d750d --- /dev/null +++ b/jl.zip Binary files differ diff --git a/src/components/buttonBox/buttonBox.vue b/src/components/buttonBox/buttonBox.vue index 0a86d38..9491003 100644 --- a/src/components/buttonBox/buttonBox.vue +++ b/src/components/buttonBox/buttonBox.vue @@ -14,7 +14,9 @@ const current = ref('') // 选中的按钮 watch(current, (newValue) => { - emits('changeCurrentButton', newValue) + if (newValue) { + emits('changeCurrentButton', newValue) + } }) watch(() => props.active, (newValue) => { current.value = newValue! diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue index 8369c24..6bfeaa4 100644 --- a/src/views/device/receive/apply/applyList.vue +++ b/src/views/device/receive/apply/applyList.vue @@ -77,16 +77,6 @@ async function getDict() { // 审批状态 const res = await getDictByCode('approvalStatus') - // 审批状态字典 {1：草稿箱} - res.data.forEach((item: any) => { - approvalStatusMap.value[`${item.value}`] = item.name - }) - - // 审批状态字典 {草稿箱: 1} - res.data.forEach((item: any) => { - approvalStatusReserveMap.value[item.name] = `${item.value}` - }) - // 制作右上角的菜单 res.data.forEach((item: dictType) => { if (item.name === '全部' || item.name === '草稿箱' @@ -99,6 +89,15 @@ }) } }) + // 审批状态字典 {1：草稿箱} + res.data.forEach((item: any) => { + approvalStatusMap.value[`${item.value}`] = item.name + }) + + // 审批状态字典 {草稿箱: 1} + res.data.forEach((item: any) => { + approvalStatusReserveMap.value[item.name] = `${item.value}` + }) } // 数据查询 function fetchData(isNowPage = false) { @@ -366,11 +365,15 @@ onMounted(async () => { // 获取字典-审批状态 getDict().then(() => { - if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== 'null') { + if (window.sessionStorage.getItem('receiveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveButtonBoxActive') !== '' && window.sessionStorage.getItem('receiveButtonBoxActive') !== null) { + console.log('找到', window.sessionStorage.getItem('receiveButtonBoxActive')) + active.value = window.sessionStorage.getItem('receiveButtonBoxActive')! console.log(window.sessionStorage.getItem('receiveButtonBoxActive')) } else { + console.log('找不到') + active.value = menu.value.find(item => item.name === '全部')!.id! // 全部 activeTitle.value === '全部' } diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue index 4c15e0c..207db34 100644 --- a/src/views/device/receive/solve/solveList.vue +++ b/src/views/device/receive/solve/solveList.vue @@ -306,7 +306,7 @@ onMounted(async () => { await getDict() - if (window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== 'null') { + if (window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('receiveSolveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== 'null' && window.sessionStorage.getItem('buttonBoxActive') !== null) { active.value = window.sessionStorage.getItem('receiveSolveButtonBoxActive')! } else { diff --git "a/\350\256\241\351\207\217 \0502\051.zip" "b/\350\256\241\351\207\217 \0502\051.zip" new file mode 100644 index 0000000..dfca0ba --- /dev/null +++ "b/\350\256\241\351\207\217 \0502\051.zip" Binary files differ diff --git "a/\350\256\241\351\207\217.zip" "b/\350\256\241\351\207\217.zip" new file mode 100644 index 0000000..3a3060c --- /dev/null +++ "b/\350\256\241\351\207\217.zip" Binary files differ