+
是
否
@@ -235,7 +236,7 @@ const open = (text: string, data?: anyObj) => {
form[key] = ''
}
form.casualUser = 1
- form.limitTime = [0, 23]
+ form.limitTime = [0, 24]
form.role = []
form.smsNotice = 0
form.emailNotice = 0
diff --git a/src/views/govern/device/control/analysisList/index.vue b/src/views/govern/device/control/analysisList/index.vue
index c121689..b967276 100644
--- a/src/views/govern/device/control/analysisList/index.vue
+++ b/src/views/govern/device/control/analysisList/index.vue
@@ -3,12 +3,7 @@
-
-
-
+
diff --git a/src/views/govern/device/control/tabs/realtime.vue b/src/views/govern/device/control/tabs/realtime.vue
index d92d725..19b81a5 100644
--- a/src/views/govern/device/control/tabs/realtime.vue
+++ b/src/views/govern/device/control/tabs/realtime.vue
@@ -212,21 +212,21 @@ const initRadioCharts = () => {
},
data: [
{
- value: 180,
+ value: 0,
name: 'A相',
itemStyle: {
color: '#FFCC00'
}
},
{
- value: 90,
+ value: 0,
name: 'B相',
itemStyle: {
color: '#009900'
}
},
{
- value: 30,
+ value: 0,
name: 'C相',
itemStyle: {
color: '#CC0000'
@@ -310,21 +310,21 @@ const initRadioCharts = () => {
},
data: [
{
- value: 160,
+ value: 0,
name: 'A相',
itemStyle: {
color: '#FFCC00'
}
},
{
- value: 70,
+ value: 0,
name: 'B相',
itemStyle: {
color: '#009900'
}
},
{
- value: 40,
+ value: 0,
name: 'C相',
itemStyle: {
color: '#CC0000'
@@ -405,7 +405,7 @@ const init = () => {
},
data: [
{
- value: 15,
+ value: 0,
name: 'A相'
}
]
@@ -466,7 +466,6 @@ const iRadioList: any = ref([]),
const getRealTimeData = async (val: any) => {
iRadioList.value = []
vRadioList.value = []
- console.log(val, '999999999')
val.map((item: any) => {
//基波电流相角
if (item.statisticalName == 'Pq_FundIAng') {
diff --git a/src/views/govern/device/control/tabs/trend.vue b/src/views/govern/device/control/tabs/trend.vue
index d036359..8f4a938 100644
--- a/src/views/govern/device/control/tabs/trend.vue
+++ b/src/views/govern/device/control/tabs/trend.vue
@@ -13,6 +13,7 @@
collapse-tags-tooltip
v-model="searchForm.index"
placeholder="请选择统计指标"
+ @change="onIndexChange($event)"
>
+
@@ -274,16 +277,10 @@ const init = async () => {
right: '3%', // 位置调整
top: 0,
bottom: 20,
- width: 400,
+ width: 430,
height: 50
},
- grid: {
- left: '3%',
- right: '5%',
- bottom: '5%',
- top: '8%',
- containLabel: true
- },
+
xAxis: [
{
type: 'category',
@@ -460,7 +457,7 @@ const handleExport = async () => {
if (deviceData.value.records && deviceData.value.records.length != 0) {
let csv = '',
- obj = {}
+ obj:any = {}
obj = deviceData.value.records.find((item: any) => {
return item.id == activeName.value
})
@@ -613,6 +610,17 @@ const initSearchFormIndexAndCount = (list: any) => {
})
}
}
+// 判断下拉框是否存在
+const onCountChange = (val: any, index: any) => {
+ if(val.length==0){
+ countData.value[index].count=[countData.value[index].countOptions[0]]
+ }
+}
+const onIndexChange = (val: any, ) => {
+ if(val.length==0){
+ searchForm.value.index=[indexOptions.value[0].id]
+ }
+}
watch(
() => searchForm.value.index,
(val: any, oldval: any) => {
@@ -638,7 +646,7 @@ watch(
}
)
// watch(
-// () => trendRequestData.value,
+// () => trendRequestData.value,
// (val: any, oldval: any) => {
// if (val) {
// init()
diff --git a/src/views/govern/device/fileService/CustomInput.vue b/src/views/govern/device/fileService/CustomInput.vue
deleted file mode 100644
index 3dcc0d9..0000000
--- a/src/views/govern/device/fileService/CustomInput.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/govern/device/fileService/index.vue b/src/views/govern/device/fileService/index.vue
index 4e4036c..5ebabaa 100644
--- a/src/views/govern/device/fileService/index.vue
+++ b/src/views/govern/device/fileService/index.vue
@@ -22,8 +22,8 @@
-
+
搜索
重置
import DeviceTree from '@/components/tree/govern/deviceTree.vue'
import { mainHeight } from '@/utils/layout'
-import { ref, reactive, watch, onMounted, onBeforeUnmount } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ref, reactive, watch, onMounted, onBeforeUnmount, h } from 'vue'
+import { ElMessage, ElMessageBox, ElInput } from 'element-plus'
import {
getDeviceRootPath,
getFileServiceFileOrDir,
@@ -207,6 +207,29 @@ const handleRefresh = () => {
dirList.value = currentDirList.value
reloadCurrentMenu('')
}
+
+
+const reboot: any = ref('')
+const vNode = () => {
+ return h('div', {}, [
+
+
+ h(ElInput, {
+ modelValue: reboot.value,
+ 'onUpdate:modelValue': ($event: any) => {
+ reboot.value = $event;
+ },
+ placeholder: '请输入姓名',
+ type: 'password',
+ autocomplete: "off",
+ class: 'displayPass'
+ }),
+
+ ]);
+};
+
+
+
//装置重启
const deviceRestartLoading = ref(false)
const handleRestartDevice = () => {
@@ -214,8 +237,10 @@ const handleRestartDevice = () => {
ElMessageBox.prompt('二次校验密码确认', '装置重启', {
confirmButtonText: '确认',
cancelButtonText: '取消',
- customClass: 'custom-message-box',
- inputType: 'text'
+ customClass: 'customInput',
+ inputType: 'text',
+
+
})
.then(({ value }) => {
@@ -686,4 +711,12 @@ onBeforeUnmount(() => {
:deep(.el-breadcrumb__separator) {
margin: 0px -10px 0px 0px;
}
+
+
\ No newline at end of file