+
diff --git a/.env.development b/.env.development
index 52b6555..35bd2f1 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 3bd0a89..0127d2f 100644
--- a/public/config/config.json
+++ b/public/config/config.json
@@ -1,4 +1,4 @@
{
"title":"计量业务系统",
- "baseUrl": "http://111.198.10.15:21611"
+ "baseUrl": "http://192.168.8.107:5909"
}
diff --git a/src/api/eqpt/device/info.ts b/src/api/eqpt/device/info.ts
index 97e82c3..32906e2 100644
--- a/src/api/eqpt/device/info.ts
+++ b/src/api/eqpt/device/info.ts
@@ -75,6 +75,15 @@
data,
})
}
+// 导出
+export function exportDevice(data: object) {
+ return request({
+ url: '/equipment/info/export',
+ method: 'post',
+ data,
+ responseType: 'blob',
+ })
+}
// 提交
export function submitInfo(data: object) {
return request({
diff --git a/src/api/eqpt/device/remind.ts b/src/api/eqpt/device/remind.ts
index 4f6097e..6a93493 100644
--- a/src/api/eqpt/device/remind.ts
+++ b/src/api/eqpt/device/remind.ts
@@ -10,3 +10,12 @@
data,
})
}
+// 导出
+export function exportRemind(data: object) {
+ return request({
+ url: '/equipment/remind/listExport',
+ method: 'post',
+ data,
+ responseType: 'blob',
+ })
+}
diff --git a/src/api/eqpt/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts
index 4e00d72..d4b8954 100644
--- a/src/api/eqpt/measurementPlan/early.ts
+++ b/src/api/eqpt/measurementPlan/early.ts
@@ -50,6 +50,15 @@
data,
})
}
+// 导出
+export function exportApply(data: object) {
+ return request({
+ url: '/inspection/allExport',
+ method: 'post',
+ data,
+ responseType: 'blob',
+ })
+}
// 提交
export function submitApply(data: object) {
return request({
diff --git a/src/api/eqpt/measurementPlan/paln.ts b/src/api/eqpt/measurementPlan/paln.ts
index e1723ec..55c19b0 100644
--- a/src/api/eqpt/measurementPlan/paln.ts
+++ b/src/api/eqpt/measurementPlan/paln.ts
@@ -42,6 +42,15 @@
})
}
}
+// 导出计划列表
+export function exportPlan(data: object) {
+ return request({
+ url: '/plan/allExport',
+ method: 'post',
+ data,
+ responseType: 'blob',
+ })
+}
// 保存
export function editPlan(data: object) {
return request({
diff --git a/src/api/eqpt/subpackage/certificate.ts b/src/api/eqpt/subpackage/certificate.ts
index f6f3ea6..f95235c 100644
--- a/src/api/eqpt/subpackage/certificate.ts
+++ b/src/api/eqpt/subpackage/certificate.ts
@@ -25,3 +25,12 @@
method: 'post',
})
}
+// 导出
+export function exportCertificate(data: object) {
+ return request({
+ url: '/subcontract/certificate/export',
+ method: 'post',
+ data,
+ responseType: 'blob',
+ })
+}
diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts
index c4066d0..0456ec8 100644
--- a/src/api/eqpt/subpackage/directory.ts
+++ b/src/api/eqpt/subpackage/directory.ts
@@ -68,6 +68,15 @@
data,
})
}
+// 导出
+export function exportDirectory(data: object) {
+ return request({
+ url: '/subcontractor/allExport',
+ method: 'post',
+ data,
+ responseType: 'blob',
+ })
+}
// 删除记录
export function deleteDirectory(data: object, type: string) {
if (type === '全部') {
diff --git a/src/api/eqpt/subpackage/review.ts b/src/api/eqpt/subpackage/review.ts
index d5bb694..60a4a58 100644
--- a/src/api/eqpt/subpackage/review.ts
+++ b/src/api/eqpt/subpackage/review.ts
@@ -50,6 +50,15 @@
data,
})
}
+// 导出
+export function exportReview(data: object) {
+ return request({
+ url: '/subcontract/review/allExport',
+ method: 'post',
+ data,
+ responseType: 'blob',
+ })
+}
// 提交
export function submitReview(data: object) {
return request({
diff --git a/src/api/system/label.ts b/src/api/system/label.ts
index c419845..c5436a5 100644
--- a/src/api/system/label.ts
+++ b/src/api/system/label.ts
@@ -1,4 +1,5 @@
// 流程管理接口
+// import qs from 'qs'
import request from '../index'
// 列表
@@ -18,13 +19,13 @@
data,
})
}
-
-// 导入
+// 导出
export function importLabel(data: object) {
return request({
url: '/system/rfid/export',
method: 'post',
data,
+ responseType: 'blob',
})
}
// 批量导入
diff --git a/src/views/system/fileConfiguration/addDDialog.vue b/src/views/system/fileConfiguration/addDDialog.vue
index 175fece..e89dd60 100644
--- a/src/views/system/fileConfiguration/addDDialog.vue
+++ b/src/views/system/fileConfiguration/addDDialog.vue
@@ -174,10 +174,10 @@
-
+
+ -->
+
@@ -172,11 +221,15 @@
+
+
+
+
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index c4e50ab..e76cf07 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -243,7 +243,7 @@
close()
})
}
- if (statusName === '全部') {
+ if (statusName === '全部' && $route.path.includes('update')) {
ElMessage.success('保存成功')
close()
}
@@ -374,15 +374,12 @@
编辑
-
+
提交
保存
-
- 打印
-
删除
@@ -574,7 +571,7 @@
-
+
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 94984b0..6585931 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -1,12 +1,12 @@
@@ -172,11 +221,15 @@
+
+
+
+
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index c4e50ab..e76cf07 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -243,7 +243,7 @@
close()
})
}
- if (statusName === '全部') {
+ if (statusName === '全部' && $route.path.includes('update')) {
ElMessage.success('保存成功')
close()
}
@@ -374,15 +374,12 @@
编辑
-
+
提交
保存
-
- 打印
-
删除
@@ -574,7 +571,7 @@
-
+
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 94984b0..6585931 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -1,12 +1,12 @@
@@ -172,11 +221,15 @@
+
+
+
+
diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue
index c4e50ab..e76cf07 100644
--- a/src/views/tested/subpackage/directory/components/edit.vue
+++ b/src/views/tested/subpackage/directory/components/edit.vue
@@ -243,7 +243,7 @@
close()
})
}
- if (statusName === '全部') {
+ if (statusName === '全部' && $route.path.includes('update')) {
ElMessage.success('保存成功')
close()
}
@@ -374,15 +374,12 @@
编辑
-
+
提交
保存
-
- 打印
-
删除
@@ -574,7 +571,7 @@
-
+
diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue
index 94984b0..6585931 100644
--- a/src/views/tested/subpackage/directory/components/list.vue
+++ b/src/views/tested/subpackage/directory/components/list.vue
@@ -1,12 +1,12 @@