diff --git a/src/api/RQWarning.js b/src/api/RQWarning.js index e263923..b406750 100644 --- a/src/api/RQWarning.js +++ b/src/api/RQWarning.js @@ -44,12 +44,20 @@ }); } +// 下载 +export function warningReleaseDatailDownload(params) { + return request({ + url: `/business/warningReleaseDatail/download`, + method: 'get', + params, + }); +} // /commonWarning/list export function commonWarningList(query) { return request({ - url: "/business/commonWarning/list", - method: "get", + url: '/business/commonWarning/list', + method: 'get', params: query, }); } @@ -58,15 +66,15 @@ export function commonWarningGet(id) { return request({ url: `/business/commonWarning/${id}`, - method: "get", + method: 'get', }); } // /alarmWorkOrder/add export function alarmWorkOrderAdd(data) { return request({ - url: "/business/alarmWorkOrder/add", - method: "POST", + url: '/business/alarmWorkOrder/add', + method: 'POST', data: data, }); } @@ -74,8 +82,8 @@ // /alarmWorkOrder/list export function alarmWorkOrderList(query) { return request({ - url: "/business/alarmWorkOrder/list", - method: "get", + url: '/business/alarmWorkOrder/list', + method: 'get', params: query, }); -} \ No newline at end of file +} diff --git a/src/api/RQWarning.js b/src/api/RQWarning.js index e263923..b406750 100644 --- a/src/api/RQWarning.js +++ b/src/api/RQWarning.js @@ -44,12 +44,20 @@ }); } +// 下载 +export function warningReleaseDatailDownload(params) { + return request({ + url: `/business/warningReleaseDatail/download`, + method: 'get', + params, + }); +} // /commonWarning/list export function commonWarningList(query) { return request({ - url: "/business/commonWarning/list", - method: "get", + url: '/business/commonWarning/list', + method: 'get', params: query, }); } @@ -58,15 +66,15 @@ export function commonWarningGet(id) { return request({ url: `/business/commonWarning/${id}`, - method: "get", + method: 'get', }); } // /alarmWorkOrder/add export function alarmWorkOrderAdd(data) { return request({ - url: "/business/alarmWorkOrder/add", - method: "POST", + url: '/business/alarmWorkOrder/add', + method: 'POST', data: data, }); } @@ -74,8 +82,8 @@ // /alarmWorkOrder/list export function alarmWorkOrderList(query) { return request({ - url: "/business/alarmWorkOrder/list", - method: "get", + url: '/business/alarmWorkOrder/list', + method: 'get', params: query, }); -} \ No newline at end of file +} diff --git a/src/views/DialogTabs/DialogConfig.js b/src/views/DialogTabs/DialogConfig.js index 132e121..bcd6225 100644 --- a/src/views/DialogTabs/DialogConfig.js +++ b/src/views/DialogTabs/DialogConfig.js @@ -59,7 +59,7 @@ }, { - title: '燃气安全应急响应预警发布', + title: '安全应急响应预警发布', content: markRaw(res_components['RQ_Warning']), name: 'RQ_Warning', }, diff --git a/src/api/RQWarning.js b/src/api/RQWarning.js index e263923..b406750 100644 --- a/src/api/RQWarning.js +++ b/src/api/RQWarning.js @@ -44,12 +44,20 @@ }); } +// 下载 +export function warningReleaseDatailDownload(params) { + return request({ + url: `/business/warningReleaseDatail/download`, + method: 'get', + params, + }); +} // /commonWarning/list export function commonWarningList(query) { return request({ - url: "/business/commonWarning/list", - method: "get", + url: '/business/commonWarning/list', + method: 'get', params: query, }); } @@ -58,15 +66,15 @@ export function commonWarningGet(id) { return request({ url: `/business/commonWarning/${id}`, - method: "get", + method: 'get', }); } // /alarmWorkOrder/add export function alarmWorkOrderAdd(data) { return request({ - url: "/business/alarmWorkOrder/add", - method: "POST", + url: '/business/alarmWorkOrder/add', + method: 'POST', data: data, }); } @@ -74,8 +82,8 @@ // /alarmWorkOrder/list export function alarmWorkOrderList(query) { return request({ - url: "/business/alarmWorkOrder/list", - method: "get", + url: '/business/alarmWorkOrder/list', + method: 'get', params: query, }); -} \ No newline at end of file +} diff --git a/src/views/DialogTabs/DialogConfig.js b/src/views/DialogTabs/DialogConfig.js index 132e121..bcd6225 100644 --- a/src/views/DialogTabs/DialogConfig.js +++ b/src/views/DialogTabs/DialogConfig.js @@ -59,7 +59,7 @@ }, { - title: '燃气安全应急响应预警发布', + title: '安全应急响应预警发布', content: markRaw(res_components['RQ_Warning']), name: 'RQ_Warning', }, diff --git a/src/views/DialogTabs/component/RQ_Warning.vue b/src/views/DialogTabs/component/RQ_Warning.vue index 62ac9a1..f4e243a 100644 --- a/src/views/DialogTabs/component/RQ_Warning.vue +++ b/src/views/DialogTabs/component/RQ_Warning.vue @@ -163,6 +163,14 @@ + + @@ -174,6 +182,7 @@ warningReleaseDatailAdd, warningReleaseDatailPage, warningReleaseDatailEditfb, + warningReleaseDatailDownload, } from '@/api/RQWarning.js'; import { ref, reactive, toRefs, onMounted } from 'vue'; import bus from '@/bus'; @@ -187,6 +196,8 @@ const accept = ref([]); const YjGrade = ref(''); const total = ref(0); +const totalA = ref(0); + const AllData = reactive({ rules: { eventType: [{ required: true, message: '请选择事件类型', trigger: 'blur' }], @@ -201,7 +212,7 @@ }, queryParams2: { pageNum: 1, - pageSize: 100, + pageSize: 20, }, form: { @@ -237,7 +248,7 @@ const getRyData = val => { personnelPage(AllData.queryParams).then(res => { tableData.value = res.data; - // total.value = res.data.total; + total.value = res.total; }); }; @@ -327,6 +338,7 @@ function YJDialog() { warningReleaseDatailPage(AllData.queryParams2).then(res => { QctableData.value = res.data; + totalA.value = res.total; }); } @@ -355,7 +367,18 @@ } // 下载 -function rowDown(data) {} +function rowDown(data) { + // proxy.download( + // '/business/warningReleaseDatail/download', + // { + // id: data.id, + // }, + // `wenjian${new Date().getTime()}.pdf` + // ); + // const baseURL = 'http://192.168.16.105:13002' + '/warningReleaseDatail/download?id='; + // const fileUrl = `${baseURL}${data.id}`; + // window.open(String(fileUrl)); +} onMounted(() => { bus.on('RQ_PrimaryType', val => { @@ -563,5 +586,18 @@ } } } + + :deep(.pagination-container) { + background: #0d4456; + } + :deep(.el-pagination__total) { + color: #f7f7f7; + } + :deep(.el-pagination__goto) { + color: #f7f7f7; + } + :deep(.el-pagination__classifier) { + color: #f7f7f7; + } } diff --git a/src/api/RQWarning.js b/src/api/RQWarning.js index e263923..b406750 100644 --- a/src/api/RQWarning.js +++ b/src/api/RQWarning.js @@ -44,12 +44,20 @@ }); } +// 下载 +export function warningReleaseDatailDownload(params) { + return request({ + url: `/business/warningReleaseDatail/download`, + method: 'get', + params, + }); +} // /commonWarning/list export function commonWarningList(query) { return request({ - url: "/business/commonWarning/list", - method: "get", + url: '/business/commonWarning/list', + method: 'get', params: query, }); } @@ -58,15 +66,15 @@ export function commonWarningGet(id) { return request({ url: `/business/commonWarning/${id}`, - method: "get", + method: 'get', }); } // /alarmWorkOrder/add export function alarmWorkOrderAdd(data) { return request({ - url: "/business/alarmWorkOrder/add", - method: "POST", + url: '/business/alarmWorkOrder/add', + method: 'POST', data: data, }); } @@ -74,8 +82,8 @@ // /alarmWorkOrder/list export function alarmWorkOrderList(query) { return request({ - url: "/business/alarmWorkOrder/list", - method: "get", + url: '/business/alarmWorkOrder/list', + method: 'get', params: query, }); -} \ No newline at end of file +} diff --git a/src/views/DialogTabs/DialogConfig.js b/src/views/DialogTabs/DialogConfig.js index 132e121..bcd6225 100644 --- a/src/views/DialogTabs/DialogConfig.js +++ b/src/views/DialogTabs/DialogConfig.js @@ -59,7 +59,7 @@ }, { - title: '燃气安全应急响应预警发布', + title: '安全应急响应预警发布', content: markRaw(res_components['RQ_Warning']), name: 'RQ_Warning', }, diff --git a/src/views/DialogTabs/component/RQ_Warning.vue b/src/views/DialogTabs/component/RQ_Warning.vue index 62ac9a1..f4e243a 100644 --- a/src/views/DialogTabs/component/RQ_Warning.vue +++ b/src/views/DialogTabs/component/RQ_Warning.vue @@ -163,6 +163,14 @@ + + @@ -174,6 +182,7 @@ warningReleaseDatailAdd, warningReleaseDatailPage, warningReleaseDatailEditfb, + warningReleaseDatailDownload, } from '@/api/RQWarning.js'; import { ref, reactive, toRefs, onMounted } from 'vue'; import bus from '@/bus'; @@ -187,6 +196,8 @@ const accept = ref([]); const YjGrade = ref(''); const total = ref(0); +const totalA = ref(0); + const AllData = reactive({ rules: { eventType: [{ required: true, message: '请选择事件类型', trigger: 'blur' }], @@ -201,7 +212,7 @@ }, queryParams2: { pageNum: 1, - pageSize: 100, + pageSize: 20, }, form: { @@ -237,7 +248,7 @@ const getRyData = val => { personnelPage(AllData.queryParams).then(res => { tableData.value = res.data; - // total.value = res.data.total; + total.value = res.total; }); }; @@ -327,6 +338,7 @@ function YJDialog() { warningReleaseDatailPage(AllData.queryParams2).then(res => { QctableData.value = res.data; + totalA.value = res.total; }); } @@ -355,7 +367,18 @@ } // 下载 -function rowDown(data) {} +function rowDown(data) { + // proxy.download( + // '/business/warningReleaseDatail/download', + // { + // id: data.id, + // }, + // `wenjian${new Date().getTime()}.pdf` + // ); + // const baseURL = 'http://192.168.16.105:13002' + '/warningReleaseDatail/download?id='; + // const fileUrl = `${baseURL}${data.id}`; + // window.open(String(fileUrl)); +} onMounted(() => { bus.on('RQ_PrimaryType', val => { @@ -563,5 +586,18 @@ } } } + + :deep(.pagination-container) { + background: #0d4456; + } + :deep(.el-pagination__total) { + color: #f7f7f7; + } + :deep(.el-pagination__goto) { + color: #f7f7f7; + } + :deep(.el-pagination__classifier) { + color: #f7f7f7; + } } diff --git a/src/views/oneMap/OverallOverview/LeftBox.vue b/src/views/oneMap/OverallOverview/LeftBox.vue index 910bdd4..57f1215 100644 --- a/src/views/oneMap/OverallOverview/LeftBox.vue +++ b/src/views/oneMap/OverallOverview/LeftBox.vue @@ -215,8 +215,8 @@ num3: '4/12', Imgurl: ranqi_icon, dw1: '公里', - dw2: '套', - dw3: '口', + dw2: '口', + dw3: '套', }, ]); @@ -236,8 +236,8 @@ num3: '4/12', Imgurl: ranqi_icon, dw1: '公里', - dw2: '套', - dw3: '口', + dw2: '口', + dw3: '套', }, ]; } else if (activedname.value == '排水') { diff --git a/src/api/RQWarning.js b/src/api/RQWarning.js index e263923..b406750 100644 --- a/src/api/RQWarning.js +++ b/src/api/RQWarning.js @@ -44,12 +44,20 @@ }); } +// 下载 +export function warningReleaseDatailDownload(params) { + return request({ + url: `/business/warningReleaseDatail/download`, + method: 'get', + params, + }); +} // /commonWarning/list export function commonWarningList(query) { return request({ - url: "/business/commonWarning/list", - method: "get", + url: '/business/commonWarning/list', + method: 'get', params: query, }); } @@ -58,15 +66,15 @@ export function commonWarningGet(id) { return request({ url: `/business/commonWarning/${id}`, - method: "get", + method: 'get', }); } // /alarmWorkOrder/add export function alarmWorkOrderAdd(data) { return request({ - url: "/business/alarmWorkOrder/add", - method: "POST", + url: '/business/alarmWorkOrder/add', + method: 'POST', data: data, }); } @@ -74,8 +82,8 @@ // /alarmWorkOrder/list export function alarmWorkOrderList(query) { return request({ - url: "/business/alarmWorkOrder/list", - method: "get", + url: '/business/alarmWorkOrder/list', + method: 'get', params: query, }); -} \ No newline at end of file +} diff --git a/src/views/DialogTabs/DialogConfig.js b/src/views/DialogTabs/DialogConfig.js index 132e121..bcd6225 100644 --- a/src/views/DialogTabs/DialogConfig.js +++ b/src/views/DialogTabs/DialogConfig.js @@ -59,7 +59,7 @@ }, { - title: '燃气安全应急响应预警发布', + title: '安全应急响应预警发布', content: markRaw(res_components['RQ_Warning']), name: 'RQ_Warning', }, diff --git a/src/views/DialogTabs/component/RQ_Warning.vue b/src/views/DialogTabs/component/RQ_Warning.vue index 62ac9a1..f4e243a 100644 --- a/src/views/DialogTabs/component/RQ_Warning.vue +++ b/src/views/DialogTabs/component/RQ_Warning.vue @@ -163,6 +163,14 @@ + + @@ -174,6 +182,7 @@ warningReleaseDatailAdd, warningReleaseDatailPage, warningReleaseDatailEditfb, + warningReleaseDatailDownload, } from '@/api/RQWarning.js'; import { ref, reactive, toRefs, onMounted } from 'vue'; import bus from '@/bus'; @@ -187,6 +196,8 @@ const accept = ref([]); const YjGrade = ref(''); const total = ref(0); +const totalA = ref(0); + const AllData = reactive({ rules: { eventType: [{ required: true, message: '请选择事件类型', trigger: 'blur' }], @@ -201,7 +212,7 @@ }, queryParams2: { pageNum: 1, - pageSize: 100, + pageSize: 20, }, form: { @@ -237,7 +248,7 @@ const getRyData = val => { personnelPage(AllData.queryParams).then(res => { tableData.value = res.data; - // total.value = res.data.total; + total.value = res.total; }); }; @@ -327,6 +338,7 @@ function YJDialog() { warningReleaseDatailPage(AllData.queryParams2).then(res => { QctableData.value = res.data; + totalA.value = res.total; }); } @@ -355,7 +367,18 @@ } // 下载 -function rowDown(data) {} +function rowDown(data) { + // proxy.download( + // '/business/warningReleaseDatail/download', + // { + // id: data.id, + // }, + // `wenjian${new Date().getTime()}.pdf` + // ); + // const baseURL = 'http://192.168.16.105:13002' + '/warningReleaseDatail/download?id='; + // const fileUrl = `${baseURL}${data.id}`; + // window.open(String(fileUrl)); +} onMounted(() => { bus.on('RQ_PrimaryType', val => { @@ -563,5 +586,18 @@ } } } + + :deep(.pagination-container) { + background: #0d4456; + } + :deep(.el-pagination__total) { + color: #f7f7f7; + } + :deep(.el-pagination__goto) { + color: #f7f7f7; + } + :deep(.el-pagination__classifier) { + color: #f7f7f7; + } } diff --git a/src/views/oneMap/OverallOverview/LeftBox.vue b/src/views/oneMap/OverallOverview/LeftBox.vue index 910bdd4..57f1215 100644 --- a/src/views/oneMap/OverallOverview/LeftBox.vue +++ b/src/views/oneMap/OverallOverview/LeftBox.vue @@ -215,8 +215,8 @@ num3: '4/12', Imgurl: ranqi_icon, dw1: '公里', - dw2: '套', - dw3: '口', + dw2: '口', + dw3: '套', }, ]); @@ -236,8 +236,8 @@ num3: '4/12', Imgurl: ranqi_icon, dw1: '公里', - dw2: '套', - dw3: '口', + dw2: '口', + dw3: '套', }, ]; } else if (activedname.value == '排水') { diff --git a/src/views/oneMap/components/ZHRQ.vue b/src/views/oneMap/components/ZHRQ.vue index be22909..00f60e3 100644 --- a/src/views/oneMap/components/ZHRQ.vue +++ b/src/views/oneMap/components/ZHRQ.vue @@ -204,7 +204,7 @@ --> -
发布预警
+
发布预警
@@ -1831,5 +1831,13 @@ cursor: pointer; box-shadow: inset 0 0 5px 2px #47eef38a; } + .TuChengImgTrue { + transform: translateX(-460px); + transition: all 1s ease; + } + .TuChengImgFalse { + transform: translateX(0px); + transition: all 1s ease; + } } diff --git a/src/api/RQWarning.js b/src/api/RQWarning.js index e263923..b406750 100644 --- a/src/api/RQWarning.js +++ b/src/api/RQWarning.js @@ -44,12 +44,20 @@ }); } +// 下载 +export function warningReleaseDatailDownload(params) { + return request({ + url: `/business/warningReleaseDatail/download`, + method: 'get', + params, + }); +} // /commonWarning/list export function commonWarningList(query) { return request({ - url: "/business/commonWarning/list", - method: "get", + url: '/business/commonWarning/list', + method: 'get', params: query, }); } @@ -58,15 +66,15 @@ export function commonWarningGet(id) { return request({ url: `/business/commonWarning/${id}`, - method: "get", + method: 'get', }); } // /alarmWorkOrder/add export function alarmWorkOrderAdd(data) { return request({ - url: "/business/alarmWorkOrder/add", - method: "POST", + url: '/business/alarmWorkOrder/add', + method: 'POST', data: data, }); } @@ -74,8 +82,8 @@ // /alarmWorkOrder/list export function alarmWorkOrderList(query) { return request({ - url: "/business/alarmWorkOrder/list", - method: "get", + url: '/business/alarmWorkOrder/list', + method: 'get', params: query, }); -} \ No newline at end of file +} diff --git a/src/views/DialogTabs/DialogConfig.js b/src/views/DialogTabs/DialogConfig.js index 132e121..bcd6225 100644 --- a/src/views/DialogTabs/DialogConfig.js +++ b/src/views/DialogTabs/DialogConfig.js @@ -59,7 +59,7 @@ }, { - title: '燃气安全应急响应预警发布', + title: '安全应急响应预警发布', content: markRaw(res_components['RQ_Warning']), name: 'RQ_Warning', }, diff --git a/src/views/DialogTabs/component/RQ_Warning.vue b/src/views/DialogTabs/component/RQ_Warning.vue index 62ac9a1..f4e243a 100644 --- a/src/views/DialogTabs/component/RQ_Warning.vue +++ b/src/views/DialogTabs/component/RQ_Warning.vue @@ -163,6 +163,14 @@ + + @@ -174,6 +182,7 @@ warningReleaseDatailAdd, warningReleaseDatailPage, warningReleaseDatailEditfb, + warningReleaseDatailDownload, } from '@/api/RQWarning.js'; import { ref, reactive, toRefs, onMounted } from 'vue'; import bus from '@/bus'; @@ -187,6 +196,8 @@ const accept = ref([]); const YjGrade = ref(''); const total = ref(0); +const totalA = ref(0); + const AllData = reactive({ rules: { eventType: [{ required: true, message: '请选择事件类型', trigger: 'blur' }], @@ -201,7 +212,7 @@ }, queryParams2: { pageNum: 1, - pageSize: 100, + pageSize: 20, }, form: { @@ -237,7 +248,7 @@ const getRyData = val => { personnelPage(AllData.queryParams).then(res => { tableData.value = res.data; - // total.value = res.data.total; + total.value = res.total; }); }; @@ -327,6 +338,7 @@ function YJDialog() { warningReleaseDatailPage(AllData.queryParams2).then(res => { QctableData.value = res.data; + totalA.value = res.total; }); } @@ -355,7 +367,18 @@ } // 下载 -function rowDown(data) {} +function rowDown(data) { + // proxy.download( + // '/business/warningReleaseDatail/download', + // { + // id: data.id, + // }, + // `wenjian${new Date().getTime()}.pdf` + // ); + // const baseURL = 'http://192.168.16.105:13002' + '/warningReleaseDatail/download?id='; + // const fileUrl = `${baseURL}${data.id}`; + // window.open(String(fileUrl)); +} onMounted(() => { bus.on('RQ_PrimaryType', val => { @@ -563,5 +586,18 @@ } } } + + :deep(.pagination-container) { + background: #0d4456; + } + :deep(.el-pagination__total) { + color: #f7f7f7; + } + :deep(.el-pagination__goto) { + color: #f7f7f7; + } + :deep(.el-pagination__classifier) { + color: #f7f7f7; + } } diff --git a/src/views/oneMap/OverallOverview/LeftBox.vue b/src/views/oneMap/OverallOverview/LeftBox.vue index 910bdd4..57f1215 100644 --- a/src/views/oneMap/OverallOverview/LeftBox.vue +++ b/src/views/oneMap/OverallOverview/LeftBox.vue @@ -215,8 +215,8 @@ num3: '4/12', Imgurl: ranqi_icon, dw1: '公里', - dw2: '套', - dw3: '口', + dw2: '口', + dw3: '套', }, ]); @@ -236,8 +236,8 @@ num3: '4/12', Imgurl: ranqi_icon, dw1: '公里', - dw2: '套', - dw3: '口', + dw2: '口', + dw3: '套', }, ]; } else if (activedname.value == '排水') { diff --git a/src/views/oneMap/components/ZHRQ.vue b/src/views/oneMap/components/ZHRQ.vue index be22909..00f60e3 100644 --- a/src/views/oneMap/components/ZHRQ.vue +++ b/src/views/oneMap/components/ZHRQ.vue @@ -204,7 +204,7 @@ --> -
发布预警
+
发布预警
@@ -1831,5 +1831,13 @@ cursor: pointer; box-shadow: inset 0 0 5px 2px #47eef38a; } + .TuChengImgTrue { + transform: translateX(-460px); + transition: all 1s ease; + } + .TuChengImgFalse { + transform: translateX(0px); + transition: all 1s ease; + } } diff --git a/src/views/oneMap/floodPrevention/FholRightBox.vue b/src/views/oneMap/floodPrevention/FholRightBox.vue index bcffb94..05cf204 100644 --- a/src/views/oneMap/floodPrevention/FholRightBox.vue +++ b/src/views/oneMap/floodPrevention/FholRightBox.vue @@ -7,35 +7,21 @@
    -
  • +
  • 站点名称：
    {{ i.siteName }}
    - {{ i.siteStatus }} + {{ i.siteStatus }}
    水深：
    -
    - {{ i.z || 0 }}米 -
    +
    {{ i.z || 0 }}米
    风险分析：
    -
    +
    {{ i.warnInfo }}
    @@ -56,12 +42,7 @@ placeholder="请选择节点" style="width: 200px" > - +
@@ -93,7 +74,11 @@
878.9m³
-
70%
+
+ 前水池水深 +
8.9
+
m
+
@@ -109,7 +94,7 @@
@@ -142,98 +127,98 @@ @@ -375,7 +360,7 @@ width: 435px; height: 50px; .drcpl { - width: 360px; + width: 280px; height: 22px; background: #155a89; border-radius: 11px; @@ -410,10 +395,10 @@ .percentVal { margin-top: 15px; color: #fff; - font-size: 18px; + font-size: 16px; font-weight: 400; color: #ffffff; - margin-left: 30px; + margin-left: 25px; } } .StationList { @@ -570,7 +555,7 @@ height: 44px; line-height: 50px; width: 98%; - background: url("@/assets/newImgs/partBg.png") no-repeat; + background: url('@/assets/newImgs/partBg.png') no-repeat; background-size: 100% 100%; display: flex; align-items: center;