From 1abae1d821d2c4da18a16145e3d9d8f7a747da02 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 08 九月 2023 17:11:37 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes
---
CanadaMes-ui/src/views/Electrical/alarm.vue | 96 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 17 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/alarm.vue b/CanadaMes-ui/src/views/Electrical/alarm.vue
index 93108d0..c96986c 100644
--- a/CanadaMes-ui/src/views/Electrical/alarm.vue
+++ b/CanadaMes-ui/src/views/Electrical/alarm.vue
@@ -3,22 +3,27 @@
<!--闈㈠寘灞戝鑸尯鍩�-->
<el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
<router-link to="/home" tag="el-button" type="text">{{ $t('langHome') }}</router-link>
- <el-button type="text">Electrical</el-button>
- <router-link to="/Electrical/Parameter" tag="el-button" type="text">Parameter</router-link>
- <router-link to="/Electrical/Action" tag="el-button" type="text">Action</router-link>
- <router-link to="/Electrical/Sign" tag="el-button" type="text">Sign</router-link>
- <router-link to="/Electrical/State" tag="el-button" type="text">State</router-link>
- <router-link to="/Electrical/alarm" tag="el-button" type="text">Alarm</router-link>
+ <el-button type="text">{{ $t('Electrical') }}</el-button>
+ <router-link to="/Electrical/Parameter" tag="el-button" type="text">{{ $t('Parameter') }}</router-link>
+ <router-link to="/Electrical/Action" tag="el-button" type="text">{{ $t('Action') }}</router-link>
+ <router-link to="/Electrical/Sign" tag="el-button" type="text">{{ $t('Sign') }}</router-link>
+ <router-link to="/Electrical/State" tag="el-button" type="text">{{ $t('State') }}</router-link>
+ <router-link to="/Electrical/alarm" tag="el-button" type="text">{{ $t('Alarm') }}</router-link>
</el-breadcrumb>
<div>Alarm</div>
- <!-- <el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="{ messagepack }">
- <div class="kuai_div" v-for="item in this.record.xyData" :key="item[1]">
- <el-input v-model="item[1]" style="width: 240px;" class="in_mc"></el-input>
- <el-switch v-model="item[0]" active-value="0" inactive-value="1"></el-switch>
- </div>
- </el-form> -->
+ <div class="block">
+ <span class="demonstration">鏃堕棿锛�</span>
+ <el-date-picker v-model="shijian1" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" align="right"
+ :picker-options="pickerOptions">
+ </el-date-picker>
+ ~
+ <el-date-picker v-model="shijian2" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" align="right"
+ :picker-options="pickerOptions">
+ </el-date-picker>
+ <el-button type="primary" @click="selectTime()">鏌ヨ</el-button>
+ </div>
- <el-table :data="localizedRoles" style="width: 100%;" height="590">
+ <el-table :data="localizedRoles" style="width: 100%;" height="550">
<el-table-column prop="id" label="id" width="80">
</el-table-column>
<el-table-column prop="content" label="content">
@@ -32,7 +37,10 @@
</template>
<script >
-import { setAll } from "../../api/alarm";
+import { setAll, setTime } from "../../api/alarm";
+
+import moment from 'moment';
+//setTime
import LanguageMixin from '../../lang/LanguageMixin'
let socket;
export default {
@@ -57,12 +65,45 @@
data: "1",
pageSize: 10
},
+ pickerOptions: {
+ shortcuts: [{
+ text: '浠婂ぉ',
+ onClick (picker) {
+ picker.$emit('pick', new Date());
+ }
+ }, {
+ text: '鏄ㄥぉ',
+ onClick (picker) {
+ const date = new Date();
+ date.setTime(date.getTime() - 3600 * 1000 * 24);
+ picker.$emit('pick', date);
+ }
+ }, {
+ text: '涓�鍛ㄥ墠',
+ onClick (picker) {
+ const date = new Date();
+ date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit('pick', date);
+ }
+ }],
+ },
+ shijian1: "",
+ shijian2: "",
}
+
+
},
created () {
this.init();
- this.load();
+
+
+ if (this.shijian1 == "" || this.shijian2 == "") {
+ this.load();
+ }
+ else {
+ this.selectTime();
+ }
},
methods: {
@@ -76,9 +117,25 @@
} else {
this.localizedRoles = [...this.roles];
}
- console.log(this.localizedRoles);
+ //console.log(this.localizedRoles);
+ });
+
+ },
+ selectTime () {
+ let sj1 = moment(this.shijian1).format('YYYY-MM-DD%20HH:mm');
+ let sj2 = moment(this.shijian2).format('YYYY-MM-DD%20HH:mm')
+
+ setTime(sj1, sj2).then(res => {
+ this.roles = res.data.list;
+ const language = this.$i18n.locale;
+ if (language === 'zh-CN') {
+ this.replaceChineseWithEnglish();
+ } else {
+ this.localizedRoles = [...this.roles];
+ }
});
},
+
replaceChineseWithEnglish () {
const translation = this.$t('translation');
this.localizedRoles = this.roles.map(role => ({
@@ -114,7 +171,12 @@
this.record.params[0] = obj.arm;
//姣忔璇锋眰鏇存柊鏁版嵁
- this.load();
+ if (this.shijian1 == "" || this.shijian2 == "") {
+ this.load();
+ }
+ else {
+ this.selectTime();
+ }
this.$forceUpdate();
}.bind(this);
//鍏抽棴浜嬩欢
--
Gitblit v1.8.0