From 011217be1f04727ff60985bec0de1182400d2377 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期日, 17 九月 2023 15:06:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 CanadaMes-ui/src/views/Electrical/alarm.vue |   53 ++++++++++++++++++++++++++++++-----------------------
 1 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/CanadaMes-ui/src/views/Electrical/alarm.vue b/CanadaMes-ui/src/views/Electrical/alarm.vue
index 7b20441..910046b 100644
--- a/CanadaMes-ui/src/views/Electrical/alarm.vue
+++ b/CanadaMes-ui/src/views/Electrical/alarm.vue
@@ -2,22 +2,22 @@
   <div class="app">
     <!--闈㈠寘灞戝鑸尯鍩�-->
     <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">{{ $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>
+
+      <router-link to="/Electrical/alarm" tag="el-button" type="text" active-class="blue-button">{{ $t('Alarm') }}</router-link>
+      <router-link to="/Electrical/State" tag="el-button" type="text" active-class="blue-button">{{ $t('State') }}</router-link>
+      <router-link to="/Electrical/Action" tag="el-button" type="text" active-class="blue-button">{{ $t('Action') }}</router-link>
+      <router-link to="/Electrical/Parameter" tag="el-button" type="text" active-class="blue-button">{{ $t('Parameter') }}</router-link>
+    <router-link to="/Electrical/Sign" tag="el-button" type="text" active-class="blue-button">{{ $t('Sign') }}</router-link>
+
     </el-breadcrumb>
-    <div>Alarm</div>
+    <div>{{ $t('Alarm') }}</div>
     <div class="block">
-      <span class="demonstration">鏃堕棿锛�</span>
-      <el-date-picker v-model="shijian1" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" align="right"
+      <span class="demonstration">{{ $t('shijian') }}锛�</span>
+      <el-date-picker v-model="shijian1" type="datetime" :placeholder="$t('Pick a day')" align="right"
         :picker-options="pickerOptions">
       </el-date-picker>
       ~
-      <el-date-picker v-model="shijian2" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" align="right"
+      <el-date-picker v-model="shijian2" type="datetime" :placeholder="$t('Pick a day')" align="right"
         :picker-options="pickerOptions">
       </el-date-picker>
       &nbsp;&nbsp;
@@ -25,13 +25,13 @@
     </div>
 
     <el-table :data="localizedRoles" style="width: 100%;" height="550">
-      <el-table-column prop="id" label="id" width="80">
+      <el-table-column prop="id" :label="$t('alarmid')" width="80">
       </el-table-column>
-      <el-table-column prop="content" label="content">
+      <el-table-column prop="content" :label="$t('alacontent')">
       </el-table-column>
-      <el-table-column prop="timeon" label="time-on">
+      <el-table-column prop="timeon" :label="$t('time-on')">
       </el-table-column>
-      <el-table-column prop="endTime" label="End Time">
+      <el-table-column prop="endTime" :label="$t('End-Time')">
       </el-table-column>
     </el-table>
   </div>
@@ -67,27 +67,33 @@
         pageSize: 10
       },
       pickerOptions: {
+
+        disabledDate (time) {
+          return time.getTime() > Date.now();
+        },
         shortcuts: [{
-          text: '浠婂ぉ',
+
+          text: this.$t('today'),
           onClick (picker) {
             picker.$emit('pick', new Date());
           }
-        }, {
-          text: '鏄ㄥぉ',
+        },
+        {
+          text: this.$t('yesterday'),
           onClick (picker) {
             const date = new Date();
             date.setTime(date.getTime() - 3600 * 1000 * 24);
             picker.$emit('pick', date);
           }
-        }, {
-          text: '涓�鍛ㄥ墠',
+        },
+        {
+          text: this.$t('week'),
           onClick (picker) {
             const date = new Date();
             date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
             picker.$emit('pick', date);
           }
-        }],
-
+        }]
       },
       shijian1: "",
       shijian2: "",
@@ -125,6 +131,7 @@
 
     },
     selectTime () {
+      
       //moment闇�瑕佸崟鐙畨杞緷璧栵紝npm install moment
       let sj1 = moment(this.shijian1).format('YYYY-MM-DD%20HH:mm');
       let sj2 = moment(this.shijian2).format('YYYY-MM-DD%20HH:mm')
@@ -205,7 +212,7 @@
 </script>
 
 
-<style>
+<style >
 .kuai_div {
   /* width: 30%; */
   margin-bottom: 30px;

--
Gitblit v1.8.0