From 8ca1ad8184361dba68cd53a5d84235e18e85f742 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Fri, 16 Sep 2022 15:26:50 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2198=20feat=EF=BC=9Amodel=20=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=AF=BC=E5=85=A5=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/popBox/topToolMoreOptions.vue      | 16 +++++-----
 .../src/components/page/config/ldap.vue       |  4 ---
 .../src/components/page/config/model.vue      |  9 +++---
 .../src/components/page/config/profile.vue    |  4 +--
 .../src/components/page/config/system.vue     | 30 ++++++++++---------
 .../src/components/page/config/terminal.vue   |  4 ---
 .../components/page/config/terminalLog.vue    |  2 +-
 .../src/components/page/config/user.vue       |  5 ++--
 8 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
index f2245ec96..039135ccc 100644
--- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
+++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
@@ -240,26 +240,26 @@ export default {
     language () { return this.$store.getters.getLanguage },
     // 显示新版导入
     importType () {
-      // asset module endpoint dc cabinet
-      const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import']
+      // asset module endpoint dc cabinet model
+      const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import', '/asset/model/import']
       return arr.some(item => item === this.importUrl)
     },
     // 已存在的内容处理方式
     showEexisted () {
-      // asset module endpoint dc cabinet
-      const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import']
+      // asset module endpoint dc cabinet model
+      const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import', '/asset/model/import']
       return arr.some(item => item === this.importUrl)
     },
     // 遇到错误是否继续导入
     showIgnoreError () {
-      // asset module endpoint dc cabinet
-      const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import']
+      // asset module endpoint dc cabinet model
+      const arr = ['/asset/asset/import', '/monitor/module/import', '/monitor/endpoint/import', '/dc/import', '/dc/cabinet/import', '/asset/model/import']
       return arr.some(item => item === this.importUrl)
     },
     // 是否同步更新关联的dashboard
     showSyncDashboard () {
-      // asset endpoint
-      const arr = ['/asset/asset/import', '/monitor/endpoint/import']
+      // asset endpoint model
+      const arr = ['/asset/asset/import', '/monitor/endpoint/import', '/asset/model/import']
       return arr.some(item => item === this.importUrl)
     },
     // 是否同步更新关联的endpoint
diff --git a/nezha-fronted/src/components/page/config/ldap.vue b/nezha-fronted/src/components/page/config/ldap.vue
index 7dacce8dc..08d51717d 100644
--- a/nezha-fronted/src/components/page/config/ldap.vue
+++ b/nezha-fronted/src/components/page/config/ldap.vue
@@ -78,7 +78,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-
-</style>
diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue
index 2dbce9d7f..2de76ce92 100644
--- a/nezha-fronted/src/components/page/config/model.vue
+++ b/nezha-fronted/src/components/page/config/model.vue
@@ -10,8 +10,7 @@
       @search="search"
     >
       <template v-slot:top-tool-right>
-        <button id="account-add" v-has="'model_add'" :title="$t('overall.createModel')" class="top-tool-btn margin-r-10"
-                type="button" @click="add">
+        <button id="account-add" v-has="'model_add'" :title="$t('overall.createModel')" class="top-tool-btn margin-r-10" type="button" @click="add">
           <i class="nz-icon-create-square nz-icon"></i>
         </button>
        <top-tool-more-options
@@ -20,9 +19,9 @@
           id="model"
           :params="searchLabel"
           :permissions="{
-                  import: 'model_add',
-                  export: 'model_edit'
-                }"
+            import: 'model_add',
+            export: 'model_edit'
+          }"
           class="top-tool-export margin-r-10"
           export-file-name="asset-model"
           export-url="/asset/model/export"
diff --git a/nezha-fronted/src/components/page/config/profile.vue b/nezha-fronted/src/components/page/config/profile.vue
index 978e026b6..7042f0da9 100644
--- a/nezha-fronted/src/components/page/config/profile.vue
+++ b/nezha-fronted/src/components/page/config/profile.vue
@@ -106,9 +106,7 @@
         </button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="fileShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
-               :show-close="true" width="620px" class="nz-dialog" @closed="fileClosed">
-
+    <el-dialog :visible.sync="fileShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false' :show-close="true" width="620px" class="nz-dialog" @closed="fileClosed">
       <div>
         <div class="login-dialog-title">
           Should you ever lose your phone or access to your one time password secret, each of these recovery codes can be used one time each to regain access to your account.
diff --git a/nezha-fronted/src/components/page/config/system.vue b/nezha-fronted/src/components/page/config/system.vue
index 5ac27b0d9..a2a34e49f 100644
--- a/nezha-fronted/src/components/page/config/system.vue
+++ b/nezha-fronted/src/components/page/config/system.vue
@@ -6,11 +6,12 @@
           <el-form :model="basic"  label-width="180px" size="small" ref="basicForm" :rules="basicRules" :validate-on-rule-change="false">
             <div class="system-title">{{$t('overall.basicInfo')}}</div>
             <el-form-item :label="$t('config.system.basic.language')" prop="language">
-              <el-select id="account-input-language"
-                         class="right-box__select"
-                         v-model="basic.language"
-                         popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside"
-                         size="small">
+              <el-select
+                id="account-input-language"
+                class="right-box__select"
+                v-model="basic.language"
+                popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside"
+                size="small">
                 <template v-for="item in languageList">f
                   <el-option :key="item.value" :label="item.label" :value="item.value"></el-option>
                 </template>
@@ -28,21 +29,22 @@
             </el-form-item>
             <el-form-item :label="$t('config.system.basic.defTheme')" prop="defTheme">
               <el-select id="account-input-language"
-                         class="right-box__select"
-                         v-model="basic.theme"
-                         popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside"
-                         size="small">
+                class="right-box__select"
+                v-model="basic.theme"
+                popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside"
+                size="small">
                 <template v-for="item in themeList">
                   <el-option :key="item.value" :label="item.label" :value="item.value"></el-option>
                 </template>
               </el-select>
             </el-form-item>
             <el-form-item :label="$t('config.system.basic.dataFormat')" prop="dataFormat">
-              <el-select id="account-input-language"
-                         class="right-box__select"
-                         v-model="basic.date_format"
-                         popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside"
-                         size="small">
+              <el-select
+                id="account-input-language"
+                class="right-box__select"
+                v-model="basic.date_format"
+                popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside"
+                size="small">
                 <template v-for="item in dateFormatList">
                   <el-option :key="item.value" :label="item.label" :value="item.value">
                     <div style="display: flex;justify-content: space-between;">
diff --git a/nezha-fronted/src/components/page/config/terminal.vue b/nezha-fronted/src/components/page/config/terminal.vue
index 92aabcec7..514bdebd9 100644
--- a/nezha-fronted/src/components/page/config/terminal.vue
+++ b/nezha-fronted/src/components/page/config/terminal.vue
@@ -56,7 +56,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-
-</style>
diff --git a/nezha-fronted/src/components/page/config/terminalLog.vue b/nezha-fronted/src/components/page/config/terminalLog.vue
index ab2a693aa..d0ba36881 100644
--- a/nezha-fronted/src/components/page/config/terminalLog.vue
+++ b/nezha-fronted/src/components/page/config/terminalLog.vue
@@ -46,7 +46,7 @@
         >
           <template>
             <el-input-number ref="jumpInput" v-model="pageObj.pageNo" :controls="false" :min="1" :max="pageObj.pages" class="jump-input" @change="getTableData" @keyup.enter.native="getTableData" size="mini"/>
-            <span class="jump-pages">/&nbsp{{pageObj.pages}}</span>
+            <span class="jump-pages">/&nbsp;{{pageObj.pages}}</span>
           </template>
         </el-pagination>
       </template>
diff --git a/nezha-fronted/src/components/page/config/user.vue b/nezha-fronted/src/components/page/config/user.vue
index 3f08552a9..9ee695ee8 100644
--- a/nezha-fronted/src/components/page/config/user.vue
+++ b/nezha-fronted/src/components/page/config/user.vue
@@ -45,7 +45,7 @@
         >
           <template>
             <el-input-number ref="jumpInput" v-model="pageObj.pageNo" :controls="false" :min="1" :max="pageObj.pages" class="jump-input" @change="getTableData" @keyup.enter.native="getTableData" size="mini"/>
-            <span class="jump-pages">/&nbsp{{pageObj.pages}}</span>
+            <span class="jump-pages">/&nbsp;{{pageObj.pages}}</span>
           </template>
         </el-pagination>
       </template>
@@ -64,8 +64,7 @@
       @getTableData="getTableData"
     >
       <template v-slot:top-tool-right>
-        <button id="account-add" v-has="'user_add'" :title="$t('overall.createUser')" class="top-tool-btn margin-r-10"
-                type="button" @click="add">
+        <button id="account-add" v-has="'user_add'" :title="$t('overall.createUser')" class="top-tool-btn margin-r-10" type="button" @click="add">
           <i class="nz-icon-create-square nz-icon"></i>
         </button>
         <delete-button