From 4eaa4825f30f086de4b889951e50a2eda48ff19d Mon Sep 17 00:00:00 2001 From: Mungunbagana Batzorig Date: Tue, 9 May 2023 18:08:32 +0800 Subject: [PATCH 1/5] kb changes --- src/app.vue | 105 +++++++++--------- src/modules/dataform/elements/DateTime.vue | 10 +- src/modules/dataform/utils/date.js | 4 +- src/modules/datagrid/Datagrid.vue | 1 - src/modules/krud/templates/edit.vue | 2 +- src/modules/page/views/index.vue | 2 +- .../role/views/ProductItem/ProductItem.vue | 2 +- src/pages/role/views/index.vue | 18 +-- .../components/user-control/UserControl.vue | 37 +++--- 9 files changed, 91 insertions(+), 90 deletions(-) diff --git a/src/app.vue b/src/app.vue index 7af485e..a27704a 100644 --- a/src/app.vue +++ b/src/app.vue @@ -60,61 +60,62 @@ -
  • -
  • - {{ lang.data_processor }} -
    • + + + + -
  • - - - {{ lang.data_settings }} - -
    • -
  • - - - {{ lang._chart }} - -
    • -
  • - - - {{ lang.original_preparation }} - -
    • -
  • - - - {{ lang._report }} - -
    • -
  • - - - {{ lang.analysis }} - -
    • + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -
  • - - - {{ lang.target_statement }} - -
    • -
  • - -   - {{ lang.graphql_management }} - -
    • + + + + + + + + + + + + + + + + + + + -
  • - - - Вэб хуудас - -
  • {{ lang.usersAndUserGroups }} diff --git a/src/modules/dataform/elements/DateTime.vue b/src/modules/dataform/elements/DateTime.vue index 95a6140..abc72f4 100644 --- a/src/modules/dataform/elements/DateTime.vue +++ b/src/modules/dataform/elements/DateTime.vue @@ -1,8 +1,10 @@ diff --git a/src/modules/dataform/utils/date.js b/src/modules/dataform/utils/date.js index f6b5c73..a309271 100644 --- a/src/modules/dataform/utils/date.js +++ b/src/modules/dataform/utils/date.js @@ -23,11 +23,11 @@ export function toTime(time) { } export function toDateTime(datetime) { - return Moment(datetime, 'YYYY-MM-DD HH:mm:ss') + return Moment(datetime, 'YYYY-MM-DD HH:mm:ss').tz('Asia/Ulaanbaatar') } export function now() { - return Moment().format("YYYY-MM-DD HH:mm:ss") + return Moment().tz('Asia/Ulaanbaatar').format("YYYY-MM-DD HH:mm:ss") } export function getDateTime(date) { diff --git a/src/modules/datagrid/Datagrid.vue b/src/modules/datagrid/Datagrid.vue index c11aa39..f34f440 100644 --- a/src/modules/datagrid/Datagrid.vue +++ b/src/modules/datagrid/Datagrid.vue @@ -620,7 +620,6 @@ export default { actionsVisibility: this.$props.actionvisibility, } }; - if (this.permissions) { if (this.permissions.r || this.permissions.u || this.permissions.d) { if (this.actionPosition == 0) { diff --git a/src/modules/krud/templates/edit.vue b/src/modules/krud/templates/edit.vue index 26d62d8..f4ced0a 100644 --- a/src/modules/krud/templates/edit.vue +++ b/src/modules/krud/templates/edit.vue @@ -14,7 +14,7 @@ -
    +
    diff --git a/src/modules/page/views/index.vue b/src/modules/page/views/index.vue index 0175e4f..f8fa94c 100644 --- a/src/modules/page/views/index.vue +++ b/src/modules/page/views/index.vue @@ -4,7 +4,7 @@
      -
    • - - - {{lang.personalInfo}} - -
      • -
    • - - - {{lang.changePass}} - -
      • -
    • - - - {{lang.superAdminManagement}} - -
      • + + + + + + + + + + + + + + + + + + +
    • From 5d43ffc1165f292c4c515b5bb89d3e40f922e602 Mon Sep 17 00:00:00 2001 From: Mungunbagana Batzorig Date: Tue, 23 May 2023 21:02:30 +0800 Subject: [PATCH 2/5] lgoo --- src/app.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app.vue b/src/app.vue index 6a40321..ac263ec 100644 --- a/src/app.vue +++ b/src/app.vue @@ -4,9 +4,9 @@
      @@ -48,23 +48,23 @@ - + - + - + - +
      @@ -83,10 +83,20 @@ v-if="col.type == 'section'">
      + + class='pz-col-input'/> + Нуух + + +
      @@ -94,7 +104,7 @@ - +
      + class='pz-col-input'/> + class='pz-col-input'/>
      - +
      @@ -213,20 +223,22 @@
      - +
      + class='pz-col-input'/> + class='pz-col-input' :placeholder='lang.Get_name' + autocomplete="off"/>
      - + - +
      @@ -306,11 +318,11 @@