diff --git a/public/config/config.json b/public/config/config.json index c252307..a46b78e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,5 +1,6 @@ { "title":"计量业务系统", + "versionByEqpt":"1.2.0.0", "baseUrl": "http://111.198.10.15:21611", "baseUrlBusiness": "http://111.198.10.15:21606", "baseUrlLaboratory": "http://111.198.10.15:21609", diff --git a/public/config/config.json b/public/config/config.json index c252307..a46b78e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,5 +1,6 @@ { "title":"计量业务系统", + "versionByEqpt":"1.2.0.0", "baseUrl": "http://111.198.10.15:21611", "baseUrlBusiness": "http://111.198.10.15:21606", "baseUrlLaboratory": "http://111.198.10.15:21609", diff --git a/src/main.ts b/src/main.ts index ea360eb..d300cf5 100644 --- a/src/main.ts +++ b/src/main.ts @@ -10,6 +10,7 @@ import useSettingsStore from './store/modules/settings' import request from '@/api/index' import request1 from '@/api/request' +import request2 from '@/api/requestLab' // 自定义指令 import directive from '@/utils/directive' // 加载 svg 图标 @@ -49,8 +50,11 @@ window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 request1.defaults.baseURL = result.data.baseUrlBusiness // 设置默认请求网址 + request2.defaults.baseURL = result.data.baseUrlAccount // 设置默认请求网址 app.mount('#app') ElMessage.success('获取默认配置成功') + // 版本号 + console.log(`受检系统版本:${result.data.versionByEqpt}`) }).catch((error) => { console.error(`get baseConfig error...${error}`) }) diff --git a/public/config/config.json b/public/config/config.json index c252307..a46b78e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,5 +1,6 @@ { "title":"计量业务系统", + "versionByEqpt":"1.2.0.0", "baseUrl": "http://111.198.10.15:21611", "baseUrlBusiness": "http://111.198.10.15:21606", "baseUrlLaboratory": "http://111.198.10.15:21609", diff --git a/src/main.ts b/src/main.ts index ea360eb..d300cf5 100644 --- a/src/main.ts +++ b/src/main.ts @@ -10,6 +10,7 @@ import useSettingsStore from './store/modules/settings' import request from '@/api/index' import request1 from '@/api/request' +import request2 from '@/api/requestLab' // 自定义指令 import directive from '@/utils/directive' // 加载 svg 图标 @@ -49,8 +50,11 @@ window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 request1.defaults.baseURL = result.data.baseUrlBusiness // 设置默认请求网址 + request2.defaults.baseURL = result.data.baseUrlAccount // 设置默认请求网址 app.mount('#app') ElMessage.success('获取默认配置成功') + // 版本号 + console.log(`受检系统版本:${result.data.versionByEqpt}`) }).catch((error) => { console.error(`get baseConfig error...${error}`) }) diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue index cf03a3e..96b0203 100644 --- a/src/views/tested/MeasurementBusiness/opinion/index.vue +++ b/src/views/tested/MeasurementBusiness/opinion/index.vue @@ -146,11 +146,11 @@ diff --git a/public/config/config.json b/public/config/config.json index c252307..a46b78e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,5 +1,6 @@ { "title":"计量业务系统", + "versionByEqpt":"1.2.0.0", "baseUrl": "http://111.198.10.15:21611", "baseUrlBusiness": "http://111.198.10.15:21606", "baseUrlLaboratory": "http://111.198.10.15:21609", diff --git a/src/main.ts b/src/main.ts index ea360eb..d300cf5 100644 --- a/src/main.ts +++ b/src/main.ts @@ -10,6 +10,7 @@ import useSettingsStore from './store/modules/settings' import request from '@/api/index' import request1 from '@/api/request' +import request2 from '@/api/requestLab' // 自定义指令 import directive from '@/utils/directive' // 加载 svg 图标 @@ -49,8 +50,11 @@ window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 request1.defaults.baseURL = result.data.baseUrlBusiness // 设置默认请求网址 + request2.defaults.baseURL = result.data.baseUrlAccount // 设置默认请求网址 app.mount('#app') ElMessage.success('获取默认配置成功') + // 版本号 + console.log(`受检系统版本:${result.data.versionByEqpt}`) }).catch((error) => { console.error(`get baseConfig error...${error}`) }) diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue index cf03a3e..96b0203 100644 --- a/src/views/tested/MeasurementBusiness/opinion/index.vue +++ b/src/views/tested/MeasurementBusiness/opinion/index.vue @@ -146,11 +146,11 @@ diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue index be050e9..ded9054 100644 --- a/src/views/tested/MeasurementBusiness/review/index.vue +++ b/src/views/tested/MeasurementBusiness/review/index.vue @@ -150,7 +150,7 @@ diff --git a/public/config/config.json b/public/config/config.json index c252307..a46b78e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,5 +1,6 @@ { "title":"计量业务系统", + "versionByEqpt":"1.2.0.0", "baseUrl": "http://111.198.10.15:21611", "baseUrlBusiness": "http://111.198.10.15:21606", "baseUrlLaboratory": "http://111.198.10.15:21609", diff --git a/src/main.ts b/src/main.ts index ea360eb..d300cf5 100644 --- a/src/main.ts +++ b/src/main.ts @@ -10,6 +10,7 @@ import useSettingsStore from './store/modules/settings' import request from '@/api/index' import request1 from '@/api/request' +import request2 from '@/api/requestLab' // 自定义指令 import directive from '@/utils/directive' // 加载 svg 图标 @@ -49,8 +50,11 @@ window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 request1.defaults.baseURL = result.data.baseUrlBusiness // 设置默认请求网址 + request2.defaults.baseURL = result.data.baseUrlAccount // 设置默认请求网址 app.mount('#app') ElMessage.success('获取默认配置成功') + // 版本号 + console.log(`受检系统版本:${result.data.versionByEqpt}`) }).catch((error) => { console.error(`get baseConfig error...${error}`) }) diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue index cf03a3e..96b0203 100644 --- a/src/views/tested/MeasurementBusiness/opinion/index.vue +++ b/src/views/tested/MeasurementBusiness/opinion/index.vue @@ -146,11 +146,11 @@ diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue index be050e9..ded9054 100644 --- a/src/views/tested/MeasurementBusiness/review/index.vue +++ b/src/views/tested/MeasurementBusiness/review/index.vue @@ -150,7 +150,7 @@ diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue index b95ae3b..393d9d5 100644 --- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue +++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue @@ -122,7 +122,7 @@ diff --git a/public/config/config.json b/public/config/config.json index c252307..a46b78e 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,5 +1,6 @@ { "title":"计量业务系统", + "versionByEqpt":"1.2.0.0", "baseUrl": "http://111.198.10.15:21611", "baseUrlBusiness": "http://111.198.10.15:21606", "baseUrlLaboratory": "http://111.198.10.15:21609", diff --git a/src/main.ts b/src/main.ts index ea360eb..d300cf5 100644 --- a/src/main.ts +++ b/src/main.ts @@ -10,6 +10,7 @@ import useSettingsStore from './store/modules/settings' import request from '@/api/index' import request1 from '@/api/request' +import request2 from '@/api/requestLab' // 自定义指令 import directive from '@/utils/directive' // 加载 svg 图标 @@ -49,8 +50,11 @@ window.localStorage.setItem('baseUrlAccount', result.data.baseUrlAccount) request.defaults.baseURL = result.data.baseUrl // 设置默认请求网址 request1.defaults.baseURL = result.data.baseUrlBusiness // 设置默认请求网址 + request2.defaults.baseURL = result.data.baseUrlAccount // 设置默认请求网址 app.mount('#app') ElMessage.success('获取默认配置成功') + // 版本号 + console.log(`受检系统版本:${result.data.versionByEqpt}`) }).catch((error) => { console.error(`get baseConfig error...${error}`) }) diff --git a/src/views/tested/MeasurementBusiness/opinion/index.vue b/src/views/tested/MeasurementBusiness/opinion/index.vue index cf03a3e..96b0203 100644 --- a/src/views/tested/MeasurementBusiness/opinion/index.vue +++ b/src/views/tested/MeasurementBusiness/opinion/index.vue @@ -146,11 +146,11 @@ diff --git a/src/views/tested/MeasurementBusiness/review/index.vue b/src/views/tested/MeasurementBusiness/review/index.vue index be050e9..ded9054 100644 --- a/src/views/tested/MeasurementBusiness/review/index.vue +++ b/src/views/tested/MeasurementBusiness/review/index.vue @@ -150,7 +150,7 @@ diff --git a/src/views/tested/MeasurementBusiness/satisfaction/index.vue b/src/views/tested/MeasurementBusiness/satisfaction/index.vue index b95ae3b..393d9d5 100644 --- a/src/views/tested/MeasurementBusiness/satisfaction/index.vue +++ b/src/views/tested/MeasurementBusiness/satisfaction/index.vue @@ -122,7 +122,7 @@ diff --git a/src/views/tested/MeasurementPlan/early/components/detail.vue b/src/views/tested/MeasurementPlan/early/components/detail.vue index d56891e..e21d8b1 100644 --- a/src/views/tested/MeasurementPlan/early/components/detail.vue +++ b/src/views/tested/MeasurementPlan/early/components/detail.vue @@ -65,6 +65,11 @@ data = res.data processId.value = res.data.processId }) +const { proxy } = getCurrentInstance() as any +const permUrl = ref({ + agree: `/tested/pmetering/${$route.query.approvalType === '0' ? 'ealy' : 'delay'}/agree`, + reject: `/tested/pmetering/${$route.query.approvalType === '0' ? 'ealy' : 'delay'}/reject`, +})