diff --git a/.env.development b/.env.development
index 35bd2f1..52b6555 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
VITE_APP_TITLE = 计量信息系统
# 接口请求地址,会设置到 axios 的 baseURL 参数上
# VITE_APP_API_BASEURL = http://139.198.29.133:8089
-# VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://192.168.8.107:5909
# 调试工具,可设置 eruda 或 vconsole,如果不需要开启则留空
VITE_APP_DEBUG_TOOL =
diff --git a/.env.development b/.env.development
index 35bd2f1..52b6555 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
VITE_APP_TITLE = 计量信息系统
# 接口请求地址,会设置到 axios 的 baseURL 参数上
# VITE_APP_API_BASEURL = http://139.198.29.133:8089
-# VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://192.168.8.107:5909
# 调试工具,可设置 eruda 或 vconsole,如果不需要开启则留空
VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 0127d2f..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
{
"title":"计量业务系统",
- "baseUrl": "http://192.168.8.107:5909"
+ "baseUrl": "http://111.198.10.15:21611"
}
diff --git a/.env.development b/.env.development
index 35bd2f1..52b6555 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
VITE_APP_TITLE = 计量信息系统
# 接口请求地址,会设置到 axios 的 baseURL 参数上
# VITE_APP_API_BASEURL = http://139.198.29.133:8089
-# VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://192.168.8.107:5909
# 调试工具,可设置 eruda 或 vconsole,如果不需要开启则留空
VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 0127d2f..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
{
"title":"计量业务系统",
- "baseUrl": "http://192.168.8.107:5909"
+ "baseUrl": "http://111.198.10.15:21611"
}
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 8ca5014..f424501 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -20,6 +20,8 @@
createTimeEnd: '',
createTimeStart: '',
notifyType: $props.notifyType, // 通知类型(负责人/部门,字典值)
+ notifyDept: userStore.deptId,
+ notifyUser: userStore.id,
offset: 1,
limit: 20,
})
@@ -73,9 +75,6 @@
// 获取数据
const fetchData = (isNowPage = true) => {
// console.log(userStore.id, 'userStore.id')
- getUserDept().then((res) => {
- console.log(res.data, 'res')
- })
listLoading.value = true
if (!isNowPage) {
// 是否显示当前页,否则跳转第一页
diff --git a/.env.development b/.env.development
index 35bd2f1..52b6555 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
VITE_APP_TITLE = 计量信息系统
# 接口请求地址,会设置到 axios 的 baseURL 参数上
# VITE_APP_API_BASEURL = http://139.198.29.133:8089
-# VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://192.168.8.107:5909
# 调试工具,可设置 eruda 或 vconsole,如果不需要开启则留空
VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 0127d2f..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
{
"title":"计量业务系统",
- "baseUrl": "http://192.168.8.107:5909"
+ "baseUrl": "http://111.198.10.15:21611"
}
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 8ca5014..f424501 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -20,6 +20,8 @@
createTimeEnd: '',
createTimeStart: '',
notifyType: $props.notifyType, // 通知类型(负责人/部门,字典值)
+ notifyDept: userStore.deptId,
+ notifyUser: userStore.id,
offset: 1,
limit: 20,
})
@@ -73,9 +75,6 @@
// 获取数据
const fetchData = (isNowPage = true) => {
// console.log(userStore.id, 'userStore.id')
- getUserDept().then((res) => {
- console.log(res.data, 'res')
- })
listLoading.value = true
if (!isNowPage) {
// 是否显示当前页,否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index e3db973..d60efca 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -81,6 +81,7 @@
const data = JSON.parse($route.query.row as string)
ruleForm.value.year = String(currentYear.value)
typeFlag.value = data.planType
+ ruleForm.value.planType = data.planType
// 判断是否追加计划
if ($route.query.append) {
// 修改计量计划为追加
@@ -104,10 +105,6 @@
getInfoList(data.id, '').then((res) => {
ruleForm.value.equipmentIds = res.data
})
- // detailPlan(data.id).then((res) => {
- // // ruleForm.value = res.data
- // console.log(res.data, '基本信息')
- // })
}
}
// 获取计划分类列表
diff --git a/.env.development b/.env.development
index 35bd2f1..52b6555 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
VITE_APP_TITLE = 计量信息系统
# 接口请求地址,会设置到 axios 的 baseURL 参数上
# VITE_APP_API_BASEURL = http://139.198.29.133:8089
-# VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://192.168.8.107:5909
# 调试工具,可设置 eruda 或 vconsole,如果不需要开启则留空
VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 0127d2f..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
{
"title":"计量业务系统",
- "baseUrl": "http://192.168.8.107:5909"
+ "baseUrl": "http://111.198.10.15:21611"
}
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 8ca5014..f424501 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -20,6 +20,8 @@
createTimeEnd: '',
createTimeStart: '',
notifyType: $props.notifyType, // 通知类型(负责人/部门,字典值)
+ notifyDept: userStore.deptId,
+ notifyUser: userStore.id,
offset: 1,
limit: 20,
})
@@ -73,9 +75,6 @@
// 获取数据
const fetchData = (isNowPage = true) => {
// console.log(userStore.id, 'userStore.id')
- getUserDept().then((res) => {
- console.log(res.data, 'res')
- })
listLoading.value = true
if (!isNowPage) {
// 是否显示当前页,否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index e3db973..d60efca 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -81,6 +81,7 @@
const data = JSON.parse($route.query.row as string)
ruleForm.value.year = String(currentYear.value)
typeFlag.value = data.planType
+ ruleForm.value.planType = data.planType
// 判断是否追加计划
if ($route.query.append) {
// 修改计量计划为追加
@@ -104,10 +105,6 @@
getInfoList(data.id, '').then((res) => {
ruleForm.value.equipmentIds = res.data
})
- // detailPlan(data.id).then((res) => {
- // // ruleForm.value = res.data
- // console.log(res.data, '基本信息')
- // })
}
}
// 获取计划分类列表
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 8e73a33..b3d04a2 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -227,9 +227,9 @@
查看
-
+
diff --git a/.env.development b/.env.development
index 35bd2f1..52b6555 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
VITE_APP_TITLE = 计量信息系统
# 接口请求地址,会设置到 axios 的 baseURL 参数上
# VITE_APP_API_BASEURL = http://139.198.29.133:8089
-# VITE_APP_API_BASEURL = http://111.198.10.15:21611
-VITE_APP_API_BASEURL = http://192.168.8.107:5909
+VITE_APP_API_BASEURL = http://111.198.10.15:21611
+# VITE_APP_API_BASEURL = http://192.168.8.107:5909
# 调试工具,可设置 eruda 或 vconsole,如果不需要开启则留空
VITE_APP_DEBUG_TOOL =
diff --git a/public/config/config.json b/public/config/config.json
index 0127d2f..3bd0a89 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
{
"title":"计量业务系统",
- "baseUrl": "http://192.168.8.107:5909"
+ "baseUrl": "http://111.198.10.15:21611"
}
diff --git a/src/views/tested/MeasurementPlan/dept/components/list.vue b/src/views/tested/MeasurementPlan/dept/components/list.vue
index 8ca5014..f424501 100644
--- a/src/views/tested/MeasurementPlan/dept/components/list.vue
+++ b/src/views/tested/MeasurementPlan/dept/components/list.vue
@@ -20,6 +20,8 @@
createTimeEnd: '',
createTimeStart: '',
notifyType: $props.notifyType, // 通知类型(负责人/部门,字典值)
+ notifyDept: userStore.deptId,
+ notifyUser: userStore.id,
offset: 1,
limit: 20,
})
@@ -73,9 +75,6 @@
// 获取数据
const fetchData = (isNowPage = true) => {
// console.log(userStore.id, 'userStore.id')
- getUserDept().then((res) => {
- console.log(res.data, 'res')
- })
listLoading.value = true
if (!isNowPage) {
// 是否显示当前页,否则跳转第一页
diff --git a/src/views/tested/MeasurementPlan/plan/components/edit.vue b/src/views/tested/MeasurementPlan/plan/components/edit.vue
index e3db973..d60efca 100644
--- a/src/views/tested/MeasurementPlan/plan/components/edit.vue
+++ b/src/views/tested/MeasurementPlan/plan/components/edit.vue
@@ -81,6 +81,7 @@
const data = JSON.parse($route.query.row as string)
ruleForm.value.year = String(currentYear.value)
typeFlag.value = data.planType
+ ruleForm.value.planType = data.planType
// 判断是否追加计划
if ($route.query.append) {
// 修改计量计划为追加
@@ -104,10 +105,6 @@
getInfoList(data.id, '').then((res) => {
ruleForm.value.equipmentIds = res.data
})
- // detailPlan(data.id).then((res) => {
- // // ruleForm.value = res.data
- // console.log(res.data, '基本信息')
- // })
}
}
// 获取计划分类列表
diff --git a/src/views/tested/device/remind/index.vue b/src/views/tested/device/remind/index.vue
index 8e73a33..b3d04a2 100644
--- a/src/views/tested/device/remind/index.vue
+++ b/src/views/tested/device/remind/index.vue
@@ -227,9 +227,9 @@
查看
-
+
diff --git a/src/views/tested/status/delay/components/edit.vue b/src/views/tested/status/delay/components/edit.vue
index e4d5dde..ca8ac4e 100644
--- a/src/views/tested/status/delay/components/edit.vue
+++ b/src/views/tested/status/delay/components/edit.vue
@@ -429,6 +429,7 @@
+