diff --git a/.env.development b/.env.development index ac18d5c..6971c8b 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 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 diff --git a/.env.development b/.env.development index ac18d5c..6971c8b 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 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 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/.env.development b/.env.development index ac18d5c..6971c8b 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 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 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/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts index 4e41650..af01f0e 100644 --- a/src/api/eqpt/measurementPlan/early.ts +++ b/src/api/eqpt/measurementPlan/early.ts @@ -91,10 +91,10 @@ }) } // 删除 -export function delApply(data: object) { +export function delApply(data: any) { return request({ - url: '/inspection/approval/delete', + url: `/inspection/approval/delete?id=${data.id}`, method: 'post', - data, + // data, }) } diff --git a/.env.development b/.env.development index ac18d5c..6971c8b 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 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 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/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts index 4e41650..af01f0e 100644 --- a/src/api/eqpt/measurementPlan/early.ts +++ b/src/api/eqpt/measurementPlan/early.ts @@ -91,10 +91,10 @@ }) } // 删除 -export function delApply(data: object) { +export function delApply(data: any) { return request({ - url: '/inspection/approval/delete', + url: `/inspection/approval/delete?id=${data.id}`, method: 'post', - data, + // data, }) } diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue index 39e1eed..60d55d6 100644 --- a/src/views/system/notice/noteList.vue +++ b/src/views/system/notice/noteList.vue @@ -26,8 +26,8 @@ }) // 查询参数 watch(() => noticeTime.value, (newVal) => { if (newVal) { - searchQuery.noticeStartTime = newVal[0] - searchQuery.noticeEndTime = newVal[1] + searchQuery.noticeStartTime = `${newVal[0]} 00:00:00` + searchQuery.noticeEndTime = `${newVal[1]} 23:59:59` } else { searchQuery.noticeStartTime = '' diff --git a/.env.development b/.env.development index ac18d5c..6971c8b 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 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 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/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts index 4e41650..af01f0e 100644 --- a/src/api/eqpt/measurementPlan/early.ts +++ b/src/api/eqpt/measurementPlan/early.ts @@ -91,10 +91,10 @@ }) } // 删除 -export function delApply(data: object) { +export function delApply(data: any) { return request({ - url: '/inspection/approval/delete', + url: `/inspection/approval/delete?id=${data.id}`, method: 'post', - data, + // data, }) } diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue index 39e1eed..60d55d6 100644 --- a/src/views/system/notice/noteList.vue +++ b/src/views/system/notice/noteList.vue @@ -26,8 +26,8 @@ }) // 查询参数 watch(() => noticeTime.value, (newVal) => { if (newVal) { - searchQuery.noticeStartTime = newVal[0] - searchQuery.noticeEndTime = newVal[1] + searchQuery.noticeStartTime = `${newVal[0]} 00:00:00` + searchQuery.noticeEndTime = `${newVal[1]} 23:59:59` } else { searchQuery.noticeStartTime = '' diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue index 409fda4..e5a32c8 100644 --- a/src/views/system/signature/autograph.vue +++ b/src/views/system/signature/autograph.vue @@ -24,8 +24,8 @@ }) // 查询参数 watch(() => createTime.value, (newVal) => { if (newVal) { - searchQuery.createStartTime = newVal[0] - searchQuery.createEndTime = newVal[1] + searchQuery.createStartTime = `${newVal[0]} 00:00:00` + searchQuery.createEndTime = `${newVal[1]} 23:59:59` } else { searchQuery.createStartTime = '' diff --git a/.env.development b/.env.development index ac18d5c..6971c8b 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 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 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/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts index 4e41650..af01f0e 100644 --- a/src/api/eqpt/measurementPlan/early.ts +++ b/src/api/eqpt/measurementPlan/early.ts @@ -91,10 +91,10 @@ }) } // 删除 -export function delApply(data: object) { +export function delApply(data: any) { return request({ - url: '/inspection/approval/delete', + url: `/inspection/approval/delete?id=${data.id}`, method: 'post', - data, + // data, }) } diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue index 39e1eed..60d55d6 100644 --- a/src/views/system/notice/noteList.vue +++ b/src/views/system/notice/noteList.vue @@ -26,8 +26,8 @@ }) // 查询参数 watch(() => noticeTime.value, (newVal) => { if (newVal) { - searchQuery.noticeStartTime = newVal[0] - searchQuery.noticeEndTime = newVal[1] + searchQuery.noticeStartTime = `${newVal[0]} 00:00:00` + searchQuery.noticeEndTime = `${newVal[1]} 23:59:59` } else { searchQuery.noticeStartTime = '' diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue index 409fda4..e5a32c8 100644 --- a/src/views/system/signature/autograph.vue +++ b/src/views/system/signature/autograph.vue @@ -24,8 +24,8 @@ }) // 查询参数 watch(() => createTime.value, (newVal) => { if (newVal) { - searchQuery.createStartTime = newVal[0] - searchQuery.createEndTime = newVal[1] + searchQuery.createStartTime = `${newVal[0]} 00:00:00` + searchQuery.createEndTime = `${newVal[1]} 23:59:59` } else { searchQuery.createStartTime = '' diff --git a/src/views/tested/MeasurementBusiness/detection/components/detection.vue b/src/views/tested/MeasurementBusiness/detection/components/detection.vue index 80c917c..a58a7e2 100644 --- a/src/views/tested/MeasurementBusiness/detection/components/detection.vue +++ b/src/views/tested/MeasurementBusiness/detection/components/detection.vue @@ -15,7 +15,7 @@
- {{ $props.data.labCodeName }}单位: + {{ $props.data.customerName }}单位:
由于我站工作失误，贵单位 {{ $props.data.submitDate }} 送来的 {{ $props.data.deviceName }} {{ $props.data.deviceModel }} {{ $props.data.deviceNo }} 测量结果可能有误，需重新进行测试、校准或检定。请贵单位于 {{ $props.data.returnDate }} 前将此设备以及证书或报告一同送(寄)回本站,谢谢合作。 diff --git a/.env.development b/.env.development index ac18d5c..6971c8b 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 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 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/measurementPlan/early.ts b/src/api/eqpt/measurementPlan/early.ts index 4e41650..af01f0e 100644 --- a/src/api/eqpt/measurementPlan/early.ts +++ b/src/api/eqpt/measurementPlan/early.ts @@ -91,10 +91,10 @@ }) } // 删除 -export function delApply(data: object) { +export function delApply(data: any) { return request({ - url: '/inspection/approval/delete', + url: `/inspection/approval/delete?id=${data.id}`, method: 'post', - data, + // data, }) } diff --git a/src/views/system/notice/noteList.vue b/src/views/system/notice/noteList.vue index 39e1eed..60d55d6 100644 --- a/src/views/system/notice/noteList.vue +++ b/src/views/system/notice/noteList.vue @@ -26,8 +26,8 @@ }) // 查询参数 watch(() => noticeTime.value, (newVal) => { if (newVal) { - searchQuery.noticeStartTime = newVal[0] - searchQuery.noticeEndTime = newVal[1] + searchQuery.noticeStartTime = `${newVal[0]} 00:00:00` + searchQuery.noticeEndTime = `${newVal[1]} 23:59:59` } else { searchQuery.noticeStartTime = '' diff --git a/src/views/system/signature/autograph.vue b/src/views/system/signature/autograph.vue index 409fda4..e5a32c8 100644 --- a/src/views/system/signature/autograph.vue +++ b/src/views/system/signature/autograph.vue @@ -24,8 +24,8 @@ }) // 查询参数 watch(() => createTime.value, (newVal) => { if (newVal) { - searchQuery.createStartTime = newVal[0] - searchQuery.createEndTime = newVal[1] + searchQuery.createStartTime = `${newVal[0]} 00:00:00` + searchQuery.createEndTime = `${newVal[1]} 23:59:59` } else { searchQuery.createStartTime = '' diff --git a/src/views/tested/MeasurementBusiness/detection/components/detection.vue b/src/views/tested/MeasurementBusiness/detection/components/detection.vue index 80c917c..a58a7e2 100644 --- a/src/views/tested/MeasurementBusiness/detection/components/detection.vue +++ b/src/views/tested/MeasurementBusiness/detection/components/detection.vue @@ -15,7 +15,7 @@
- {{ $props.data.labCodeName }}单位: + {{ $props.data.customerName }}单位:
由于我站工作失误，贵单位 {{ $props.data.submitDate }} 送来的 {{ $props.data.deviceName }} {{ $props.data.deviceModel }} {{ $props.data.deviceNo }} 测量结果可能有误，需重新进行测试、校准或检定。请贵单位于 {{ $props.data.returnDate }} 前将此设备以及证书或报告一同送(寄)回本站,谢谢合作。 diff --git a/src/views/tested/MeasurementBusiness/detection/index.vue b/src/views/tested/MeasurementBusiness/detection/index.vue index 23d95aa..5f57089 100644 --- a/src/views/tested/MeasurementBusiness/detection/index.vue +++ b/src/views/tested/MeasurementBusiness/detection/index.vue @@ -16,9 +16,9 @@ // 证书有效期开始结束时间 const datetimerange = ref() watch(() => datetimerange.value, (newVal) => { - if (newVal.length === 2) { - listQuery.createTimeStart = newVal[0] - listQuery.createTimeEnd = newVal[1] + if (newVal) { + listQuery.createTimeStart = `${newVal[0]} 00:00:00` + listQuery.createTimeEnd = `${newVal[1]} 23:59:59` } else { listQuery.createTimeStart = '' @@ -58,35 +58,35 @@ // 是否显示当前页，否则跳转第一页 listQuery.offset = 1 } - // getListPage(listQuery).then((response) => { - // list.value = response.data.rows - // total.value = parseInt(response.data.total) - // listLoading.value = false - // }) - list.value = [ - { - createTime: '2023-09-05', // 创建时间 - createUserId: '123', // 创建人id - createUserName: '张三', // 创建人名字 - customerId: '123', // 委托方id - customerName: '李四', // 委托方名称 - deviceModel: 'SQ001', // 送检设备型号 - deviceName: '测试设备', // 送检设备名称 - deviceNo: '112233', // 送检设备编号 - id: '123', // id - labCode: '1', // 实验室代码 - labCodeName: '海口实验室', // 实验室代码 - noticeDate: '2023-09-05', // 通知日期 - noticeName: '海口计量站', // 通知单名称 - noticeNo: '12345', // 通知单编号 - noticeUserId: '1', // 通知委托方用户id - noticeUserName: '王五', // 通知委托方用户名字 - returnDate: '2023-09-05', // 寄回日期 - submitDate: '2023-09-05', // 送检日期 - updateTime: '2023-09-05', // 更新时间 - }, - ] - listLoading.value = false + getListPage(listQuery).then((response) => { + list.value = response.data.rows + total.value = parseInt(response.data.total) + listLoading.value = false + }) + // list.value = [ + // { + // createTime: '2023-09-05', // 创建时间 + // createUserId: '123', // 创建人id + // createUserName: '张三', // 创建人名字 + // customerId: '123', // 委托方id + // customerName: '李四', // 委托方名称 + // deviceModel: 'SQ001', // 送检设备型号 + // deviceName: '测试设备', // 送检设备名称 + // deviceNo: '112233', // 送检设备编号 + // id: '123', // id + // labCode: '1', // 实验室代码 + // labCodeName: '海口实验室', // 实验室代码 + // noticeDate: '2023-09-05', // 通知日期 + // noticeName: '海口计量站', // 通知单名称 + // noticeNo: '12345', // 通知单编号 + // noticeUserId: '1', // 通知委托方用户id + // noticeUserName: '王五', // 通知委托方用户名字 + // returnDate: '2023-09-05', // 寄回日期 + // submitDate: '2023-09-05', // 送检日期 + // updateTime: '2023-09-05', // 更新时间 + // }, + // ] + // listLoading.value = false } fetchData() // 查询数据 @@ -155,8 +155,8 @@ @@ -166,8 +166,7 @@