diff --git a/frontend/src/api/sw/index.ts b/frontend/src/api/sw/index.ts
index 55da7ca..02c35f3 100644
--- a/frontend/src/api/sw/index.ts
+++ b/frontend/src/api/sw/index.ts
@@ -1,7 +1,65 @@
import request from '@/utils/request';
export function getKendoListCust(data: any) {
return request({
- url: '/sw/alongList/qgc/GetKendoListCust',
+ url: '/api/wmp-env-server/sw/alongList/qgc/GetKendoListCust',
+ method: 'post',
+ data
+ });
+}
+//获取水温下拉框
+export function wbsbGetKendoList(data: any) {
+ return request({
+ url: '/api/dec-lygk-base-server/base/wbsb/GetKendoList',
+ method: 'post',
+ data
+ });
+}
+/**
+ * 获取垂向水温变化树形站点数据
+ * @param data 请求参数
+ * @returns Promise
+ */
+export function getChuiXiangShuiWenTreeStcd(data: any) {
+ return request({
+ url: '/api/wmp-env-server/base/sdrvwts/default/treeStcd',
+ method: 'post',
+ data,
+ });
+}
+
+/**
+ * 获取垂向水温变化列表数据(按月份聚合)
+ * @param data 请求参数 { filter, sort }
+ * @returns Promise
+ */
+export function getCxswList(data: any) {
+ return request({
+ url: '/api/wmp-env-server/sw/dzCxList/GetKendoListCust',
+ method: 'post',
+ data
+ });
+}
+//获取出入库水温下拉选则树
+export function getVmsstbprpt(data: any) {
+ return request({
+ url: '/api/dec-lygk-base-server/base/vmsstbprpt/GetKendoList',
+ method: 'post',
+ data
+ });
+}
+//出入库水温图表数据
+//
+export function inOutOneGetKendoListCust(data: any) {
+ return request({
+ url: '/api/wmp-env-server/sw/inOutOne/GetKendoListCust',
+ method: 'post',
+ data
+ });
+}
+//水温监测工作开展情况
+export function baseEvnmAutoMonitorGetKendoListCust(data: any) {
+ return request({
+ url: '/api/dec-lygk-base-server/base/evnmAutoMonitor/GetKendoListCust',
method: 'post',
data
});
diff --git a/frontend/src/components/SidePanelItem/index.vue b/frontend/src/components/SidePanelItem/index.vue
index 72908eb..faaa076 100644
--- a/frontend/src/components/SidePanelItem/index.vue
+++ b/frontend/src/components/SidePanelItem/index.vue
@@ -26,32 +26,52 @@
+ @focus="handleFocus" @blur="handleBlur" @change="handleChange" >
-
+ :picker="datetimePicker.picker"
+ :allowClear="false"
+ placeholder=" "
+ @change="handleDateTimeChange"
+ :size="'small'"
+ :disabledDate="createDisabledDateFn(datetimePicker.picker)"
+ :disabledTime="disabledTimeForSinglePicker" />
图片
@@ -66,7 +86,7 @@
@@ -338,4 +803,4 @@ onMounted(() => {
padding: 0px !important;
}
}
-
+
\ No newline at end of file
diff --git a/frontend/src/modules/chuixiangshuiwenChangeMod/index.vue b/frontend/src/modules/chuixiangshuiwenChangeMod/index.vue
index 4608020..610f38c 100644
--- a/frontend/src/modules/chuixiangshuiwenChangeMod/index.vue
+++ b/frontend/src/modules/chuixiangshuiwenChangeMod/index.vue
@@ -1,150 +1,429 @@
-
+
\ No newline at end of file
+
+:deep(.ant-spin-nested-loading) {
+ height: 252px !important;
+}
+
diff --git a/frontend/src/modules/churukushuiwenMod/index.vue b/frontend/src/modules/churukushuiwenMod/index.vue
index a1d1c18..268aac3 100644
--- a/frontend/src/modules/churukushuiwenMod/index.vue
+++ b/frontend/src/modules/churukushuiwenMod/index.vue
@@ -1,240 +1,736 @@
+
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/frontend/src/modules/shuiwenjiancegongzuokaizhangqingkuang/index.vue b/frontend/src/modules/shuiwenjiancegongzuokaizhangqingkuang/index.vue
index e9b13d8..508477f 100644
--- a/frontend/src/modules/shuiwenjiancegongzuokaizhangqingkuang/index.vue
+++ b/frontend/src/modules/shuiwenjiancegongzuokaizhangqingkuang/index.vue
@@ -1,43 +1,40 @@
-
-
-
-
-
+
+
+
-
-
{{ facility.name }}
-
-
{{ facility.count }}个
+
+
{{ facility.name }}
+
+ {{ facility.count }}个
+
-
+
diff --git a/frontend/src/utils/request.ts b/frontend/src/utils/request.ts
index 10b5907..3e5f31e 100644
--- a/frontend/src/utils/request.ts
+++ b/frontend/src/utils/request.ts
@@ -19,14 +19,14 @@ service.interceptors.request.use(
`Expected 'config' and 'config.headers' not to be undefined`
);
}
- if (config.url.includes('/dec-lygk-base-server')) {
+ if (config.url.includes('/dec-lygk-base-server') || config.url.includes('/wmp-env-server')) {
config.headers._appid = '974975A6-47FD-4C04-9ACD-68938D2992BD';
config.headers._isolateid = '5b34aecb-adfb-4dfc-ad95-21505a9eb388';
config.headers._platformid = '31e6d13f-c359-4a19-8e67-b6f868f2401b';
config.headers._sysid = '10EC2E0B-AEA9-4757-83A2-201BA1BC54E9';
config.headers.authorization =
- 'bearer f96d0008-f77f-497a-b05d-82cded9ccd89';
+ 'bearer e5445e2e-798c-4cfe-9cfe-0926e606c85c';
config.baseURL = '/';
} else {
const user = useUserStoreHook();
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 34cb042..86249ab 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -54,6 +54,16 @@ export default ({ mode }: ConfigEnv): UserConfig => {
new RegExp('^/api/dec-lygk-base-server'),
'/api/dec-lygk-base-server'
)
+ },
+ '/api/wmp-env-server': {
+ target: 'https://211.99.26.225:12122',
+ changeOrigin: true,
+ secure: false,
+ rewrite: path =>
+ path.replace(
+ new RegExp('^/api/wmp-env-server'),
+ '/api/wmp-env-server'
+ )
}
}
},