diff --git a/src/api/cs-device-boot/edData.ts b/src/api/cs-device-boot/edData.ts index 27e4e09..1b3c80c 100644 --- a/src/api/cs-device-boot/edData.ts +++ b/src/api/cs-device-boot/edData.ts @@ -19,6 +19,14 @@ export const auditEdData = (data) => { headers: { 'Content-Type': 'multipart/form-data', }, + data: data, + }) +} +export const auditEngineering = (data) => { + return request({ + url: '/cs-device-boot/engineering/auditEngineering', + method: 'post', + data: data, }) } \ No newline at end of file diff --git a/src/components/echarts/rmsboxi.vue b/src/components/echarts/rmsboxi.vue index a27b85c..8cc8833 100644 --- a/src/components/echarts/rmsboxi.vue +++ b/src/components/echarts/rmsboxi.vue @@ -209,6 +209,8 @@ export default { this.boxoList.evtParamTm + "s"; } else if (this.boxoList.systemType == 'WX') { + + this.titles = ' 监测点名称:' + @@ -216,7 +218,7 @@ export default { ' 发生时刻:' + this.boxoList.startTime + ' 暂降(骤升)幅值:' + - (this.boxoList.featureAmplitude ? this.boxoList.featureAmplitude.toFixed(2) : '-') + + (this.boxoList.featureAmplitude ) + '% 持续时间:' + (this.boxoList.persistTime ? this.boxoList.persistTime.toFixed(2) : '-') + 's' diff --git a/src/components/echarts/shushiboxi.vue b/src/components/echarts/shushiboxi.vue index e211319..ca49926 100644 --- a/src/components/echarts/shushiboxi.vue +++ b/src/components/echarts/shushiboxi.vue @@ -173,7 +173,7 @@ export default { ' 发生时刻:' + this.boxoList.startTime + ' 暂降(骤升)幅值:' + - (this.boxoList.featureAmplitude ? this.boxoList.featureAmplitude.toFixed(2) : '-') + + (this.boxoList.featureAmplitude) + '% 持续时间:' + (this.boxoList.persistTime ? this.boxoList.persistTime.toFixed(2) : '-') + 's' @@ -738,10 +738,10 @@ export default { itemStyle: { color: '#FFCC00' }, - progressive:1000, + progressive: 1000, // 渲染阈值,大于此值则启动渐进渲染 progressiveThreshold: 2000, - + large: true, data: adata }, @@ -754,10 +754,10 @@ export default { itemStyle: { color: '#009900' }, - progressive:1000, + progressive: 1000, // 渲染阈值,大于此值则启动渐进渲染 progressiveThreshold: 2000, - + large: true, data: bdata }, @@ -770,10 +770,10 @@ export default { itemStyle: { color: '#CC0000' }, - progressive:1000, + progressive: 1000, // 渲染阈值,大于此值则启动渐进渲染 progressiveThreshold: 2000, - + large: true, data: cdata }, @@ -785,7 +785,7 @@ export default { width: 18, height: 18 }, - + data: cu } ] @@ -1104,7 +1104,7 @@ export default { color: '#FFCC00' }, large: true, - progressive:1000, + progressive: 1000, // 渲染阈值,大于此值则启动渐进渲染 progressiveThreshold: 2000, data: adata @@ -1118,7 +1118,7 @@ export default { itemStyle: { color: '#009900' }, - progressive:1000, + progressive: 1000, // 渲染阈值,大于此值则启动渐进渲染 progressiveThreshold: 2000, large: true, @@ -1133,7 +1133,7 @@ export default { itemStyle: { color: '#CC0000' }, - progressive:1000, + progressive: 1000, // 渲染阈值,大于此值则启动渐进渲染 progressiveThreshold: 2000, large: true, diff --git a/src/components/form/datePicker/index.vue b/src/components/form/datePicker/index.vue index 439e2a2..b629ca8 100644 --- a/src/components/form/datePicker/index.vue +++ b/src/components/form/datePicker/index.vue @@ -24,7 +24,7 @@ interface Props { const props = withDefaults(defineProps(), { nextFlag: false, - theCurrentTime: false + theCurrentTime: true }) const interval = ref(3) diff --git a/src/utils/common.ts b/src/utils/common.ts index 6763be8..4aca439 100644 --- a/src/utils/common.ts +++ b/src/utils/common.ts @@ -53,7 +53,7 @@ export const getCurrentRoutePath = () => { * @param domain 指定域名 */ export const fullUrl = (relativeUrl: string, domain = '') => { - return domain + '/api/system-boot/image/toStream?bgImage=' + relativeUrl + return domain + '/api/system-boot/file/download?filePath=' + relativeUrl } /** diff --git a/src/views/govern/manage/engineering.vue b/src/views/govern/manage/engineering.vue index 08fbb7a..c9de4c5 100644 --- a/src/views/govern/manage/engineering.vue +++ b/src/views/govern/manage/engineering.vue @@ -1,15 +1,8 @@ @@ -29,6 +31,9 @@ import { ref, onMounted, provide, nextTick } from 'vue' import TableStore from '@/utils/tableStore' import { defaultAttribute } from '@/components/table/defaultAttribute' import { mainHeight } from '@/utils/layout' +import { ElMessageBox, ElMessage } from 'element-plus' +import { auditEngineering } from '@/api/cs-device-boot/edData'; +import { activateUser, deluser, passwordConfirm } from '@/api/user-boot/user' defineOptions({ name: 'govern/manage/engineering' }) @@ -40,17 +45,48 @@ const tableStore = new TableStore({ method: 'POST', column: [], - loadCallback: () => {} + loadCallback: () => { + setTimeout(() => { + tableRef.value.setAllTreeExpand(true) + }, 500) + } }) provide('tableStore', tableStore) onMounted(() => { tableStore.index() - setTimeout(() => { - tableRef.value.setAllTreeExpand(true) - }, 500) + // setTimeout(() => { + // tableRef.value.setAllTreeExpand(true) + // }, 500) }) +const deletes = (row: any) => { + ElMessageBox.prompt('二次校验密码确认', '', { + confirmButtonText: '确认', + cancelButtonText: '取消', + customClass: 'customInput', + inputType: 'text' + }).then(({ value }) => { + passwordConfirm(value).then(res => { + auditEngineering({ + id: row.id, + status: 0 + }).then((res: any) => { + ElMessage.success('删除成功') + tableStore.index() + }) + }) + }) -const addMenu = () => {} + +} + +const addMenu = () => { } +