Web/admin-govern
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改 弹框样式

Browse Source
This commit is contained in:
GGJ
2024-09-30 15:37:33 +08:00
parent d59ee50549
commit e67438cc76
15 changed files with 127 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/echarts/MyEchart.vue
View File

@@ -197,9 +197,11 @@ const handlerXAxis = () => {
// textStyle: { // textStyle: {
fontFamily: 'dinproRegular', fontFamily: 'dinproRegular',
color: '#000', color: '#000',
fontSize: '12' fontSize: '12',
// } // }
} }
} }
// props.options?.xAxis 是数组还是对象 // props.options?.xAxis 是数组还是对象
if (Array.isArray(props.options?.xAxis)) { if (Array.isArray(props.options?.xAxis)) {

2
src/components/form/datePicker/index.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<div style="width: 600px"> <div style="width: 540px">
<el-select v-model="interval" style="min-width: 90px; width: 90px; margin-right: 10px" @change="timeChange"> <el-select v-model="interval" style="min-width: 90px; width: 90px; margin-right: 10px" @change="timeChange">
<el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>

4
src/views/auth/menu/popupMenu.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title"> <el-dialog class="cn-operate-dialog" width="700px" v-model="dialogVisible" :title="title">
<el-scrollbar> <el-scrollbar>
<el-form :inline="false" :model="form" label-width="120px"> <el-form :inline="false" :model="form" label-width="auto" class="form-one">
<el-form-item label="上级菜单"> <el-form-item label="上级菜单">
<el-cascader <el-cascader
v-model="form.pid" v-model="form.pid"

6
src/views/auth/role/popupForm.vue
View File

@@ -1,7 +1,6 @@
<template> <template>
<el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title"> <el-dialog class="cn-operate-dialog" width="700px" v-model="dialogVisible" :title="title">
<el-scrollbar> <el-form :inline="false" :model="form" label-width="auto" class="form-one" :rules="rules">
<el-form :inline="false" :model="form" label-width="120px" :rules="rules">
<el-form-item label="角色名称"> <el-form-item label="角色名称">
<el-input v-model="form.name" placeholder="请输入菜单名称" /> <el-input v-model="form.name" placeholder="请输入菜单名称" />
</el-form-item> </el-form-item>
@@ -12,7 +11,6 @@
<el-input v-model="form.remark" :rows="2" type="textarea" placeholder="请输入描述" /> <el-input v-model="form.remark" :rows="2" type="textarea" placeholder="请输入描述" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-scrollbar>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">

12
src/views/auth/userList/popupEdit.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title"> <el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title">
<el-scrollbar>
<el-form :inline="true" :model="form" label-width="120px" :rules="rules"> <el-form :model="form" label-width="auto" class="form-two" :rules="rules">
<el-form-item label="用户名" prop="name"> <el-form-item label="用户名" prop="name">
<el-input v-model="form.name" placeholder="请输入昵称" /> <el-input v-model="form.name" placeholder="请输入昵称" />
</el-form-item> </el-form-item>
@@ -37,7 +37,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="所属部门" prop="deptId"> <el-form-item label="所属部门" prop="deptId">
<Area style="width: 200px" v-model="form.deptId" /> <Area v-model="form.deptId" />
</el-form-item> </el-form-item>
<el-form-item label="角色" prop="role"> <el-form-item label="角色" prop="role">
<el-select v-model="form.role" placeholder="请选择角色" multiple collapse-tags> <el-select v-model="form.role" placeholder="请选择角色" multiple collapse-tags>
@@ -57,7 +57,7 @@
<el-input v-model="form.email" placeholder="请输入描述" /> <el-input v-model="form.email" placeholder="请输入描述" />
</el-form-item> </el-form-item>
<el-form-item label="时间段" prop="limitTime"> <el-form-item label="时间段" prop="limitTime">
<el-slider v-model="form.limitTime" style="width: 200px" range show-stops :max="24" /> <el-slider v-model="form.limitTime" style="width: 95%" range show-stops :max="24" />
</el-form-item> </el-form-item>
<el-form-item label="起始IP" prop="limitIpStart"> <el-form-item label="起始IP" prop="limitIpStart">
<el-input v-model="form.limitIpStart" placeholder="请输入描述" /> <el-input v-model="form.limitIpStart" placeholder="请输入描述" />
@@ -88,14 +88,14 @@
:disabled="title !== '新增用户'" :disabled="title !== '新增用户'"
v-model="form.id" v-model="form.id"
placeholder="请输入用户id" placeholder="请输入用户id"
v-if="useId" v-if="useId"
style="flex: 1" style="flex: 1;"
class="ml10" class="ml10"
></el-input> ></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-scrollbar>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">

127
src/views/govern/analyze/APF/index.vue
View File

@@ -3,6 +3,9 @@
<DeviceTree @node-click="nodeClick" @init="nodeClick"></DeviceTree> <DeviceTree @node-click="nodeClick" @init="nodeClick"></DeviceTree>
<div class="analyze-apf-right" v-if="formInline.devId"> <div class="analyze-apf-right" v-if="formInline.devId">
<el-form :inline="true"> <el-form :inline="true">
<el-form-item label="时间:">
<DatePicker ref="datePickerRef"></DatePicker>
</el-form-item>
<el-form-item label="统计指标:"> <el-form-item label="统计指标:">
<el-select v-model="formInline.statisticalId" filterable placeholder="请选择"> <el-select v-model="formInline.statisticalId" filterable placeholder="请选择">
<el-option v-for="item in zblist" :key="item.value" :label="item.label" <el-option v-for="item in zblist" :key="item.value" :label="item.label"
@@ -15,9 +18,7 @@
:value="item.value"></el-option> :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="时间:">
<DatePicker ref="datePickerRef"></DatePicker>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="search" icon="el-icon-Search">查询</el-button> <el-button type="primary" @click="search" icon="el-icon-Search">查询</el-button>
</el-form-item> </el-form-item>
@@ -46,7 +47,7 @@ import { getDevCapacity } from '@/api/cs-device-boot/capacity'
import { queryCommonStatisticalByTime } from '@/api/cs-harmonic-boot/stable' import { queryCommonStatisticalByTime } from '@/api/cs-harmonic-boot/stable'
import DatePicker from '@/components/form/datePicker/index.vue' import DatePicker from '@/components/form/datePicker/index.vue'
import MyEchart from '@/components/echarts/MyEchart.vue' import MyEchart from '@/components/echarts/MyEchart.vue'
import { yMethod } from '@/utils/echartMethod'
defineOptions({ defineOptions({
name: 'govern/analyze/APF' name: 'govern/analyze/APF'
}) })
@@ -134,6 +135,35 @@ const search = () => {
legend.push(item.anotherName) legend.push(item.anotherName)
} }
}) })
let aar = data
.map(item => {
if (item.statisticalName === 'Apf_RmsI_TolOut') {
return [item.time, item.statisticalData.toFixed(2)]
} else {
return ''
}
})
.filter(item => item !== '')
let aar1 = data
.map(item => {
if (item.statisticalName === 'Apf_ThdA_Load') {
return [item.time, item.statisticalData.toFixed(2)]
} else {
return ''
}
})
.filter(item => item !== '')
let aar2 = data
.map(item => {
if (item.statisticalName === 'Apf_ThdA_Sys') {
return [item.time, item.statisticalData.toFixed(2)]
} else {
return ''
}
})
.filter(item => item !== '')
let series = [ let series = [
// 总输出电流 // 总输出电流
{ {
@@ -142,15 +172,7 @@ const search = () => {
smooth: true, smooth: true,
type: 'line', type: 'line',
//stack: 'Total', //stack: 'Total',
data: data data: aar,
.map(item => {
if (item.statisticalName === 'Apf_RmsI_TolOut') {
return item.statisticalData
} else {
return ''
}
})
.filter(item => item !== ''),
markLine: { markLine: {
symbol: 'none', symbol: 'none',
data: [ data: [
@@ -172,15 +194,7 @@ const search = () => {
symbol: 'none', symbol: 'none',
smooth: true, smooth: true,
type: 'line', type: 'line',
data: data data: aar1
.map(item => {
if (item.statisticalName === 'Apf_ThdA_Load') {
return item.statisticalData
} else {
return ''
}
})
.filter(item => item !== '')
}, },
// 电网电流畸变率 // 电网电流畸变率
{ {
@@ -188,17 +202,12 @@ const search = () => {
symbol: 'none', symbol: 'none',
smooth: true, smooth: true,
type: 'line', type: 'line',
data: data data: aar2
.map(item => {
if (item.statisticalName === 'Apf_ThdA_Sys') {
return item.statisticalData
} else {
return ''
}
})
.filter(item => item !== '')
} }
] ]
let [min, max] = yMethod(aar.map((item: any) => item[1]))
let [min1, max1] = yMethod([...aar1, ...aar2].map((item: any) => item[1]))
echartsData.value = { echartsData.value = {
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
@@ -225,30 +234,40 @@ const search = () => {
}, },
xAxis: { xAxis: {
name: '时间', name: '时间',
type: 'category', type: 'time',
boundaryGap: false,
data: xAxis,
axisLabel: { axisLabel: {
formatter: function (value: string) { formatter: {
return value.split(' ').join('\n') day: '{MM}-{dd}',
} month: '{MM}',
year: '{yyyy}',
}, },
axisLine: { },
show: true,
// symbol: ["none", "arrow"], // boundaryGap: false,
lineStyle: { // data: xAxis,
color: '#333' // axisLabel: {
} // formatter: function (value: string) {
} // return value.split(' ').join('\n')
// }
// },
// axisLine: {
// show: true,
// // symbol: ["none", "arrow"],
// lineStyle: {
// color: '#333'
// }
// }
}, },
yAxis: [ yAxis: [
{ {
name: '畸变率:(%)', name: '畸变率:(%)',
type: 'value', type: 'value',
// max: 10, // max: 10,
min: 0, min: min1,
max: max1,
splitNumber: 5,
minInterval: 1, minInterval: 1,
// interval: 1,
axisLine: { axisLine: {
show: true, show: true,
//symbol: ["none", "arrow"], //symbol: ["none", "arrow"],
@@ -260,18 +279,10 @@ const search = () => {
{ {
name: '电流:(A)', name: '电流:(A)',
type: 'value', type: 'value',
min: 0, min: min,
minInterval: 1, //分割刻度 max: max,
// 寻找data最大值 splitNumber: 5,
// interval: 1, minInterval: 1,
max:
series[0].data.reduce((a, b) => Math.max(a, b)) > devCapacity.value
? series[0].data.reduce((a, b) => Math.max(a, b))
: devCapacity.value + devCapacity.value * 0.5,
// interval:
// (series[0].data.reduce((a, b) => Math.max(a, b)) > devCapacity.value
// ? series[0].data.reduce((a, b) => Math.max(a, b)).toFixed(0)
// : (devCapacity.value) / 10).toFixed(0),
splitLine: { splitLine: {
show: false, show: false,
}, },

3
src/views/govern/device/control/detail.vue
View File

@@ -228,7 +228,8 @@ const init = () => {
axisLabel: { axisLabel: {
formatter: { formatter: {
day: '{MM}-{dd}', day: '{MM}-{dd}',
month: '{MM}',
year: '{yyyy}',
} }
} }
// data: res.data[0].map((item: any) => { // data: res.data[0].map((item: any) => {

3
src/views/govern/device/control/tabs/trend.vue
View File

@@ -283,7 +283,8 @@ const init = async () => {
axisLabel: { axisLabel: {
formatter: { formatter: {
day: '{MM}-{dd}', day: '{MM}-{dd}',
month: '{MM}',
year: '{yyyy}',
} }
},}, },},
// [ // [

2
src/views/govern/device/disposition/index.vue
View File

@@ -4,7 +4,7 @@
<div class="device-manage-right" :style="{ height: pageHeight.height }"> <div class="device-manage-right" :style="{ height: pageHeight.height }">
<el-descriptions title="用户基本信息" class="mb10" :column="2" border> <el-descriptions title="用户基本信息" class="mb10" :column="2" border>
<template #extra> <template #extra>
<el-button type="primary" size="small" icon="el-icon-Plus" @click="getMarketEnginner"> <el-button type="primary" icon="el-icon-Plus" @click="getMarketEnginner">
添加工程 添加工程
</el-button> </el-button>
</template> </template>

62
src/views/govern/device/planData/index.vue
View File

@@ -22,12 +22,8 @@
<p>测试项信息</p> <p>测试项信息</p>
</div> --> </div> -->
<el-tabs v-model="activeName" type="border-card" @click="handleClickTabs"> <el-tabs v-model="activeName" type="border-card" @click="handleClickTabs">
<el-tab-pane <el-tab-pane v-for="(item, index) in deviceData.records" :label="item.itemName"
v-for="(item, index) in deviceData.records" :name="item.id" :key="index">
:label="item.itemName"
:name="item.id"
:key="index"
>
<template #label> <template #label>
<span class="custom-tabs-label"> <span class="custom-tabs-label">
<el-icon> <el-icon>
@@ -105,20 +101,10 @@
<div class="history_header"> <div class="history_header">
<el-form :model="searchForm" class="history_select" id="history_select"> <el-form :model="searchForm" class="history_select" id="history_select">
<el-form-item label="统计指标" label-width="80px"> <el-form-item label="统计指标" label-width="80px">
<el-select <el-select collapse-tags collapse-tags-tooltip v-model="searchForm.index"
collapse-tags placeholder="请选择统计指标" multiple :multiple-limit="3">
collapse-tags-tooltip <el-option v-for="item in indexOptions" :key="item.id" :label="item.name"
v-model="searchForm.index" :value="item.id"></el-option>
placeholder="请选择统计指标"
multiple
:multiple-limit="3"
>
<el-option
v-for="item in indexOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="值类型"> <el-form-item label="值类型">
@@ -128,36 +114,20 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<div v-for="(item, index) in countData" :key="index"> <div v-for="(item, index) in countData" :key="index">
<el-form-item <el-form-item :label="item.name + '谐波次数'" label-width="180px"
:label="item.name + '谐波次数'" v-if="item.countOptions.length != 0">
label-width="180px"
v-if="item.countOptions.length != 0"
>
<!-- multiple --> <!-- multiple -->
<el-select <el-select v-model="item.count" collapse-tags collapse-tags-tooltip
v-model="item.count" placeholder="请选择谐波次数" style="width: 100px">
collapse-tags <el-option v-for="vv in item.countOptions" :key="vv" :label="vv"
collapse-tags-tooltip :value="vv"></el-option>
placeholder="请选择谐波次数"
style="width: 100px"
>
<el-option
v-for="vv in item.countOptions"
:key="vv"
:label="vv"
:value="vv"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
<el-form-item label="统计类型" label-width="80px"> <el-form-item label="统计类型" label-width="80px">
<el-select v-model="searchForm.type" placeholder="请选择值类型"> <el-select v-model="searchForm.type" placeholder="请选择值类型">
<el-option <el-option v-for="item in typeOptions" :key="item.id" :label="item.name"
v-for="item in typeOptions" :value="item.id"></el-option>
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -534,7 +504,9 @@ const init = (flag: boolean) => {
type: 'time', type: 'time',
axisLabel: { axisLabel: {
formatter: { formatter: {
day: '{MM}-{dd}' day: '{MM}-{dd}',
month: '{MM}',
year: '{yyyy}',
} }
} }
}, },

7
src/views/govern/manage/basic/popupVersion.vue
View File

@@ -1,9 +1,9 @@
<template> <template>
<el-dialog class="cn-operate-dialog" width="800px" v-model="dialogVisible" :title="title"> <el-dialog class="cn-operate-dialog" width="800px" v-model="dialogVisible" :title="title">
<el-scrollbar>
<el-form class="form-two" :model="form" label-width="120px" ref="formRef" :rules="rules"> <el-form class="form-two" :model="form" label-width="120px" ref="formRef" :rules="rules">
<el-form-item label="装置类型:" prop="type"> <el-form-item label="装置类型:" prop="type">
<el-select v-model="form.type" placeholder="请选择" @change="typeChange"> <el-select v-model="form.type" filterable placeholder="请选择" @change="typeChange">
<el-option <el-option
v-for="item in TypeOptions" v-for="item in TypeOptions"
:key="item.id" :key="item.id"
@@ -13,7 +13,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="装置型号:" prop="devType"> <el-form-item label="装置型号:" prop="devType">
<el-select v-model="form.devType" placeholder="请选择" @change="devTypeChange"> <el-select v-model="form.devType" placeholder="请选择" filterable @change="devTypeChange">
<el-option <el-option
v-for="item in DevTypeOptions" v-for="item in DevTypeOptions"
:key="item.id" :key="item.id"
@@ -64,7 +64,6 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-scrollbar>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">

4
src/views/govern/manage/engineering.vue
View File

@@ -8,7 +8,7 @@
v-bind="defaultAttribute" v-bind="defaultAttribute"
:data="tableStore.table.data" :data="tableStore.table.data"
:column-config="{ resizable: true }" :column-config="{ resizable: true }"
:tree-config="{}" :tree-config="{expandAll: true }"
> >
<vxe-column field="name" align="left" title="名称" tree-node></vxe-column> <vxe-column field="name" align="left" title="名称" tree-node></vxe-column>
<vxe-column field="area" title="区域"> <vxe-column field="area" title="区域">
@@ -49,7 +49,7 @@ onMounted(() => {
tableStore.index() tableStore.index()
setTimeout(() => { setTimeout(() => {
tableRef.value.setAllTreeExpand(true) tableRef.value.setAllTreeExpand(true)
}, 100) }, 500)
}) })
const addMenu = () => {} const addMenu = () => {}

4
src/views/govern/manage/factory.vue
View File

@@ -73,9 +73,9 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:before-close="resetForm" :before-close="resetForm"
draggable draggable
width="40%" width="800px"
> >
<el-form :model="form" label-width="120px" :rules="rules" ref="ruleFormRef" class="form-two"> <el-form :model="form" label-width="auto" :rules="rules" ref="ruleFormRef" class="form-two">
<el-form-item label="设备名称:" prop="name"> <el-form-item label="设备名称:" prop="name">
<el-input <el-input
v-model="form.name" v-model="form.name"

11
src/views/govern/reportCore/statistics/index.vue
View File

@@ -20,7 +20,8 @@
</template> </template>
</TableHeader> </TableHeader>
<div class="box"> <div class="box">
<div id="luckysheet" v-loading="tableStore.table.loading" :style="`height: calc(${tableStore.table.height} + 45px)`"></div> <div id="luckysheet" v-loading="tableStore.table.loading"
:style="`height: calc(${tableStore.table.height} + 45px)`"></div>
</div> </div>
</pane> </pane>
</splitpanes> </splitpanes>
@@ -39,7 +40,7 @@ import 'splitpanes/dist/splitpanes.css'
import { Splitpanes, Pane } from 'splitpanes' import { Splitpanes, Pane } from 'splitpanes'
// import data from './123.json' // import data from './123.json'
defineOptions({ defineOptions({
name: 'reportCore/statistics' name: 'govern/reportCore/statistics/index'
}) })
const height = mainHeight(20) const height = mainHeight(20)
const size = ref(0) const size = ref(0)
@@ -95,7 +96,7 @@ const tableStore = new TableStore({
} }
}) })
provide('tableStore', tableStore) provide('tableStore', tableStore)
const flag = ref(true)
onMounted(() => { onMounted(() => {
const dom = document.getElementById('navigation-splitpanes') const dom = document.getElementById('navigation-splitpanes')
if (dom) { if (dom) {
@@ -106,6 +107,7 @@ getTemplateByDept({ id: dictData.state.area[0].id }).then((res: any) => {
templatePolicy.value = res.data templatePolicy.value = res.data
Template.value = res.data[0] Template.value = res.data[0]
reportForm.value = res.data[0]?.reportForm reportForm.value = res.data[0]?.reportForm
}) })
@@ -114,10 +116,11 @@ const changetype = (val: any) => {
} }
const handleNodeClick = (data: any, node: any) => { const handleNodeClick = (data: any, node: any) => {
console.log(data.level, "+++++++++++++");
if (data.level == 3) { if (data.level == 3) {
dotList.value = data dotList.value = data
setTimeout(() => {
tableStore.index() tableStore.index()
},500)
} }
} }

7
src/views/govern/setting/statisticalType/add.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title"> <el-dialog width="500px" v-model="dialogVisible" :title="title">
<el-scrollbar>
<el-form :inline="false" :model="form" label-width="120px"> <el-form :model="form" class="form-one" label-width="auto">
<el-form-item label="名称"> <el-form-item label="名称">
<el-input v-model="form.name" placeholder="请输入名称" /> <el-input v-model="form.name" placeholder="请输入名称" />
</el-form-item> </el-form-item>
@@ -15,7 +15,6 @@
<el-input-number v-model="form.sort" :min="0" /> <el-input-number v-model="form.sort" :min="0" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-scrollbar>
<template #footer> <template #footer>
<span class="dialog-footer"> <span class="dialog-footer">