From 8cdbd9d272c1a97b0c12009ea48d1b6addd7f824 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Mon, 26 Sep 2022 10:32:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8DShare=20toolt?=
 =?UTF-8?q?ip=E5=85=A8=E5=B1=8F=E7=8A=B6=E6=80=81=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/chart/chart/chartTimeSeries.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
index 3c7ac23ce..dea7f04d2 100644
--- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
+++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue
@@ -154,7 +154,7 @@ export default {
         this.isInit && setChart(this.chartId, myChart) // 缓存；不使用vue的data是为避免整个chart被监听导致卡顿
 
         this.$store.commit('setCurrentMousemove', 0)
-        if (this.isInit) {
+        if (this.isInit && !this.isFullscreen) {
           // timeSeries类型图表设置group 用于多表联动
           myChart.group = 'timeSeriesGroup'
           myChart.getZr().on('mousemove', params => {

From 00b0377521943a9c5b9809e5ce40a20e76681b91 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Mon, 26 Sep 2022 15:39:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20recordRuleBox=20state=20=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/recordRuleBox.vue          | 4 ++--
 nezha-fronted/src/components/page/config/recordRule.vue       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue b/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue
index bc9748b02..7f176bbb5 100644
--- a/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue
@@ -74,8 +74,8 @@
           <!--state-->
           <el-form-item :label="$t('overall.state')" prop="state" >
             <el-select v-model="editRecordRule.state" class="right-box__select"  placeholder="" popper-class="right-box-select-top prevent-clickoutside" size="small">
-              <el-option :label="$t('overall.disabled')" value="0">{{$t('overall.disabled')}}</el-option>
               <el-option :label="$t('overall.enabled')" value="1">{{$t('overall.enabled')}}</el-option>
+              <el-option :label="$t('overall.disabled')" value="0">{{$t('overall.disabled')}}</el-option>
             </el-select>
           </el-form-item>
           <!-- labels -->
@@ -154,7 +154,7 @@ export default {
         inr: '',
         labels: [{ label: '', value: '' }],
         remark: '',
-        state: ''
+        state: '1'
       },
       rules: {
         name: [
diff --git a/nezha-fronted/src/components/page/config/recordRule.vue b/nezha-fronted/src/components/page/config/recordRule.vue
index 5214a6325..b84d485a4 100644
--- a/nezha-fronted/src/components/page/config/recordRule.vue
+++ b/nezha-fronted/src/components/page/config/recordRule.vue
@@ -141,7 +141,7 @@ export default {
         inr: '',
         labels: [{ label: '', value: '' }],
         remark: '',
-        state: ''
+        state: '1'
       }
     }
   },