Merge branch 'dev' into dev_zyh

src/components/AddRules/src/AddRules.vue

@@ -7,6 +7,7 @@ import ETDShipments from './components/ETDShipments.vue'
 import NotiFrequency from './components/NotiFrequency.vue'
 import NotiMethods from './components/NotiMethods.vue'
 import submitsucessful from './images/icon_success_big@2x.png'
+import moment from 'moment-timezone'
 interface CheckboxItem {
   value: string
   label: string
@@ -363,11 +364,13 @@ const UnsavedCollapse = () => {
 
 // 保存subscribe配置
 const missingmessage = ref('')
+let defaultTimeZone = 'UTC' + moment().tz(moment.tz.guess()).format('Z')
 // 保存成功调用接口
 const SaveSuceessful = () => {
   $api
     .Savesubscribe({
-      ...savesubscribeobj
+      ...savesubscribeobj,
+      default_time_zone: defaultTimeZone
     })
     .then((res: any) => {
       if (res.code === 200) {

src/components/CreateAddRules/src/CreateAddRules.vue

@@ -9,6 +9,7 @@ import ShipmentRange from './components/ShipmentRange.vue'
 import NotiMethods from './components/NotiMethods.vue'
 import submitsucessful from './images/icon_success_big@2x.png'
 import { useRouter } from 'vue-router'
+import moment from 'moment-timezone'
 
 const router = useRouter()
 interface CheckboxItem {
@@ -565,13 +566,15 @@ const closeAirETD = (val: any) => {
 
 // 保存subscribe配置
 const missingmessage = ref('')
+let defaultTimeZone = 'UTC' + moment().tz(moment.tz.guess()).format('Z')
 // 保存成功调用接口
 const SaveSuceessful = () => {
   $api
     .MonitoringSave({
       ...savesubscribeobj,
       is_similar_rule: false,
-      id: editTableidtwo.value
+      id: editTableidtwo.value,
+      default_time_zone: defaultTimeZone
     })
     .then((res: any) => {
       if (res.code === 200) {