修改页面log输出并修改tonken超时判断

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",
+        url: '/system-boot/config/getSysConfig',
-        method: "get",
+        method: 'get'
-    });
+    })
-}
+}

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) {
         //根据开始时间推

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')

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<InstanceType<typeof ElTree>>()

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()

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)
     }
 })

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') {

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'

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) {

src/utils/request.ts

@@ -88,6 +88,9 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                     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<Data = any, T = ApiPromise<Data>>(
                     window.tokenRefreshing = true
                     return refreshToken()
                         .then(res => {
-                            adminInfo.setToken(res.data.token, 'auth')
+                            adminInfo.setToken(res.data.access_token, 'auth')
-                            response.headers.Authorization = `${res.data.token}`
+                            window.requests.forEach(cb => cb(res.data.access_token))
-                            window.requests.forEach(cb => cb(res.data.token))
                             window.requests = []
+
                             return Axios(response.config)
                         })
                         .catch(err => {
@@ -141,11 +144,11 @@ function createAxios<Data = any, T = ApiPromise<Data>>(
                     })
                 }
             } else if (response.data.code == 'A0024') {
-                // // 登录失效
+                // 登录失效
-                // ElNotification({
+                ElMessage({
-                //     type: 'error',
+                    type: 'error',
-                //     message: response.data.message
+                    message: response.data.message
-                // })
+                })
                 adminInfo.removeToken()
                 router.push({ name: 'login' })
                 return Promise.reject(response.data)

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) => {

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) {

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

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)

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)
                     }
                 }
             ]

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) => {

src/views/govern/device/control/index.vue

@@ -2,7 +2,7 @@
     <div class="default-main device-control" :style="{ height: pageHeight.height }" v-loading="loading"
         style="position: relative">
         <!-- @init="nodeClick" -->
-        <PointTree @node-click="nodeClick" @pointTypeChange="pointTypeChange"></PointTree>
+        <PointTree @node-click="nodeClick" @pointTypeChange="pointTypeChange" style="width: 280px"></PointTree>
         <div class="device-control-right" v-if="deviceData">
             <el-descriptions title="监测点信息" class="mb10" width="180" :column="3" border>
                 <template #extra>
@@ -30,7 +30,8 @@
                     {{ devData.volGrade }}kV
                 </el-descriptions-item>
                 <el-descriptions-item label="接线方式" width="160">
-                    {{ devData.conType == 0 ? '星型接线' : devData.conType == 1 ? '角型接线' : devData.conType == 2 ? 'V型接线' : '/' }}
+                    {{ devData.conType == 0 ? '星型接线' : devData.conType == 1 ? '角型接线' : devData.conType == 2 ? 'V型接线' :
+                    '/' }}
                 </el-descriptions-item>
 
                 <!-- <el-descriptions-item label="安装位置" width="160">
@@ -531,7 +532,7 @@ const handleTrend = async () => {
                 //每隔30s调用一下接口，通知后台推送mqtt消息
                 trendTimer.value = window.setInterval(() => {
                     getHarmRealData(lineId.value, activeTrendName.value).then((res: any) => {
-                        console.log(res, '获取谐波频谱数据')
+                        // console.log(res, '获取谐波频谱数据')
                     })
                 }, 30000)
                 mqttRef.value.on('message', (topic: any, message: any) => {
@@ -587,7 +588,7 @@ const handleHarmonicSpectrum = async () => {
 
             realDataTimer.value = window.setInterval(() => {
                 getBasicRealData(lineId.value).then((res: any) => {
-                    console.log(res, '获取基础实时数据')
+                    // console.log(res, '获取基础实时数据')
                 })
             }, 30000)
         }
@@ -612,7 +613,7 @@ const handleReturn = async () => {
             // mqttMessage.value = {}
             realDataTimer.value = window.setInterval(() => {
                 getBasicRealData(lineId.value).then((res: any) => {
-                    console.log(res, '获取基础实时数据')
+                    // console.log(res, '获取基础实时数据')
                 })
             }, 30000)
         }
@@ -690,10 +691,10 @@ const lineId: any = ref('')
 const dataLevel: any = ref('')
 const dataSource = ref([])
 const nodeClick = async (e: anyObj) => {
-console.log("🚀 ~ nodeClick ~ e:", e)
+    // console.log("🚀 ~ nodeClick ~ e:", e)
 
-  
+
-    if (e==undefined || e.level == 2){
+    if (e == undefined || e.level == 2) {
         return loading.value = false
     }
     searchValue.value = ''
@@ -824,7 +825,7 @@ const getRealDataMqttMsg = async () => {
 
             realDataTimer.value = window.setInterval(async () => {
                 await getBasicRealData(lineId.value).then((res: any) => {
-                    console.log(res, '获取基础实时数据')
+                    // console.log(res, '获取基础实时数据')
                 })
             }, 30000)
             mqttRef.value.on('message', (topic: any, message: any) => {
@@ -1015,7 +1016,7 @@ const handleClick = async (tab?: any) => {
     realTimeFlag.value = false
     //初始化点击tab隐藏子页面
     sonTab.value = null
-    console.log(123, dataSet.value.includes('_history'));
+    // console.log(123, dataSet.value.includes('_history'));
 
     //查询历史指标
     if (dataSet.value.includes('_history')) {
@@ -1251,6 +1252,10 @@ onBeforeUnmount(() => {
 .device-control {
     display: flex;
 
+    &-left {
+        width: 280px;
+    }
+
     &-right {
         overflow: hidden;
         flex: 1;

src/views/govern/device/control/supplementaryRecruitment/currentDevice.vue

@@ -140,7 +140,7 @@ const handleUpDevice = () => {
 
 const radioChangeEvent: VxeTableEvents.RadioChange = ({ row }) => {
     selectRow.value = row
-    console.log('单选事件')
+    // console.log('单选事件')
 }
 
 
@@ -183,7 +183,7 @@ mqttRef.value.on('connect', () => {
 })
 const mqttMessage = ref<any>({})
 mqttRef.value.on('message', (topic: any, message: any) => {
-    console.log('mqtt接收到消息', JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message)))))
+    // console.log('mqtt接收到消息', JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message)))))
     loading.value = false
     let str = JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
     let regex1 = /allStep:(.*?),nowStep/
@@ -192,7 +192,7 @@ mqttRef.value.on('message', (topic: any, message: any) => {
         allStep: str.match(regex1)[1],
         nowStep: str.match(regex2)[1]
     }
-    console.log(mqttMessage.value)
+    // console.log(mqttMessage.value)
     let checkedList = tableRef.value.getCheckboxRecords().map((item: any) => {
         return item.name
     })

src/views/govern/device/control/supplementaryRecruitment/history.vue

@@ -296,7 +296,7 @@ const tableStore = new TableStore({
                                 portableDeviceRegister({
                                     nDid: row.ndid
                                 }).then(res => {
-                                    console.log(res, '8888')
+                                    // console.log(res, '8888')
                                     ElMessage.success(res.message)
                                     tableStore.index()
                                 })

src/views/govern/device/control/tabs/components/waveFormAnalysis.vue

@@ -106,7 +106,7 @@ const getWpData = (val: any, list: any) => {
     wp.value = val
     isWp.value = true
     boxoList.value = list
-    console.log(wp.value, val, 'ggggghhhh')
+    // console.log(wp.value, val, 'ggggghhhh')
 }
 const changeView = () => {
     showBoxi.value = false

src/views/govern/device/control/tabs/realtime.vue

@@ -548,7 +548,7 @@ const setRealData = (val: any) => {
     initRadioCharts()
     //新的
     echartsDataV1.value.options.series[0].max = realData.value.vRmsA == 0 ? 1 : Math.ceil(realData.value.vRmsA * 1.2)
-    console.log("🚀 ~ setRealData ~  realData.value.vRmsA:", realData.value.vRmsA)
+    // console.log("🚀 ~ setRealData ~  realData.value.vRmsA:", realData.value.vRmsA)
     echartsDataV1.value.options.series[0].data = [
         {
             name: 'A相',

src/views/govern/device/control/tabs/trend.vue

@@ -76,7 +76,7 @@ const props = defineProps({
         type: Array,
     }
 })
-console.log("🚀 ~ props:", props.TrendList)
+// console.log("🚀 ~ props:", props.TrendList)
 const showEchart = ref(true)
 //电压等级
 const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
@@ -281,7 +281,7 @@ const init = async () => {
                             return acc
                         }, {})
                         let result = Object.values(groupedData)
-                        console.log("🚀 ~ .then ~ result:", result)
+                        // console.log("🚀 ~ .then ~ result:", result)
                         // console.log("🚀 ~ .then ~ result:", result)
                         if (chartsList.length > 0) {
                             unitList = result.map((item: any) => {
@@ -386,7 +386,7 @@ const init = async () => {
                                 series: []
                             }
                         }
-                        console.log("🚀 ~ unitList.forEach ~ unitList:", unitList)
+                        // console.log("🚀 ~ unitList.forEach ~ unitList:", unitList)
 
                         if (chartsList.length > 0) {
                             echartsData.value.yAxis = []
@@ -415,7 +415,7 @@ const init = async () => {
                             // console.log("🚀 ~ result.forEach ~ result:", result)
                             // '电压负序分量', '电压正序分量', '电压零序分量'
                             let ABCName = [...new Set(chartsList.map((item: any) => { return item.anotherName == '电压负序分量' ? '电压不平衡' : item.anotherName == '电压正序分量' ? '电压不平衡' : item.anotherName == '电压零序分量' ? '电压不平衡' : item.anotherName }))];
-                            console.log("🚀 ~ .then ~ ABCName:", ABCName)
+                            // console.log("🚀 ~ .then ~ ABCName:", ABCName)
                             result.forEach((item: any, index: any) => {
                                 let yMethodList: any = []
 

src/views/govern/device/fileService/index.vue

@@ -552,7 +552,7 @@ const mqttMessage = ref<any>({})
 const status: any = ref()
 
 mqttRef.value.on('message', (topic: any, message: any) => {
-    console.log('mqtt接收到消息', JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message)))))
+    // console.log('mqtt接收到消息', JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message)))))
 
     let str = JSON.parse(JSON.stringify(JSON.parse(new TextDecoder().decode(message))))
 
@@ -567,7 +567,7 @@ mqttRef.value.on('message', (topic: any, message: any) => {
         nowStep: str.match(regex2)[1],
         userId: str.match(regex3)[1]
     }
-    console.log("🚀 ~ str.match(regex3)[1]:", str.match(regex3)[1])
+    // console.log("🚀 ~ str.match(regex3)[1]:", str.match(regex3)[1])
     status.value = parseInt(Number((mqttMessage.value.nowStep / mqttMessage.value.allStep) * 100))
     fileRef.value.setStatus(mqttMessage.value)
     fileName.value = mqttMessage.value.fileName

src/views/govern/device/planData/components/popup.vue

@@ -347,7 +347,7 @@ const unBindList = ref([])
 const bindList = ref([])
 //0 新增方案 1 修改方案 2 新增测试项 3 修改测试项 4 设备信息
 const open = async (val: any, id: any, name?: any) => {
-    console.log("🚀 ~ open ~ val:", val)
+    // console.log("🚀 ~ open ~ val:", val)
     popupType.value = val
     title.value = val == 0 ? '新增方案' : val == 1 ? '修改方案' : val == 2 ? '新增测试项' : val == 3 ? '修改测试项' : ('绑定测试项' + '_' + name)
     dialogVisible.value = true

src/views/govern/device/planData/components/schemeTree.vue

@@ -314,7 +314,7 @@ const clickNode = (e: anyObj) => {
     emit('nodeChange', e)
 }
 const setCheckedNode = (e: anyObj) => {
-    console.log('🚀 ~ setCheckedNode ~ e:', e)
+    // console.log('🚀 ~ setCheckedNode ~ e:', e)
     id.value = e
     treRef.value.setCurrentKey(e)
 }

src/views/govern/device/planData/components/transient.vue

@@ -1,17 +1,8 @@
 <template>
 
-    <TableHeader :showReset="false">
+    <!-- <TableHeader :showReset="false">
-        <!-- <template v-slot:select>
+       
-            <el-form-item label="用户状态">
+    </TableHeader> -->
-                <el-select v-model="tableStore.table.params.searchState" placeholder="选择用户状态">
-                    <el-option v-for="(item, index) in userState" :label="item.label" :key="index"
-                        :value="item.value"></el-option>
-                </el-select>
-            </el-form-item>
-           
-        </template>
--->
-    </TableHeader>
     <Table ref="tableRef" />
 
 </template>
@@ -30,37 +21,116 @@ const tableStore = new TableStore({
     paramsPOST: true,
     showPage: false,
     column: [
-        { title: '项目名称', field: 'projectName', minWidth: '130' },
+        // { width: '60', type: 'checkbox', fixed: 'left' },
-        { title: '测试项名称', field: 'itemName', minWidth: '130' },
+        {
-        { title: '装置名称', field: 'devName', minWidth: '130' },
+            title: '序号', width: 80, formatter: (row: any) => {
-        { title: '发生时刻', field: 'startTime', minWidth: '130' },
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-        { title: '持续时间', field: 'persistTime', minWidth: '130' },
+            }
-        { title: '事件描述', field: 'showName', minWidth: '130' },
+        },
-        { title: '暂降幅值', field: 'featureAmplitude', minWidth: '130' },
+        { field: 'startTime', title: '发生时刻', minWidth: 170 },
-        { title: '相别', field: 'phaseType', minWidth: '130' },
+        { 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: [
+            // buttons: [
-                {
+            //     {
-                    name: 'edit',
+            //         name: 'edit',
-                    title: '编辑',
+            //         title: '波形解析',
-                    type: 'primary',
+            //         type: 'primary',
-                    icon: 'el-icon-EditPen',
+            //         icon: 'el-icon-Check',
-                    render: 'basicButton',
+            //         render: 'basicButton',
-                    disabled: row => {
+            //         loading: 'loading1',
-                        return row.state !== 1
+            //         disabled: row => {
-                    },
+            //             // && row.evtParamTm < 20
-                    click: row => {
+            //             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)
+            //         }
+            //     }
+            // ]
         }
     ],
 

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('谐波电流有效值')) {

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]

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) {

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
     })

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 => {

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 {

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)

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(() => {

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(() => {

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)
     })

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
             }

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

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: '',

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 => {

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)
     })

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 => {

src/views/user/login.vue

@@ -10,16 +10,10 @@
                     <span style="font-size: 28px">{{ getThemeList.name || '电能质量监测系统' }}</span>
                 </div>
             </div>
-            <el-form :rules="rules" ref="formRef" size="large" class="login-form" :model="form">
+            <el-form :rules="rules" ref="formRef" size="large" class="login-form form-one" :model="form">
                 <el-form-item prop="username">
-                    <el-input
+                    <el-input ref="usernameRef" v-model="form.username" type="text" clearable placeholder="用户名"
-                        ref="usernameRef"
+                        autocomplete="off">
-                        v-model="form.username"
-                        type="text"
-                        clearable
-                        placeholder="用户名"
-                        autocomplete="off"
-                    >
                         <template #prefix>
                             <!-- <span class="iconfont icon-yonghu" style="color: var(--el-color-primary)"></span> -->
                             <Icon name="fa fa-user" style="color: var(--el-color-primary); font-size: 16px" />
@@ -27,13 +21,8 @@
                     </el-input>
                 </el-form-item>
                 <el-form-item prop="password">
-                    <el-input
+                    <el-input ref="passwordRef" v-model="form.password" type="password" placeholder="密码"
-                        ref="passwordRef"
+                        autocomplete="off">
-                        v-model="form.password"
-                        type="password"
-                        placeholder="密码"
-                        autocomplete="off"
-                    >
                         <template #prefix>
                             <Icon name="local-password" style="color: var(--el-color-primary); font-size: 16px" />
                             <!-- <span class="iconfont icon-mima" style="color: var(--el-color-primary)"></span> -->
@@ -41,13 +30,8 @@
                     </el-input>
                 </el-form-item>
                 <el-form-item>
-                    <el-button
+                    <el-button :loading="state.submitLoading" class="submit-btn" round type="info"
-                        :loading="state.submitLoading"
+                        @click="onSubmit(formRef)">
-                        class="submit-btn"
-                        round
-                        type="info"
-                        @click="onSubmit(formRef)"
-                    >
                         登录
                     </el-button>
                 </el-form-item>
@@ -68,7 +52,7 @@
 import { onMounted, onBeforeUnmount, reactive, ref, nextTick } from 'vue'
 import * as pageBubble from '@/utils/pageBubble'
 import { ElMessage } from 'element-plus'
-import { gongkey, login,getSysConfig } from '@/api/user-boot/user'
+import { gongkey, login, getSysConfig } from '@/api/user-boot/user'
 import { useAdminInfo } from '@/stores/adminInfo'
 import type { FormInstance, InputInstance, FormRules } from 'element-plus'
 import { useRouter } from 'vue-router'
@@ -312,6 +296,7 @@ const onSubmit = async (formEl: FormInstance | undefined) => {
     // background: #009688;
     //background: #4d6ea1;
     border-radius: 0;
+
     &:hover {
         background: var(--el-color-primary-light-5);
     }