From 8089fcb7deb7b2890b8893377c28a2c70c268bea Mon Sep 17 00:00:00 2001 From: GGJ <357021191@qq.com> Date: Wed, 18 Dec 2024 14:15:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2log?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E5=B9=B6=E4=BF=AE=E6=94=B9tonken=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/user-boot/user.ts | 17 +- src/components/form/datePicker/index.vue | 8 +- src/components/tree/govern/deviceTree.vue | 2 +- src/components/tree/index.vue | 2 +- src/layouts/admin/components/navMenus.vue | 2 +- .../UserInfo/src/components/LockDialog.vue | 2 +- src/stores/adminInfo.ts | 2 +- src/utils/echartMethod.ts | 2 +- src/utils/iconfont.ts | 2 +- src/utils/request.ts | 19 ++- src/views/auth/menu/menu.vue | 1 - src/views/auth/menu/popupMenu.vue | 1 - src/views/govern/analyze/DVR/index.vue | 2 +- .../device/control/analysisList/index.vue | 4 +- .../device/control/analysisList/popup.vue | 2 +- src/views/govern/device/control/detail.vue | 1 - src/views/govern/device/control/index.vue | 25 +-- .../currentDevice.vue | 6 +- .../supplementaryRecruitment/history.vue | 2 +- .../tabs/components/waveFormAnalysis.vue | 2 +- .../govern/device/control/tabs/realtime.vue | 2 +- .../govern/device/control/tabs/trend.vue | 8 +- src/views/govern/device/fileService/index.vue | 4 +- .../device/planData/components/popup.vue | 2 +- .../device/planData/components/schemeTree.vue | 2 +- .../device/planData/components/transient.vue | 146 +++++++++++++----- src/views/govern/device/planData/index.vue | 4 +- .../govern/manage/basic/popupDictionary.vue | 2 +- .../govern/manage/basic/popupVersion.vue | 14 +- src/views/govern/manage/basic/version.vue | 2 +- src/views/govern/manage/gplot/index.vue | 2 +- .../mxgraph/graphList/components/popup.vue | 1 - src/views/govern/mxgraph/graphList/index.vue | 1 - .../govern/reportCore/statistics/index.vue | 3 - .../govern/reportCore/statisticsWx/index.vue | 5 +- src/views/govern/reportForms/luckysheet.vue | 2 - src/views/govern/setting/app/index.vue | 3 +- .../govern/setting/statisticalType/add.vue | 2 +- .../govern/setting/statisticalType/index.vue | 6 +- .../Region/thermodynamicDiagram.vue | 4 +- src/views/system/reportForms/luckysheet.vue | 4 +- src/views/system/subject/form/index.vue | 2 +- src/views/user/login.vue | 33 ++-- 43 files changed, 203 insertions(+), 155 deletions(-) diff --git a/src/api/user-boot/user.ts b/src/api/user-boot/user.ts index 629354c..71ba6a8 100644 --- a/src/api/user-boot/user.ts +++ b/src/api/user-boot/user.ts @@ -33,7 +33,9 @@ export async function pwdSm3(pwd: any, loginName?: string) { //登录获取token export async function login(params: any) { - params.password = await pwdSm3(params.password, params.username) + if (params.refresh_token == undefined) { + params.password = await pwdSm3(params.password, params.username) + } params.username = encrypt(params.username) return request({ url: '/pqs-auth/oauth/token', @@ -146,15 +148,14 @@ export function checkUser(data: any) { */ export const getAllUserSimpleList = () => { return request({ - url: '/user-boot/user/getAllUserSimpleList', + url: '/user-boot/user/getAllUserSimpleList', method: 'GET' }) } - -export const getSysConfig =()=> { +export const getSysConfig = () => { return request({ - url: "/system-boot/config/getSysConfig", - method: "get", - }); -} \ No newline at end of file + url: '/system-boot/config/getSysConfig', + method: 'get' + }) +} diff --git a/src/components/form/datePicker/index.vue b/src/components/form/datePicker/index.vue index b629ca8..cd53f03 100644 --- a/src/components/form/datePicker/index.vue +++ b/src/components/form/datePicker/index.vue @@ -113,7 +113,7 @@ const timeChange = (e: number) => { // 当前 const nowTime = () => { - console.log(interval.value, '000000000') + // console.log(interval.value, '000000000') timeChange(interval.value) } // 上一个 @@ -298,7 +298,7 @@ const next = () => { } } else { month = month + 3 - console.log('🚀 ~ next ~ presentM:', presentM, month) + // console.log('🚀 ~ next ~ presentM:', presentM, month) // 季度进位后，超过当前月份是不科学的 if (year == presentY && !props.nextFlag) { @@ -313,7 +313,7 @@ const next = () => { endTime = year + '-0' + presentM + '-' + presentD } } else if (presentM > 3 && presentM < 7) { - console.log(123123) + // console.log(123123) // 第二季度 startTime = year + '-04-01' if (presentD < 10) { @@ -366,7 +366,7 @@ const next = () => { } } } - console.log(startTime, endTime) + // console.log(startTime, endTime) } else if (interval.value == 5) { } else if (interval.value == 4) { //根据开始时间推 diff --git a/src/components/tree/govern/deviceTree.vue b/src/components/tree/govern/deviceTree.vue index a589ff0..842e5c7 100644 --- a/src/components/tree/govern/deviceTree.vue +++ b/src/components/tree/govern/deviceTree.vue @@ -57,7 +57,7 @@ getDeviceTree().then(res => { }) }) } else if (item.name == '便携式设备') { - console.log(11111) + // console.log(11111) item.children.forEach((item: any) => { item.icon = 'el-icon-Platform' item.color = config.getColorVal('elementUiPrimary') diff --git a/src/components/tree/index.vue b/src/components/tree/index.vue index 72ffe0a..24d4647 100644 --- a/src/components/tree/index.vue +++ b/src/components/tree/index.vue @@ -67,7 +67,7 @@ const filterNode = (value: string, data: any) => { return data.name.includes(value) } const checkTreeNodeChange = () => { - console.log(treeRef.value?.getCheckedNodes(), "ikkkkkiisiiisis"); + // console.log(treeRef.value?.getCheckedNodes(), "ikkkkkiisiiisis"); emit('checkTreeNodeChange', treeRef.value?.getCheckedNodes()) } const treeRef = ref>() diff --git a/src/layouts/admin/components/navMenus.vue b/src/layouts/admin/components/navMenus.vue index e6773da..d398575 100644 --- a/src/layouts/admin/components/navMenus.vue +++ b/src/layouts/admin/components/navMenus.vue @@ -104,7 +104,7 @@ const onFullScreen = () => { } const handleCommand = (key: string) => { - console.log(key) + // console.log(key) switch (key) { case 'adminInfo': popupAdminInfo.value.open() diff --git a/src/layouts/components/UserInfo/src/components/LockDialog.vue b/src/layouts/components/UserInfo/src/components/LockDialog.vue index b8a0ff5..cbc257f 100644 --- a/src/layouts/components/UserInfo/src/components/LockDialog.vue +++ b/src/layouts/components/UserInfo/src/components/LockDialog.vue @@ -30,7 +30,7 @@ const emit = defineEmits(['update:modelValue']) const dialogVisible = computed({ get: () => props.modelValue, set: val => { - console.log('set: ', val) + // console.log('set: ', val) emit('update:modelValue', val) } }) diff --git a/src/stores/adminInfo.ts b/src/stores/adminInfo.ts index d720dbd..dbae167 100644 --- a/src/stores/adminInfo.ts +++ b/src/stores/adminInfo.ts @@ -92,7 +92,7 @@ export const useAdminInfo = defineStore('adminInfo', { this.refresh_token = '' }, setToken(token: string, type: 'auth' | 'refresh') { - const field = type == 'auth' ? 'token' : 'refresh_token' + const field = type == 'auth' ? 'access_token' : 'refresh_token' this[field] = token }, getToken(type: 'auth' | 'refresh' = 'auth') { diff --git a/src/utils/echartMethod.ts b/src/utils/echartMethod.ts index a3c9d0f..9a2e2e8 100644 --- a/src/utils/echartMethod.ts +++ b/src/utils/echartMethod.ts @@ -45,7 +45,7 @@ export const yMethod = (arr: any) => { */ // 导出csv文件 const convertToCSV = (title: object, data: any) => { - console.log('🚀 ~ convertToCSV ~ data:', data) + // console.log('🚀 ~ convertToCSV ~ data:', data) let csv = '' // 添加列头 csv += ',' + title.join(',') + '\n' diff --git a/src/utils/iconfont.ts b/src/utils/iconfont.ts index 1515b90..62995e6 100644 --- a/src/utils/iconfont.ts +++ b/src/utils/iconfont.ts @@ -57,7 +57,7 @@ export function getAwesomeIconfontNames() { nextTick(() => { const iconfonts = [] const sheets = getStylesFromVite('all.css') - console.log(sheets) + // console.log(sheets) for (const key in sheets) { const rules: any = sheets[key].cssRules for (const k in rules) { diff --git a/src/utils/request.ts b/src/utils/request.ts index 454bffe..2ad7e66 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -88,6 +88,9 @@ function createAxios>( config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw==' } } + if (config.url == '/user-boot/user/generateSm2Key' || config.url == '/pqs-auth/oauth/token') { + config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw==' + } return config }, @@ -117,10 +120,10 @@ function createAxios>( window.tokenRefreshing = true return refreshToken() .then(res => { - adminInfo.setToken(res.data.token, 'auth') - response.headers.Authorization = `${res.data.token}` - window.requests.forEach(cb => cb(res.data.token)) + adminInfo.setToken(res.data.access_token, 'auth') + window.requests.forEach(cb => cb(res.data.access_token)) window.requests = [] + return Axios(response.config) }) .catch(err => { @@ -141,11 +144,11 @@ function createAxios>( }) } } else if (response.data.code == 'A0024') { - // // 登录失效 - // ElNotification({ - // type: 'error', - // message: response.data.message - // }) + // 登录失效 + ElMessage({ + type: 'error', + message: response.data.message + }) adminInfo.removeToken() router.push({ name: 'login' }) return Promise.reject(response.data) diff --git a/src/views/auth/menu/menu.vue b/src/views/auth/menu/menu.vue index 19292c7..02105a5 100644 --- a/src/views/auth/menu/menu.vue +++ b/src/views/auth/menu/menu.vue @@ -106,7 +106,6 @@ watch( provide('tableStore', tableStore) const addMenu = () => { - console.log(popupRef) popupRef.value.open('新增菜单', {}) } const currentChange = (newValue: any) => { diff --git a/src/views/auth/menu/popupMenu.vue b/src/views/auth/menu/popupMenu.vue index d741109..d1c98df 100644 --- a/src/views/auth/menu/popupMenu.vue +++ b/src/views/auth/menu/popupMenu.vue @@ -73,7 +73,6 @@ const form: any = reactive({ const dialogVisible = ref(false) const title = ref('新增菜单') const open = (text: string, data: anyObj) => { - console.log(data) title.value = text // 重置表单 for (let key in form) { diff --git a/src/views/govern/analyze/DVR/index.vue b/src/views/govern/analyze/DVR/index.vue index ad94901..e5cbc1d 100644 --- a/src/views/govern/analyze/DVR/index.vue +++ b/src/views/govern/analyze/DVR/index.vue @@ -141,7 +141,7 @@ const tableStore = new TableStore({ tableStore.table.params.type = 0 provide('tableStore', tableStore) const nodeClick = async (e: anyObj) => { - console.log("🚀 ~ nodeClick ~ e:", e) + // console.log("🚀 ~ nodeClick ~ e:", e) if (e.level == 2) { loading.value = false tableStore.table.params.deviceId = e.id diff --git a/src/views/govern/device/control/analysisList/index.vue b/src/views/govern/device/control/analysisList/index.vue index 0f8222a..5b3548b 100644 --- a/src/views/govern/device/control/analysisList/index.vue +++ b/src/views/govern/device/control/analysisList/index.vue @@ -92,7 +92,7 @@ const tableStore: any = new TableStore({ icon: 'el-icon-EditPen', render: 'basicButton', click: row => { - console.log(row.portableOfflLogList) + // console.log(row.portableOfflLogList) detailRef.value.open(row.portableOfflLogList) } } @@ -109,7 +109,7 @@ const tableStore: any = new TableStore({ loadCallback: () => { // tableStore.table.data=[] tableStore.table.height = 400 - console.log(tableStore.table.publicHeight, 'tableStore.table.data') + // console.log(tableStore.table.publicHeight, 'tableStore.table.data') } }) provide('tableStore', tableStore) diff --git a/src/views/govern/device/control/analysisList/popup.vue b/src/views/govern/device/control/analysisList/popup.vue index c7db19c..3543e73 100644 --- a/src/views/govern/device/control/analysisList/popup.vue +++ b/src/views/govern/device/control/analysisList/popup.vue @@ -73,7 +73,7 @@ const tableStore: any = new TableStore({ icon: 'el-icon-EditPen', render: 'basicButton', click: row => { - console.log(row.portableOfflLogList) + // console.log(row.portableOfflLogList) } } ] diff --git a/src/views/govern/device/control/detail.vue b/src/views/govern/device/control/detail.vue index ed3c132..d3dccc6 100644 --- a/src/views/govern/device/control/detail.vue +++ b/src/views/govern/device/control/detail.vue @@ -253,7 +253,6 @@ const init = () => { icon: 'path://M588.8 551.253333V512H352v39.253333h236.373333z m0 78.933334v-39.253334H352v39.253334h236.373333z m136.533333 78.933333V334.933333l-157.866666-157.866666H273.066667A59.306667 59.306667 0 0 0 213.333333 236.373333v551.253334a59.306667 59.306667 0 0 0 59.306667 59.306666h274.773333v42.666667H853.333333v-180.48zM568.746667 234.666667l100.266666 100.693333h-81.066666a20.053333 20.053333 0 0 1-19.626667-20.053333z m-20.48 573.013333H273.066667a19.2 19.2 0 0 1-17.493334-19.626667V236.373333a19.2 19.2 0 0 1 19.626667-19.626666h256v98.133333a58.88 58.88 0 0 0 58.88 59.306667h96.426667v334.933333h-98.133334v-39.68H352v39.68h196.266667z m100.266666 23.04a37.973333 37.973333 0 0 1-32 15.786667 38.826667 38.826667 0 0 1-32.426666-15.786667 53.76 53.76 0 0 1-10.24-32.853333 42.666667 42.666667 0 0 1 42.666666-47.786667 35.84 35.84 0 0 1 37.546667 29.866667h-12.8a23.893333 23.893333 0 0 0-24.746667-19.2c-17.066667 0-29.013333 14.08-29.013333 35.84s11.52 37.546667 28.586667 37.546666a26.453333 26.453333 0 0 0 26.453333-25.6h12.8a39.253333 39.253333 0 0 1-7.253333 22.186667z m59.733334 15.786667a35.84 35.84 0 0 1-40.106667-34.56H682.666667a23.893333 23.893333 0 0 0 26.88 23.04c12.8 0 22.613333-6.4 22.613333-15.786667s-4.266667-11.52-14.506667-13.653333l-21.333333-5.12c-17.066667-4.266667-24.32-11.52-24.32-23.893334s12.8-26.453333 34.133333-26.453333a31.573333 31.573333 0 0 1 35.413334 30.293333h-13.653334a19.626667 19.626667 0 0 0-22.613333-18.773333c-12.8 0-20.48 5.12-20.48 12.8s5.12 11.093333 17.066667 13.653333l14.933333 2.986667a42.666667 42.666667 0 0 1 20.906667 8.96 23.893333 23.893333 0 0 1 7.68 17.92c-0.426667 17.066667-14.506667 28.16-37.12 28.16z m88.746666 0h-14.506666l-32.426667-92.16h14.08l19.626667 59.733333 6.4 20.053333c0-9.386667 3.413333-12.8 5.546666-20.053333l19.2-59.733333h14.08z', onclick: (e) => { - console.log("🚀 ~ init ~ echartsData.value:", echartsData.value.options.series.map(item => item.data)) let list = echartsData.value.options.series.map(item => item.data) let dataList = list[0].map((item, index) => { diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue index 16a6abb..304a0e8 100644 --- a/src/views/govern/device/control/index.vue +++ b/src/views/govern/device/control/index.vue @@ -2,7 +2,7 @@
- +
@@ -30,37 +21,116 @@ const tableStore = new TableStore({ paramsPOST: true, showPage: false, column: [ - { title: '项目名称', field: 'projectName', minWidth: '130' }, - { title: '测试项名称', field: 'itemName', minWidth: '130' }, - { title: '装置名称', field: 'devName', minWidth: '130' }, - { title: '发生时刻', field: 'startTime', minWidth: '130' }, - { title: '持续时间', field: 'persistTime', minWidth: '130' }, - { title: '事件描述', field: 'showName', minWidth: '130' }, - { title: '暂降幅值', field: 'featureAmplitude', minWidth: '130' }, - { title: '相别', field: 'phaseType', minWidth: '130' }, - - + // { width: '60', type: 'checkbox', fixed: 'left' }, + { + title: '序号', width: 80, formatter: (row: any) => { + return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 + } + }, + { field: 'startTime', title: '发生时刻', minWidth: 170 }, + { field: 'showName', title: '事件描述', minWidth: 170 }, + { + field: 'phaseType', + title: '相别', + minWidth: 100, + formatter: (row: any) => { + row.cellValue = row.cellValue ? row.cellValue : '/' + return row.cellValue + } + }, + { + field: 'persistTime', + title: '持续时间(s)', + minWidth: 100, + formatter: (row: any) => { + row.cellValue = row.cellValue ? row.cellValue.toFixed(2) : '/' + return row.cellValue + } + }, + { + field: 'featureAmplitude', + title: '暂降(聚升)幅值(%)', + minWidth: 100, + formatter: (row: any) => { + row.cellValue = row.cellValue + '' ? row.cellValue.toFixed(2) : '/' + if (String(row.cellValue).split('.')[1] == '00') { + row.cellValue = String(row.cellValue).split('.')[0] + } + return row.cellValue + } + }, { title: '操作', - width: '180', + width: 180, render: 'buttons', fixed: 'right', - buttons: [ - { - name: 'edit', - title: '编辑', - type: 'primary', - icon: 'el-icon-EditPen', - render: 'basicButton', - disabled: row => { - return row.state !== 1 - }, - click: row => { + // buttons: [ + // { + // name: 'edit', + // title: '波形解析', + // type: 'primary', + // icon: 'el-icon-Check', + // render: 'basicButton', + // loading: 'loading1', + // disabled: row => { + // // && row.evtParamTm < 20 + // return !row.wavePath + // }, + // click: async row => { + // row.loading1 = true - } - }, - - ] + // await analyseWave(row.id) + // .then(res => { + // row.loading1 = false + // if (res != undefined) { + // boxoList.value = row + // boxoList.value.systemType = 'WX' + // wp.value = res.data + // view.value = false + // view2.value = true + // } + // }) + // .catch(() => { + // row.loading1 = false + // }) + // isWaveCharts.value = true + // nextTick(() => { + // waveFormAnalysisRef.value && waveFormAnalysisRef.value.getWpData(wp.value, boxoList.value) + // }) + // } + // }, + // { + // name: 'edit', + // text: '暂无波形', + // type: 'info', + // icon: 'el-icon-DataLine', + // render: 'basicButton', + // disabled: row => { + // return row.wavePath + // } + // }, + // { + // name: 'edit', + // title: '波形下载', + // type: 'primary', + // loading: 'loading2', + // icon: 'el-icon-Check', + // render: 'basicButton', + // disabled: row => { + // // && row.evtParamTm < 20 + // return !row.wavePath + // }, + // click: row => { + // row.loading2 = true + // const url = window.location.origin + '/api/cs-harmonic-boot/event/getFileZip?eventId=' + row.id + // window.open(url, '_self') + // setTimeout(() => { + // ElMessage.success('波形下载成功！') + // row.loading2 = false + // }, 1500) + // } + // } + // ] } ], diff --git a/src/views/govern/device/planData/index.vue b/src/views/govern/device/planData/index.vue index f375f23..d01b164 100644 --- a/src/views/govern/device/planData/index.vue +++ b/src/views/govern/device/planData/index.vue @@ -879,7 +879,7 @@ const tableHeaderRef = ref() const formatCountOptions = () => { countData.value = [] - console.log(123, indexOptions.value); + // console.log(123, indexOptions.value); if (searchForm.value.index.length != 0) { searchForm.value.index.forEach((item: any, index: any) => { @@ -925,7 +925,7 @@ const formatCountOptions = () => { // } // }) // }) - console.log("🚀 ~ vv.eleEpdPqdVOS.map ~ countData.value:", countDataCopy.value) + // console.log("🚀 ~ vv.eleEpdPqdVOS.map ~ countData.value:", countDataCopy.value) countData.value.map((item: any, key: any) => { if (item.name.includes('谐波电流有效值')) { diff --git a/src/views/govern/manage/basic/popupDictionary.vue b/src/views/govern/manage/basic/popupDictionary.vue index b7fb0da..63109b3 100644 --- a/src/views/govern/manage/basic/popupDictionary.vue +++ b/src/views/govern/manage/basic/popupDictionary.vue @@ -276,7 +276,7 @@ const open = (text: string, data?: anyObj) => { form.pq_overlimit = 'pq_overlimit' form.harm = [0, 50] } - console.log(form) + // console.log(form) } const submit = async () => { form.harmStart = form.harm[0] diff --git a/src/views/govern/manage/basic/popupVersion.vue b/src/views/govern/manage/basic/popupVersion.vue index f67ab31..3e48856 100644 --- a/src/views/govern/manage/basic/popupVersion.vue +++ b/src/views/govern/manage/basic/popupVersion.vue @@ -96,7 +96,7 @@ const rules = { file: [{ required: true, message: '升级文件不能为空', trigger: 'blur' }] } const typeChange = () => { - console.log(form.type) + // console.log(form.type) form.devType = null form.devTypeName = null queryCsDictTree(form.type).then(res => { @@ -104,17 +104,15 @@ const typeChange = () => { }) } const devTypeChange = (e: any) => { - console.log(e) + // console.log(e) form.devTypeName = DevTypeOptions.value.filter((item: any) => item.value == e)[0].label } const fileChange = (e: any) => { - console.log('fileChange!') - console.log(e) + form.file = e.raw } const fileExceed = (e: any) => { - console.log('fileExceed!') - console.log(e) + ElMessage.error('只能上传一个文件') } const dialogVisible = ref(false) @@ -147,9 +145,9 @@ const open = (text: string, data?: anyObj) => { }) } const submit = () => { - console.log(formRef) + // console.log(formRef) formRef.value.validate(async (valid: boolean) => { - console.log(valid) + // console.log(valid) if (valid) { let submitForm = new FormData() for (let key in form) { diff --git a/src/views/govern/manage/basic/version.vue b/src/views/govern/manage/basic/version.vue index a358649..7edface 100644 --- a/src/views/govern/manage/basic/version.vue +++ b/src/views/govern/manage/basic/version.vue @@ -46,7 +46,7 @@ const dictData = useDictData() const DevTypeOptions = ref() const tableHeaderRef = ref() queryByCode('Direct_Connected_Device').then(res => { - console.log(res) + // console.log(res) queryByid(res.data.id).then(res => { DevTypeOptions.value = res.data }) diff --git a/src/views/govern/manage/gplot/index.vue b/src/views/govern/manage/gplot/index.vue index 953fd13..b6a8116 100644 --- a/src/views/govern/manage/gplot/index.vue +++ b/src/views/govern/manage/gplot/index.vue @@ -95,7 +95,7 @@ onMounted(() => { tableStore.table.loading = false }) const addMenu = () => { - console.log(popupRef) + // console.log(popupRef) popupRef.value.open('新增菜单') } const chooseImage = e => { diff --git a/src/views/govern/mxgraph/graphList/components/popup.vue b/src/views/govern/mxgraph/graphList/components/popup.vue index 64ec661..145961b 100644 --- a/src/views/govern/mxgraph/graphList/components/popup.vue +++ b/src/views/govern/mxgraph/graphList/components/popup.vue @@ -124,7 +124,6 @@ const open = ref((row: any) => { // item.children = item.newList } if (item.name.includes('便携式')) { - console.log(vv, 'bianxieshihshhsshh ') if (vv.level === 1) { vv.disabled = false } else { diff --git a/src/views/govern/mxgraph/graphList/index.vue b/src/views/govern/mxgraph/graphList/index.vue index bfc2321..33b7a87 100644 --- a/src/views/govern/mxgraph/graphList/index.vue +++ b/src/views/govern/mxgraph/graphList/index.vue @@ -69,7 +69,6 @@ defineOptions({ const tableRef = ref() const popupRef = ref() let DOMIN = window.location.origin -console.log("🚀 ~ DOMIN:", DOMIN) let STATIC_URL = DOMIN + '/api/system-boot/file/download?filePath=' localStorage.setItem('STATIC_URL', STATIC_URL) diff --git a/src/views/govern/reportCore/statistics/index.vue b/src/views/govern/reportCore/statistics/index.vue index a59ad2d..6931d99 100644 --- a/src/views/govern/reportCore/statistics/index.vue +++ b/src/views/govern/reportCore/statistics/index.vue @@ -82,7 +82,6 @@ const tableStore = new TableStore({ item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v ) : '' }) }) - console.log(tableStore.table.data) setTimeout(() => { luckysheet.create({ container: 'luckysheet', @@ -114,7 +113,6 @@ onMounted(() => { // }) const stencil = (val: any) => { - console.log("🚀 ~ Policy ~ val:", val) templatePolicy.value = val Template.value = val[0] reportForm.value = val[0]?.reportForm @@ -126,7 +124,6 @@ const changetype = (val: any) => { } const handleNodeClick = (data: any, node: any) => { - console.log("🚀 ~ handleNodeClick ~ data:", data) if (data?.type == "line") { dotList.value = data setTimeout(() => { diff --git a/src/views/govern/reportCore/statisticsWx/index.vue b/src/views/govern/reportCore/statisticsWx/index.vue index 1aacd10..dbcb4cd 100644 --- a/src/views/govern/reportCore/statisticsWx/index.vue +++ b/src/views/govern/reportCore/statisticsWx/index.vue @@ -69,7 +69,6 @@ const tableStore = new TableStore({ item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v ) : '' }) }) - console.log(tableStore.table.data) setTimeout(() => { luckysheet.create({ container: 'luckysheet', @@ -91,7 +90,7 @@ const flag = ref(true) onMounted(() => { const dom = document.getElementById('navigation-splitpanes') if (dom) { - size.value = Math.round((180 / dom.offsetHeight) * 100) + size.value = Math.round((210 / dom.offsetHeight) * 100) } }) @@ -102,7 +101,6 @@ onMounted(() => { // }) const stencil = (val: any) => { - console.log("🚀 ~ Policy ~ val:", val) templatePolicy.value = val Template.value = val[0] reportForm.value = val[0]?.reportForm @@ -114,7 +112,6 @@ const changetype = (val: any) => { } const handleNodeClick = (data: any, node: any) => { - console.log("🚀 ~ handleNodeClick ~ data:", data) if (data?.pid ) { dotList.value = data setTimeout(() => { diff --git a/src/views/govern/reportForms/luckysheet.vue b/src/views/govern/reportForms/luckysheet.vue index a02e58d..eff9e43 100644 --- a/src/views/govern/reportForms/luckysheet.vue +++ b/src/views/govern/reportForms/luckysheet.vue @@ -85,7 +85,6 @@ const beforeUpload = (file: any) => { } luckysheet.destroy() options.value.title = exportJson.info.name - console.log('🚀 ~ exportJson.sheets:', exportJson.sheets) exportJson.sheets.forEach((item: any) => { // item.celldata = [] // item.data = [] @@ -106,7 +105,6 @@ const preservation = () => { const submitForm = (formdata: any, text: string) => { // let userStr = JSON.stringify(luckysheet.getAllSheets()) let userStr = luckysheet.getAllSheets() - console.log('🚀 ~ submitForm ~ userStr:', userStr) userStr.forEach((item: any) => { item.data1 = JSON.stringify(item.data) }) diff --git a/src/views/govern/setting/app/index.vue b/src/views/govern/setting/app/index.vue index 9750e8c..e0e032d 100644 --- a/src/views/govern/setting/app/index.vue +++ b/src/views/govern/setting/app/index.vue @@ -45,8 +45,7 @@ const init = () => { nextTick(() => { dic.forEach((item: BasicDictData) => { if (item.code == activeName.value) { - console.log(activeName.value) - console.log(item.id) + id.value = item.id } diff --git a/src/views/govern/setting/statisticalType/add.vue b/src/views/govern/setting/statisticalType/add.vue index ba722e6..4e0d264 100644 --- a/src/views/govern/setting/statisticalType/add.vue +++ b/src/views/govern/setting/statisticalType/add.vue @@ -72,7 +72,7 @@ const open = (text: string, data?: anyObj) => { if (key == 'sort') { form[key] = data?.sort ? data[key] : 100 - console.log("🚀 ~ open ~ form[key]:", form[key]) + // console.log("🚀 ~ open ~ form[key]:", form[key]) } } dialogVisible.value = true diff --git a/src/views/govern/setting/statisticalType/index.vue b/src/views/govern/setting/statisticalType/index.vue index d9873d6..142a0e1 100644 --- a/src/views/govern/setting/statisticalType/index.vue +++ b/src/views/govern/setting/statisticalType/index.vue @@ -59,7 +59,7 @@ const tableStore = new TableStore({ { title: '统计类型', field: 'name' }, { title: '类型', field: 'type', - width: 150, + width: 200, formatter: row => { return options.value.filter((item: any) => item.value == row.cellValue)[0]?.name }, @@ -67,7 +67,7 @@ const tableStore = new TableStore({ { title: '操作', align: 'center', - width: '180', + width: '200', render: 'buttons', buttons: [ { @@ -141,7 +141,7 @@ onMounted(() => { }) const addMenu = () => { - console.log(bindingRef) + // console.log(bindingRef) addRef.value.open('新增', { sort: tableStore.table.data.length ? tableStore.table.data[tableStore.table.data.length - 1].sort + 1 : 1, code: '', diff --git a/src/views/pms/Event-boot/Region/thermodynamicDiagram.vue b/src/views/pms/Event-boot/Region/thermodynamicDiagram.vue index b74e298..2fb643d 100644 --- a/src/views/pms/Event-boot/Region/thermodynamicDiagram.vue +++ b/src/views/pms/Event-boot/Region/thermodynamicDiagram.vue @@ -105,14 +105,14 @@ const map = (res: any) => { if (geoCoordMap.value.lengt > 0) { geoCoordMap.value.map(item => { - console.log("🚀 ~ map ~ item:", item) + // console.log("🚀 ~ map ~ item:", item) areaData.push(...new Array(3).fill(item)) }) } let maxNum = 0 let minNum = 0 let num: any = [] - console.log('🚀 ~ map ~ areaData:', areaData) + // console.log('🚀 ~ map ~ areaData:', areaData) if (areaData.length > 0) { areaData.forEach(item => { diff --git a/src/views/system/reportForms/luckysheet.vue b/src/views/system/reportForms/luckysheet.vue index a02e58d..ce1c6b5 100644 --- a/src/views/system/reportForms/luckysheet.vue +++ b/src/views/system/reportForms/luckysheet.vue @@ -85,7 +85,7 @@ const beforeUpload = (file: any) => { } luckysheet.destroy() options.value.title = exportJson.info.name - console.log('🚀 ~ exportJson.sheets:', exportJson.sheets) + // console.log('🚀 ~ exportJson.sheets:', exportJson.sheets) exportJson.sheets.forEach((item: any) => { // item.celldata = [] // item.data = [] @@ -106,7 +106,7 @@ const preservation = () => { const submitForm = (formdata: any, text: string) => { // let userStr = JSON.stringify(luckysheet.getAllSheets()) let userStr = luckysheet.getAllSheets() - console.log('🚀 ~ submitForm ~ userStr:', userStr) + // console.log('🚀 ~ submitForm ~ userStr:', userStr) userStr.forEach((item: any) => { item.data1 = JSON.stringify(item.data) }) diff --git a/src/views/system/subject/form/index.vue b/src/views/system/subject/form/index.vue index d89e3a4..f635c43 100644 --- a/src/views/system/subject/form/index.vue +++ b/src/views/system/subject/form/index.vue @@ -222,7 +222,7 @@ const Cancel = () => { * @param e */ const chooseImage = (e: any) => { - console.log('🚀 ~ chooseImage ~ e:', URL.createObjectURL(e.raw!)) + // console.log('🚀 ~ chooseImage ~ e:', URL.createObjectURL(e.raw!)) logoFile.url = URL.createObjectURL(e.raw!) configStore.value.logoFile = e.raw // uploadFile(e.raw, 'sgGovern/').then(res => { diff --git a/src/views/user/login.vue b/src/views/user/login.vue index 5b50195..82e7119 100644 --- a/src/views/user/login.vue +++ b/src/views/user/login.vue @@ -10,16 +10,10 @@ {{ getThemeList.name || '电能质量监测系统' }}
-