diff --git a/src/components/BizNav/index.vue b/src/components/BizNav/index.vue index 3bfbd9b..8596058 100644 --- a/src/components/BizNav/index.vue +++ b/src/components/BizNav/index.vue @@ -21,6 +21,9 @@ {{ item.label }} + +
+
@@ -37,8 +40,6 @@ - -
diff --git a/src/router/index.js b/src/router/index.js index 4eb3cf3..385d5af 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -49,12 +49,6 @@ export const constantRoutes = [ title:'系统登录' } }, - // 单点登录页面 - { - path: '/loginBySSO', - component: () => import('@/views/login_sso'), - hidden: true - }, { path: '/tools', component: () => import('@/views/tools'), diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js index 5e31b5f..8028fef 100644 --- a/src/store/modules/settings.js +++ b/src/store/modules/settings.js @@ -1,5 +1,4 @@ import defaultSettings from '@/settings' -import { getZoneDomainConfig } from "@/api/common" const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings diff --git a/src/views/demo/minio_test.html b/src/views/demo/minio_test.html deleted file mode 100644 index 203ffb4..0000000 --- a/src/views/demo/minio_test.html +++ /dev/null @@ -1,187 +0,0 @@ - - - - - - - 上传图片 - - -
- - - -
-
-

传统上传

- - -
将文件拖到此处，或点击上传
-
只能上传jpg/png文件，且不超过500kb
- -
- -
-
-
- - -
-
-

前端formData直传

- - -
将文件拖到此处，或点击上传
-
只能上传jpg/png文件，且不超过500kb
- -
- -
-
-
- - -
-
-

前端Url直传

- - -
将文件拖到此处，或点击上传
-
只能上传jpg/png文件，且不超过500kb
- -
- -
-
-
- - -
- - - - - - - - - - diff --git a/src/views/demo/pzlr.vue.1 b/src/views/demo/pzlr.vue.1 deleted file mode 100644 index dac6bf8..0000000 --- a/src/views/demo/pzlr.vue.1 +++ /dev/null @@ -1,141 +0,0 @@ - - - diff --git a/src/views/emis/emisContinent/emisContinentForm.vue b/src/views/emis/emisContinent/emisContinentForm.vue index 250a1aa..1c5ea4a 100644 --- a/src/views/emis/emisContinent/emisContinentForm.vue +++ b/src/views/emis/emisContinent/emisContinentForm.vue @@ -63,7 +63,7 @@ export default { // 表单校验 rules: { id: [ - { required: true, message: "洲序号不能为空", trigger: "blur" } + // { required: true, message: "洲序号不能为空", trigger: "blur" } ], } }; diff --git a/src/views/emis/emisCountry/index.vue b/src/views/emis/emisCountry/index.vue index 8b30732..1575175 100644 --- a/src/views/emis/emisCountry/index.vue +++ b/src/views/emis/emisCountry/index.vue @@ -30,43 +30,29 @@
-
+ ref="tree" + class="filter-tree tree" + :data="continentIdsTree" + :props="defaultProps" + :expand-on-click-node="false" + :filter-node-method="filterNode" + node-key="id" + highlight-current + default-expand-all + @node-click="handleNodeClick" + > + -
+
@@ -419,13 +405,13 @@ export default { if (this.form.id != null) { updateEmisContinent(this.form).then(response => { this.$modal.msgSuccess("修改成功"); - this.openc = false; + this.openForm = false; this.getContinentList(); }); } else { addEmisContinent(this.form).then(response => { this.$modal.msgSuccess("新增成功"); - this.openc = false; + this.openForm = false; this.getContinentList(); }); } @@ -552,11 +538,11 @@ export default { }); }, handleFormChanged(){ - this.openc = false; + this.openForm = false; this.getContinentList(); }, cancelForm(){ - this.openc = false; + this.openForm = false; }, /** 删除按钮操作 */ handleDelete(row) { diff --git a/src/views/login.vue b/src/views/login.vue index cce263f..88549e7 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -614,7 +614,9 @@ img { border: 0px; } .header-main:hover .header { border-bottom: none; } .header-logo { display: inline-block; position: relative; width: 130px; height: 80px; float: left; } .logo, .slogan-gif { position: absolute; } -.logo { top: 0px; left: 0px; width: 900px; height: 100%; background: url("") left center no-repeat; } +// .logo { top: 0px; left: 0px; width: 900px; height: 100%; background: url("") left center no-repeat; } + +.logo { top: 0px; left: 0px; width: 900px; height: 100%;} .header .auto { overflow: visible; } .banner-engine .header-container { width: 100%; height: 0px; } .banner-box { height: 80px; } diff --git a/src/views/login1.vue b/src/views/login1.vue deleted file mode 100644 index 9dba79e..0000000 --- a/src/views/login1.vue +++ /dev/null @@ -1,262 +0,0 @@ - - - - - diff --git a/src/views/login2.vue b/src/views/login2.vue deleted file mode 100644 index 425a053..0000000 --- a/src/views/login2.vue +++ /dev/null @@ -1,262 +0,0 @@ - - - - - diff --git a/src/views/login3.vue b/src/views/login3.vue deleted file mode 100644 index 8aba806..0000000 --- a/src/views/login3.vue +++ /dev/null @@ -1,267 +0,0 @@ - - - - - diff --git a/src/views/login_slideimage.vue b/src/views/login_slideimage.vue deleted file mode 100644 index 7426027..0000000 --- a/src/views/login_slideimage.vue +++ /dev/null @@ -1,498 +0,0 @@ - - - - - diff --git a/src/views/login_sso.vue b/src/views/login_sso.vue deleted file mode 100644 index b33c02b..0000000 --- a/src/views/login_sso.vue +++ /dev/null @@ -1,69 +0,0 @@ - - - - - diff --git a/src/views/login_v2.vue b/src/views/login_v2.vue deleted file mode 100644 index fb8c1fa..0000000 --- a/src/views/login_v2.vue +++ /dev/null @@ -1,516 +0,0 @@ - - - - -