- 
-
-
-
-
-
-
-
+ ![]()
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
-
-
+
-
-
+
+
- 暂态数据
+
+
@@ -192,12 +199,15 @@ import { color, gradeColor3 } from '@/components/echarts/color'
import TableHeader from '@/components/table/header/index.vue'
import { useConfig } from '@/stores/config'
import { getDeviceList } from '@/api/cs-device-boot/planData'
+import transient from './components/transient.vue'
const dictData = useDictData()
defineOptions({
// name: 'govern/device/planData/index'
})
+const childTab = ref('0')
const num = ref(0)
const config = useConfig()
+const transientRef = ref()
color[0] = config.layout.elementUiPrimary[0]
//电压等级
const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
@@ -249,6 +259,41 @@ queryByCode('portable-harmonic').then(res => {
})
queryStatistical(res.data.id).then(vv => {
legendDictList.value = vv.data
+ indexOptions.value.map((item: any, index: any) => {
+ if (!countDataCopy.value[index]) {
+ countDataCopy.value[index] = {
+ index: item.id,
+ countOptions: [],
+ count: [],
+ name: indexOptions.value.find((vv: any) => {
+ return vv.id == item.id
+ })?.name
+ }
+ }
+ legendDictList.value?.selectedList?.map((vv: any, vvs: any) => {
+ //查找相等的指标
+ if (item.id == vv.dataType) {
+ vv.eleEpdPqdVOS.map((kk: any, kks: any) => {
+ if (kk.harmStart && kk.harmEnd) {
+ range(0, 0, 0)
+
+ if (kk.showName == '间谐波电压含有率') {
+ countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
+ (item: any) => {
+ return item - 0.5
+ }
+ )
+ } else {
+ countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1)
+ }
+ if (!countDataCopy.value[index].count || countDataCopy.value[index].count.length == 0) {
+ countDataCopy.value[index].count = countDataCopy.value[index].countOptions[0]
+ }
+ }
+ })
+ }
+ })
+ })
})
})
const activeName: any = ref()
@@ -284,21 +329,23 @@ const nodeClick = async (e: anyObj) => {
if (res.data.records.length == 1) {
activeName.value = res.data.records[0].id
} else {
- res.data.records.map((item: any, index: any) => {
- //多层
+
+ for (const item of res.data.records) {
if (item.id == e.id) {
- activeName.value = item.id
- return
- } else {
- activeName.value = res.data.records[0].id
- return
+ activeName.value = item.id;
+ break; // 找到匹配项后停止遍历
}
- })
+ }
+ // 如果没有找到匹配项，默认设置为第一个元素的id
+ if (activeName.value !== e.id) { // 假设e.id是一个用于比较的初始值，表示未找到匹配项
+ activeName.value = res.data.records[0].id;
+ }
}
+
// if (searchForm.value.index.length == 0) {
// searchForm.value.index = [indexOptions.value[0].id]
// }
-
+
schemeTreeRef.value.getPlanData(deviceData.value)
await setTimeout(() => {
loading.value = true
@@ -307,6 +354,7 @@ const nodeClick = async (e: anyObj) => {
} else {
init(false)
}
+ transientRef.value && transientRef.value.init()
}, 100)
loading.value = false
@@ -326,6 +374,8 @@ const onIndexChange = (val: any) => {
}
})
searchForm.value.index = pp
+ formatCountOptions()
+
// if (val.length == 0) {
// searchForm.value.index = [indexOptions.value[0].id]
// }
@@ -402,7 +452,7 @@ const init = (flag: boolean) => {
//选择的指标使用方法处理
- formatCountOptions(searchForm.value.index)
+ formatCountOptions()
//查询历史趋势
historyDataList.value = []
let middleTitle = ''
@@ -822,46 +872,61 @@ const handleExport = async () => {
return
}
const countData: any = ref([])
+const countDataCopy: any = ref([])
const tableHeaderRef = ref()
-//根据选择的指标处理谐波次数
-const formatCountOptions = (list: any) => {
- countData.value = []
- if (list.length != 0) {
- list.map((item: any, index: any) => {
- if (!countData.value[index]) {
- countData.value[index] = {
- index: item,
- countOptions: [],
- count: [],
- name: indexOptions.value.find((vv: any) => {
- return vv.id == item
- })?.name
- }
- }
- legendDictList.value?.selectedList?.map((vv: any, vvs: any) => {
- //查找相等的指标
- if (item == vv.dataType) {
- vv.eleEpdPqdVOS.map((kk: any, kks: any) => {
- if (kk.harmStart && kk.harmEnd) {
- range(0, 0, 0)
- if (kk.showName == '间谐波电压含有率') {
- countData.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
- (item: any) => {
- return item - 0.5
- }
- )
- } else {
- countData.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1)
- }
- if (!countData.value[index].count || countData.value[index].count.length == 0) {
- countData.value[index].count = countData.value[index].countOptions[0]
- }
- }
- })
+//根据选择的指标处理谐波次数
+const formatCountOptions = () => {
+
+ countData.value = []
+ console.log(123, indexOptions.value);
+
+ if (searchForm.value.index.length != 0) {
+ searchForm.value.index.forEach((item: any, index: any) => {
+ countDataCopy.value.forEach((vv: any, vvs: any) => {
+ if (vv.index == item) {
+ countData.value.push(vv)
}
})
+
})
+ // indexOptions.value.map((item: any, index: any) => {
+ // if (!countDataCopy.value[index]) {
+ // countDataCopy.value[index] = {
+ // index: item.id,
+ // countOptions: [],
+ // count: [],
+ // name: indexOptions.value.find((vv: any) => {
+ // return vv.id == item.id
+ // })?.name
+ // }
+ // }
+ // legendDictList.value?.selectedList?.map((vv: any, vvs: any) => {
+ // //查找相等的指标
+ // if (item.id == vv.dataType) {
+ // vv.eleEpdPqdVOS.map((kk: any, kks: any) => {
+ // if (kk.harmStart && kk.harmEnd) {
+ // range(0, 0, 0)
+
+ // if (kk.showName == '间谐波电压含有率') {
+ // countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1).map(
+ // (item: any) => {
+ // return item - 0.5
+ // }
+ // )
+ // } else {
+ // countDataCopy.value[index].countOptions = range(kk.harmStart, kk.harmEnd, 1)
+ // }
+ // if (!countDataCopy.value[index].count || countDataCopy.value[index].count.length == 0) {
+ // countDataCopy.value[index].count = countDataCopy.value[index].countOptions[0]
+ // }
+ // }
+ // })
+ // }
+ // })
+ // })
+ console.log("🚀 ~ vv.eleEpdPqdVOS.map ~ countData.value:", countDataCopy.value)
+
countData.value.map((item: any, key: any) => {
if (item.name.includes('谐波电流有效值')) {
item.name = '谐波电流次数'
@@ -922,26 +987,24 @@ watch(
() => searchForm.value.index,
(val: any, oldval: any) => {
- if (val) {
+ // if (val) {
+ // let list = val
+ // setTimeout(() => {
+ // formatCountOptions(list)
+ // }, 100)
+ // countData.value.map((item: any, key: any) => {
+ // if (
+ // list.findIndex((vv: any) => {
+ // return vv == item.index
+ // }) == -1
+ // ) {
+ // countData.value.splice(key, 1)
+ // }
+ // })
-
- let list = val
- setTimeout(() => {
- formatCountOptions(list)
- }, 100)
- countData.value.map((item: any, key: any) => {
- if (
- list.findIndex((vv: any) => {
- return vv == item.index
- }) == -1
- ) {
- countData.value.splice(key, 1)
- }
- })
-
- init(false)
- }
+ // init(false)
+ // }
},
{
deep: true,
@@ -949,6 +1012,7 @@ watch(
}
)
onMounted(() => {
+
setTimeout(() => {
init(true)
}, 1500)
diff --git a/src/views/govern/manage/engineering.vue b/src/views/govern/manage/engineering.vue
index 5051097..76d33d4 100644
--- a/src/views/govern/manage/engineering.vue
+++ b/src/views/govern/manage/engineering.vue
@@ -64,8 +64,23 @@ const deletes = (row: any) => {
ElMessageBox.prompt('二次校验密码确认', '·', {
confirmButtonText: '确认',
cancelButtonText: '取消',
- customClass: 'customInput',
- inputType: 'text'
+ customClass: 'customInput',
+ inputType: 'text',
+ beforeClose: (action, instance, done) => {
+
+ if (action === 'confirm') {
+ if (instance.inputValue == null) {
+ return ElMessage.warning('请输入密码')
+ } else if (instance.inputValue?.length > 32) {
+ return ElMessage.warning('密码长度不能超过32位,当前密码长度为' + instance.inputValue.length)
+ } else {
+ done();
+ }
+
+ } else {
+ done();
+ }
+ }
}).then(({ value }) => {
passwordConfirm(value).then(res => {
auditEngineering({
diff --git a/src/views/govern/manage/factory.vue b/src/views/govern/manage/factory.vue
index 82b15d2..eb4219e 100644
--- a/src/views/govern/manage/factory.vue
+++ b/src/views/govern/manage/factory.vue
@@ -47,11 +47,11 @@
:before-close="resetForm" draggable width="800px">
-
-
@@ -72,6 +72,9 @@
+
+
@@ -41,14 +42,14 @@ const options = ref([
{ name: 'APF模块', value: 3 },
{ name: '星型接线', value: 4 },
{ name: '角型接线', value: 5 },
- { name: 'v型接线', value: 6 },
+ { name: 'V型接线', value: 6 },
])
const tableStore = new TableStore({
showPage: false,
url: '/system-boot/dictTree/query',
method: 'POST',
paramsPOST: true,
- publicHeight: 60,
+ // publicHeight: 60,
column: [
{
title: '序号', width: 80, formatter: (row: any) => {
@@ -141,7 +142,7 @@ onMounted(() => {
const addMenu = () => {
console.log(bindingRef)
- addRef.value.open('新增菜单', {
+ addRef.value.open('新增', {
sort: tableStore.table.data.length ? tableStore.table.data[tableStore.table.data.length - 1].sort + 1 : 1,
code: '',
pid: '',
diff --git a/src/views/system/subject/form/index.vue b/src/views/system/subject/form/index.vue
index 58f1b8e..d89e3a4 100644
--- a/src/views/system/subject/form/index.vue
+++ b/src/views/system/subject/form/index.vue
@@ -105,7 +105,7 @@ import { addTheme, updateTheme } from '@/api/system/subject/index'
const emit = defineEmits(['Cancels'])
const configStore = ref({
// 后台主页面切换动画，可选值
- mainAnimation: 'slide-right',
+ mainAnimation: 'el-fade-in',
elementUiPrimary: ['#0e8780', '#0e8780'],
tableHeaderBackground: ['#F3F6F9', '#F3F6F9'],
tableHeaderColor: ['#111', '#fff'],
diff --git a/src/views/system/subject/index.vue b/src/views/system/subject/index.vue
index a5c775c..3280e9f 100644
--- a/src/views/system/subject/index.vue
+++ b/src/views/system/subject/index.vue
@@ -41,7 +41,7 @@ const tableStore: any = new TableStore({
},
{ field: 'name', title: '主题名称' },
{ field: 'remark', title: '描述' },
- // { field: 'logoUrl', title: '主题图标', render: 'image' },
+ { field: 'logoUrl', title: '主题图标', render: 'image' },
{
title: '操作',
diff --git a/src/views/user/login.vue b/src/views/user/login.vue
index 3ec1167..5b50195 100644
--- a/src/views/user/login.vue
+++ b/src/views/user/login.vue
@@ -7,29 +7,47 @@
-
+
-
+
+
-
+
-
+
-
+
登录
@@ -50,18 +68,19 @@
import { onMounted, onBeforeUnmount, reactive, ref, nextTick } from 'vue'
import * as pageBubble from '@/utils/pageBubble'
import { ElMessage } from 'element-plus'
-import { gongkey, login } 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'
import { ADMIN_INFO } from '@/stores/constant/cacheKey'
import { Local } from '@/utils/storage'
+import { getTheme } from '@/api/systerm'
+import { useConfig } from '@/stores/config'
import PopupUpdatePwd from './popupUpdatePwd.vue'
-import { encrypt } from '@/assets/commjs/sm2.js';
const router = useRouter()
let timer: number
-
+const configStore = useConfig()
const popupUpdatePwdRef = ref()
const formRef = ref()
const usernameRef = ref()
@@ -69,7 +88,7 @@ const passwordRef = ref()
const userInfo = useAdminInfo()
Local.remove(ADMIN_INFO)
userInfo.removeToken()
-
+const getThemeList: any = ref([])
interface RuleForm {
username: string
password: string
@@ -107,7 +126,29 @@ onBeforeUnmount(() => {
clearTimeout(timer)
pageBubble.removeListeners()
})
+getTheme().then(res => {
+ document.title = res.data.name || '电能质量在线监测系统'
+ let list: any = [
+ 'elementUiPrimary',
+ 'tableHeaderBackground',
+ 'tableHeaderColor',
+ 'tableCurrent',
+ 'menuBackground',
+ 'menuColor',
+ 'menuTopBarBackground',
+ 'menuActiveBackground',
+ 'menuActiveColor',
+ 'headerBarTabColor',
+ 'headerBarBackground'
+ ]
+ getThemeList.value = res.data
+ window.localStorage.setItem('getTheme', JSON.stringify(res.data))
+ for (let i = 0; i < list.length; i++) {
+ configStore.setLayout(list[i], JSON.parse(res.data[list[i]]))
+ }
+ configStore.setLayout('elementUiPrimary', JSON.parse(res.data['elementUiPrimary']))
+})
const onSubmit = async (formEl: FormInstance | undefined) => {
if (!formEl) return
await formEl.validate((valid, fields) => {
@@ -123,6 +164,9 @@ const onSubmit = async (formEl: FormInstance | undefined) => {
.then(res => {
userInfo.dataFill(res.data)
state.submitLoading = false
+ getSysConfig().then(res => {
+ window.localStorage.setItem('sysdata', JSON.stringify(res.data))
+ })
router.push({
path: '/'
})
@@ -146,7 +190,7 @@ const onSubmit = async (formEl: FormInstance | undefined) => {
width: 100%;
min-height: 100%;
overflow: hidden;
- background-color: #003078 !important;
+ background-color: var(--el-color-primary) !important;
background-position: center 110px;
background-repeat: repeat;
background-size: 100%;
@@ -264,8 +308,13 @@ const onSubmit = async (formEl: FormInstance | undefined) => {
width: 100%;
margin-top: 0px;
margin-bottom: 20px;
- background: #4d6ea1;
+ background: var(--el-color-primary-light-3);
+ // background: #009688;
+ //background: #4d6ea1;
border-radius: 0;
+ &:hover {
+ background: var(--el-color-primary-light-5);
+ }
}
@media screen and (max-width: 720px) {
@@ -117,6 +117,17 @@
:label="item.name" :value="item.id">
+
+
+
+
+
@@ -124,12 +135,8 @@
:value="item.id">
-
-
-
-
+
+
@@ -162,8 +169,8 @@
- 电能质量数据监测云平台
+ {{ getThemeList.name || '电能质量监测系统' }}