From 6e9bd396d049d93c006f6c635bfd04d0fad0b30c Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Sat, 28 May 2022 18:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=92=9F=E4=BF=A1?=
 =?UTF-8?q?=E5=8F=B7=E6=BA=90=E8=AE=BE=E7=BD=AE=E6=96=87=E6=9C=AC=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ClockSignalSourceDialog.vue | 44 +++++++++++-----------
 src/i18n/zh-CN/index.ts                    |  1 +
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/components/ClockSignalSourceDialog.vue b/src/components/ClockSignalSourceDialog.vue
index 5ae5ff5..364eec2 100644
--- a/src/components/ClockSignalSourceDialog.vue
+++ b/src/components/ClockSignalSourceDialog.vue
@@ -287,6 +287,28 @@
             <div class="q-mt-xs" v-if="clock_entity.type == 2">
               <q-separator class="q-mb-md" />
               <q-item>
+                <q-item-section>
+                  <q-btn
+                    flat
+                    no-caps
+                    class="fit"
+                    :style="{
+                      'background-color': clock_entity.analog_second_color,
+                      color:
+                        getForegroundColor(clock_entity.analog_second_color) +
+                        ' !important',
+                    }"
+                    :label="$t('hour mark color')"
+                  >
+                    <q-popup-proxy
+                      cover
+                      transition-show="scale"
+                      transition-hide="scale"
+                    >
+                      <q-color
+                        v-model="clock_entity.analog_second_color"
+                      /> </q-popup-proxy></q-btn
+                ></q-item-section>
                 <q-item-section>
                   <q-btn
                     flat
@@ -358,28 +380,6 @@
                         v-model="clock_entity.analog_minute_pointer_color"
                       /> </q-popup-proxy></q-btn
                 ></q-item-section>
-                <q-item-section>
-                  <q-btn
-                    flat
-                    no-caps
-                    class="fit"
-                    :style="{
-                      'background-color': clock_entity.analog_second_color,
-                      color:
-                        getForegroundColor(clock_entity.analog_second_color) +
-                        ' !important',
-                    }"
-                    :label="$t('second mark color')"
-                  >
-                    <q-popup-proxy
-                      cover
-                      transition-show="scale"
-                      transition-hide="scale"
-                    >
-                      <q-color
-                        v-model="clock_entity.analog_second_color"
-                      /> </q-popup-proxy></q-btn
-                ></q-item-section>
                 <q-item-section>
                   <q-btn
                     flat
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index d4cfbae..21da787 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -555,4 +555,5 @@ export default {
   language: "中文",
   english: "英文",
   chinese: "中文",
+  "hour mark color": "时标",
 };