Skip to content

E
energyai_vue
Commit fd8ba164 authored by coffee's avatar coffee
Browse files
Options

bug

parent f3cac267
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 37 deletions
src/layout/header-aside/layout.vue
View file @ fd8ba164
...@@ -415,7 +415,7 @@ export default { ...@@ -415,7 +415,7 @@ export default {
.semi-circle { .semi-circle {
position: absolute; position: absolute;
top: 40%; top: 40%;
z-index: 9999; z-index: 999;
width: 10px; width: 10px;
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
......
src/pages/eq/hall/components/hallModal.vue
View file @ fd8ba164
...@@ -38,7 +38,7 @@ export default { ...@@ -38,7 +38,7 @@ export default {
methods: { methods: {
init(data) { init(data) {
console.log('data', data) console.log('data', data)
this.dataForm = data this.dataForm = JSON.parse(JSON.stringify(data))
this.hallModalVisible = true this.hallModalVisible = true
}, },
submitHandle() { submitHandle() {
......
src/pages/eq/hall/page.vue
View file @ fd8ba164
...@@ -151,6 +151,7 @@ ...@@ -151,6 +151,7 @@
:opNum="3" :opNum="3"
:showStateColor="true" :showStateColor="true"
:currentMode="currentModel" :currentMode="currentModel"
maxHeight='400px'
> >
<!-- (1运行，2停止，3离线，4故障) --> <!-- (1运行，2停止，3离线，4故障) -->
<template v-slot:operation="scope"> <template v-slot:operation="scope">
......
src/pages/eq/office/page.vue
View file @ fd8ba164
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
:opNum="3" :opNum="3"
:showStateColor="true" :showStateColor="true"
:currentMode="currentModel" :currentMode="currentModel"
maxHeight='520px'
> >
<template <template
v-slot:operation="scope" v-slot:operation="scope"
......
src/pages/eq/view/query-detail.vue
View file @ fd8ba164
...@@ -489,14 +489,14 @@ watch: { ...@@ -489,14 +489,14 @@ watch: {
state = this.temperature state = this.temperature
if (this.temperature) { if (this.temperature) {
if (!/(^[1-9]\d*$)/.test(this.temperature)) { if (!/(^[1-9]\d*$)/.test(this.temperature)) {
this.$message.warning('温度需要是17-30之间的整数1') this.$message.warning('温度需要是17-30之间的整数')
return return
} else if (this.temperature * 1 < 17 || this.temperature * 1 > 30) { } else if (this.temperature * 1 < 17 || this.temperature * 1 > 30) {
this.$message.warning('温度需要是17-30之间的整数2') this.$message.warning('温度需要是17-30之间的整数')
return return
} }
} else { } else {
this.$message.warning('温度需要是17-30之间的整数3') this.$message.warning('温度需要是17-30之间的整数')
return return
} }
} else if (val == 2) { } else if (val == 2) {
......
src/pages/kb/power/components/historyDataModal.vue
View file @ fd8ba164
...@@ -156,6 +156,8 @@ export default { ...@@ -156,6 +156,8 @@ export default {
}, },
cancelhandle() { cancelhandle() {
this.visible = false this.visible = false
this.startTime=''
this.endTime=''
}, },
// 开始时间change事件 // 开始时间change事件
startChangeHandle(val) { startChangeHandle(val) {
......
src/pages/kb/power/page.vue
View file @ fd8ba164
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
:tableData="tableData" :tableData="tableData"
:showOpr="true" :showOpr="true"
:opNum="2" :opNum="2"
maxHeight='500px'
> >
<template #operation="data"> <template #operation="data">
<el-button type="text" @click="openHistoryHandle(data.scope)" <el-button type="text" @click="openHistoryHandle(data.scope)"
......
src/pages/sys/commandlog/query-detail.vue
View file @ fd8ba164
...@@ -25,33 +25,55 @@ ...@@ -25,33 +25,55 @@
</div> </div>
<div class="m_i_dialog_right"> <div class="m_i_dialog_right">
<div class="header_title">运行信息</div> <div class="header_title">运行信息</div>
<el-form :model='dataForm' ref='dataForm' :inline='true' label-width="100px" style='padding-left: 20px;'> <el-form :model='dataForm' ref='dataForm' :inline='true' label-width="auto" style='padding-left: 20px;'>
<el-form-item label='操作员:' prop='createUserName'> <el-row>
<el-input size="medium" v-model='dataForm.createUserName' readonly></el-input> <el-col :span="12">
</el-form-item> <el-form-item label='操作员:' prop='createUserName'>
<el-form-item label='执行完成时间:' prop='createTime'> <el-input size="medium" v-model='dataForm.createUserName' readonly></el-input>
<el-input size="medium" v-model='dataForm.createTime' readonly></el-input> </el-form-item>
</el-form-item> </el-col>
<el-form-item label='执行结果:' prop='result'> <el-col :span="12">
<el-input size="medium" v-model='dataForm.result' readonly></el-input> <el-form-item label='执行完成时间:' prop='createTime'>
</el-form-item> <el-input size="medium" v-model='dataForm.createTime' readonly></el-input>
<el-form-item label='指令类型:' prop='comType'> </el-form-item>
<el-input v-if="dataForm.comType==1" value="自动" size="medium" readonly></el-input> </el-col>
<el-input v-if="dataForm.comType==2" value="人工" size="medium" readonly></el-input> </el-row>
</el-form-item> <el-row>
<el-form-item label='指令来源:' prop='comSource'> <el-col :span="12">
<el-input v-if="dataForm.comSource==1" value="算法" size="medium" readonly></el-input> <el-form-item label='执行结果:' prop='result'>
<el-input v-if="dataForm.comSource==2" value="人工" size="medium" readonly></el-input> <el-input size="medium" v-model='dataForm.result' readonly></el-input>
</el-form-item> </el-form-item>
<el-form-item label='部署位置:' prop='deployLocation'> </el-col>
<el-input size="medium" :title='dataForm.deployLocation' v-model='dataForm.deployLocation' readonly></el-input> <el-col :span="12">
</el-form-item> <el-form-item label='指令类型:' prop='comType'>
<el-form-item label='附属信息:' prop='attachedInfo'> <el-input :value="dataForm.comType==1 ? '自动': '人工'" size="medium" readonly></el-input>
<el-input size="medium" :title='dataForm.attachedInfo' v-model='dataForm.attachedInfo' readonly></el-input> </el-form-item>
</el-form-item> </el-col>
<el-form-item label='指令内容:' prop='comMark'> </el-row>
<el-input type="textarea" resize="none" readonly v-model="dataForm.comMark" autosize></el-input> <el-row>
</el-form-item> <el-col :span="12">
<el-form-item label='指令来源:' prop='comSource'>
<el-input :value="dataForm.comSource==1 ? '算法': '人工'" size="medium" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label='部署位置:' prop='deployLocation'>
<el-input size="medium" :title='dataForm.deployLocation' v-model='dataForm.deployLocation' readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label='附属信息:' prop='attachedInfo'>
<el-input size="medium" :title='dataForm.attachedInfo' v-model='dataForm.attachedInfo' readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label='指令内容:' prop='comMark'>
<el-input type="textarea" resize="none" readonly v-model="dataForm.comMark" autosize></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
</div> </div>
</div> </div>
...@@ -90,6 +112,7 @@ export default { ...@@ -90,6 +112,7 @@ export default {
this.dataForm.result == 1 this.dataForm.result == 1
? (this.dataForm.result = '成功') ? (this.dataForm.result = '成功')
: (this.dataForm.result = '失败') : (this.dataForm.result = '失败')
if(!this.dataForm.createUserName){this.dataForm.createUserName='系统'}
} }
}) })
} }
...@@ -101,7 +124,7 @@ export default { ...@@ -101,7 +124,7 @@ export default {
min-width: 1100px; min-width: 1100px;
} }
.m_i_dialog_lift { .m_i_dialog_lift {
width: 364px; width: 30%;
height: 300px; height: 300px;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
border: 1px solid rgba(23, 41, 71, 0.08); border: 1px solid rgba(23, 41, 71, 0.08);
...@@ -110,7 +133,6 @@ export default { ...@@ -110,7 +133,6 @@ export default {
box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.2); box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.2);
.header_title { .header_title {
height: 40px; height: 40px;
width: 344px;
background: #eef8ff; background: #eef8ff;
line-height: 40px; line-height: 40px;
padding-left: 20px; padding-left: 20px;
...@@ -123,7 +145,7 @@ export default { ...@@ -123,7 +145,7 @@ export default {
} }
} }
.m_i_dialog_right { .m_i_dialog_right {
width: 670px; width: 67%;
height: 300px; height: 300px;
float: left; float: left;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
...@@ -132,7 +154,6 @@ export default { ...@@ -132,7 +154,6 @@ export default {
box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.2); box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.2);
.header_title { .header_title {
height: 40px; height: 40px;
width: 650px;
background: #eef8ff; background: #eef8ff;
line-height: 40px; line-height: 40px;
padding-left: 20px; padding-left: 20px;
......
src/pages/sys/logs/index.vue
View file @ fd8ba164
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
startTime: '', startTime: '',
endTime: '' endTime: ''
}, },
operationList: ['登录', '注销', '新增', '修改', '删除', '查看', '上传'], operationList: ['注销', '新增', '修改', '删除'],
dataList: [], dataList: [],
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment