From fccd93a5a4fe73a2081f2d8188efcb65d1d91c5b Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 15 Sep 2021 09:23:11 +0800
Subject: [PATCH] +
---
src/views/licenseApproval/cancellationOfFiling.vue | 4
src/views/securityGuard/securityGuard.vue | 3
src/views/licenseApproval/securityTraining.vue | 4
src/views/licenseApproval/securityGuard.vue | 4
src/page/index/top/index.vue | 256 +++++++++++++++++++-----------------
src/views/licenseApproval/securityPermit.vue | 4
src/views/securityUnit/data.js | 33 +++
src/views/licenseApproval/crossRegion.vue | 4
src/styles/element-ui.scss | 4
src/views/authority/role.vue | 46 +++---
src/views/licenseApproval/branchOffice.vue | 4
11 files changed, 204 insertions(+), 162 deletions(-)
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 7e480e1..0e4193f 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -1,95 +1,114 @@
<template>
<div class="avue-top">
<div class="top-bar__left">
- <div class="avue-breadcrumb"
- :class="[{ 'avue-breadcrumb--active': isCollapse }]"
- v-if="showCollapse">
- <i class="icon-navicon"
- @click="setCollapse"></i>
+ <div
+ class="avue-breadcrumb"
+ :class="[{ 'avue-breadcrumb--active': isCollapse }]"
+ v-if="showCollapse"
+ >
+ <i class="icon-navicon" @click="setCollapse"></i>
</div>
</div>
<div class="top-bar__title">
- <div class="top-bar__item top-bar__item--show"
- v-if="showMenu">
+ <div class="top-bar__item top-bar__item--show" v-if="showMenu">
<top-menu ref="topMenu"></top-menu>
</div>
- <span class="top-bar__item"
- v-if="showSearch">
+ <span class="top-bar__item" v-if="showSearch">
<top-search></top-search>
</span>
</div>
<div class="top-bar__right">
- <el-tooltip v-if="showColor"
- effect="dark"
- :content="$t('navbar.color')"
- placement="bottom">
+ <el-tooltip
+ v-if="showColor"
+ effect="dark"
+ :content="$t('navbar.color')"
+ placement="bottom"
+ >
<div class="top-bar__item">
<top-color></top-color>
</div>
</el-tooltip>
- <el-tooltip v-if="showDebug"
- effect="dark"
- :content="logsFlag?$t('navbar.bug'):logsLen+$t('navbar.bugs')"
- placement="bottom">
+ <el-tooltip
+ v-if="showDebug"
+ effect="dark"
+ :content="logsFlag ? $t('navbar.bug') : logsLen + $t('navbar.bugs')"
+ placement="bottom"
+ >
<div class="top-bar__item">
<top-logs></top-logs>
</div>
</el-tooltip>
- <el-tooltip v-if="showLock"
- effect="dark"
- :content="$t('navbar.lock')"
- placement="bottom">
+ <el-tooltip
+ v-if="showLock"
+ effect="dark"
+ :content="$t('navbar.lock')"
+ placement="bottom"
+ >
<div class="top-bar__item">
<top-lock></top-lock>
</div>
</el-tooltip>
- <el-tooltip v-if="showTheme"
- effect="dark"
- :content="$t('navbar.theme')"
- placement="bottom">
+ <el-tooltip
+ v-if="showTheme"
+ effect="dark"
+ :content="$t('navbar.theme')"
+ placement="bottom"
+ >
<div class="top-bar__item top-bar__item--show">
<top-theme></top-theme>
</div>
</el-tooltip>
- <el-tooltip effect="dark"
- :content="$t('navbar.notice')"
- placement="bottom">
+ <!-- <el-tooltip
+
+ effect="dark"
+ :content="$t('navbar.notice')"
+ placement="bottom"
+ >
<div class="top-bar__item top-bar__item--show">
<top-notice></top-notice>
</div>
- </el-tooltip>
- <el-tooltip effect="dark"
- :content="$t('navbar.language')"
- placement="bottom">
+ </el-tooltip> -->
+ <el-tooltip
+ effect="dark"
+ :content="$t('navbar.language')"
+ placement="bottom"
+ >
<div class="top-bar__item top-bar__item--show">
<top-lang></top-lang>
</div>
</el-tooltip>
- <el-tooltip v-if="showFullScren"
- effect="dark"
- :content="isFullScren?$t('navbar.screenfullF'):$t('navbar.screenfull')"
- placement="bottom">
+ <el-tooltip
+ v-if="showFullScren"
+ effect="dark"
+ :content="
+ isFullScren ? $t('navbar.screenfullF') : $t('navbar.screenfull')
+ "
+ placement="bottom"
+ >
<div class="top-bar__item">
- <i :class="isFullScren?'icon-tuichuquanping':'icon-quanping'"
- @click="handleScreen"></i>
+ <i
+ :class="isFullScren ? 'icon-tuichuquanping' : 'icon-quanping'"
+ @click="handleScreen"
+ ></i>
</div>
</el-tooltip>
- <img class="top-bar__img"
- :src="userInfo.avatar">
+ <img class="top-bar__img" :src="userInfo.avatar" />
<el-dropdown>
<span class="el-dropdown-link">
- {{userInfo.userName}}
+ {{ userInfo.userName }}
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item>
- <router-link to="/">{{$t('navbar.dashboard')}}</router-link>
+ <router-link to="/">{{ $t("navbar.dashboard") }}</router-link>
</el-dropdown-item>
<el-dropdown-item>
- <router-link to="/info/index">{{$t('navbar.userinfo')}}</router-link>
+ <router-link to="/info/index">{{
+ $t("navbar.userinfo")
+ }}</router-link>
</el-dropdown-item>
- <el-dropdown-item @click.native="logout"
- divided>{{$t('navbar.logOut')}}
+ <el-dropdown-item @click.native="logout" divided
+ >{{ $t("navbar.logOut") }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -97,85 +116,84 @@
</div>
</template>
<script>
- import {resetRouter} from '@/router/router'
- import {mapGetters, mapState} from "vuex";
- import {fullscreenToggel, listenfullscreen} from "@/util/util";
- import topLock from "./top-lock";
- import topMenu from "./top-menu";
- import topSearch from "./top-search";
- import topTheme from "./top-theme";
- import topLogs from "./top-logs";
- import topColor from "./top-color";
- import topNotice from './top-notice'
- import topLang from "./top-lang";
+import { resetRouter } from "@/router/router";
+import { mapGetters, mapState } from "vuex";
+import { fullscreenToggel, listenfullscreen } from "@/util/util";
+import topLock from "./top-lock";
+import topMenu from "./top-menu";
+import topSearch from "./top-search";
+import topTheme from "./top-theme";
+import topLogs from "./top-logs";
+import topColor from "./top-color";
+import topNotice from "./top-notice";
+import topLang from "./top-lang";
- export default {
- components: {
- topLock,
- topMenu,
- topSearch,
- topTheme,
- topLogs,
- topColor,
- topNotice,
- topLang
+export default {
+ components: {
+ topLock,
+ topMenu,
+ topSearch,
+ topTheme,
+ topLogs,
+ topColor,
+ topNotice,
+ topLang,
+ },
+ name: "top",
+ data() {
+ return {};
+ },
+ filters: {},
+ created() {},
+ mounted() {
+ listenfullscreen(this.setScreen);
+ },
+ computed: {
+ ...mapState({
+ showDebug: (state) => state.common.showDebug,
+ showTheme: (state) => state.common.showTheme,
+ showLock: (state) => state.common.showLock,
+ showFullScren: (state) => state.common.showFullScren,
+ showCollapse: (state) => state.common.showCollapse,
+ showSearch: (state) => state.common.showSearch,
+ showMenu: (state) => state.common.showMenu,
+ showColor: (state) => state.common.showColor,
+ }),
+ ...mapGetters([
+ "userInfo",
+ "isFullScren",
+ "tagWel",
+ "tagList",
+ "isCollapse",
+ "tag",
+ "logsLen",
+ "logsFlag",
+ ]),
+ },
+ methods: {
+ handleScreen() {
+ fullscreenToggel();
},
- name: "top",
- data() {
- return {};
+ setCollapse() {
+ this.$store.commit("SET_COLLAPSE");
},
- filters: {},
- created() {
+ setScreen() {
+ this.$store.commit("SET_FULLSCREN");
},
- mounted() {
- listenfullscreen(this.setScreen);
- },
- computed: {
- ...mapState({
- showDebug: state => state.common.showDebug,
- showTheme: state => state.common.showTheme,
- showLock: state => state.common.showLock,
- showFullScren: state => state.common.showFullScren,
- showCollapse: state => state.common.showCollapse,
- showSearch: state => state.common.showSearch,
- showMenu: state => state.common.showMenu,
- showColor: state => state.common.showColor
- }),
- ...mapGetters([
- "userInfo",
- "isFullScren",
- "tagWel",
- "tagList",
- "isCollapse",
- "tag",
- "logsLen",
- "logsFlag"
- ])
- },
- methods: {
- handleScreen() {
- fullscreenToggel();
- },
- setCollapse() {
- this.$store.commit("SET_COLLAPSE");
- },
- setScreen() {
- this.$store.commit("SET_FULLSCREN");
- },
- logout() {
- this.$confirm(this.$t("logoutTip"), this.$t("tip"), {
- confirmButtonText: this.$t("submitText"),
- cancelButtonText: this.$t("cancelText"),
- type: "warning"
- }).then(() => {
- this.$store.dispatch("LogOut").then(() => {
- resetRouter();
- this.$router.push({path: "/login"});
- });
+ logout() {
+ this.$confirm(this.$t("logoutTip"), this.$t("tip"), {
+ confirmButtonText: this.$t("submitText"),
+ cancelButtonText: this.$t("cancelText"),
+ type: "warning",
+ }).then(() => {
+ this.$store.dispatch("LogOut").then(() => {
+ resetRouter();
+ this.$router.push({ path: "/login" });
});
- }
- }
- };
+ });
+ },
+ },
+};
</script>
<style lang="scss" scoped>
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 95235b1..4ff4809 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -299,3 +299,7 @@
// 统计图持证表格按钮过长
width: 320px !important;
}
+
+// .securityGuard .avue-upload__avatar {
+// height: 221px !important;
+// }
diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue
index a414b39..4a2ecd0 100644
--- a/src/views/authority/role.vue
+++ b/src/views/authority/role.vue
@@ -153,29 +153,29 @@
},
],
},
- {
- label: "所属单位",
- prop: "tenantId",
- type: "tree",
- dicUrl: "/api/blade-system/tenant/select",
- addDisplay: false,
- editDisplay: false,
- viewDisplay: website.tenantMode,
- span: 24,
- props: {
- label: "tenantName",
- value: "tenantId",
- },
- hide: !website.tenantMode,
- search: website.tenantMode,
- rules: [
- {
- required: true,
- message: "请输入所属保安单位",
- trigger: "click",
- },
- ],
- },
+ // {
+ // label: "所属单位",
+ // prop: "tenantId",
+ // type: "tree",
+ // dicUrl: "/api/blade-system/tenant/select",
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: website.tenantMode,
+ // span: 24,
+ // props: {
+ // label: "tenantName",
+ // value: "tenantId",
+ // },
+ // hide: !website.tenantMode,
+ // search: website.tenantMode,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入所属保安单位",
+ // trigger: "click",
+ // },
+ // ],
+ // },
{
label: "角色别名",
prop: "roleAlias",
diff --git a/src/views/licenseApproval/branchOffice.vue b/src/views/licenseApproval/branchOffice.vue
index b367a9a..4e06ea6 100644
--- a/src/views/licenseApproval/branchOffice.vue
+++ b/src/views/licenseApproval/branchOffice.vue
@@ -414,13 +414,13 @@
],
},
// {
- // label: "所属地区",
+ // label: "所属辖区",
// hide: true,
// prop: "region",
// rules: [
// {
// required: true,
- // message: "请输入所属地区",
+ // message: "请输入所属辖区",
// trigger: "blur",
// },
// ],
diff --git a/src/views/licenseApproval/cancellationOfFiling.vue b/src/views/licenseApproval/cancellationOfFiling.vue
index 4360390..97f1402 100644
--- a/src/views/licenseApproval/cancellationOfFiling.vue
+++ b/src/views/licenseApproval/cancellationOfFiling.vue
@@ -315,13 +315,13 @@
],
},
// {
- // label: "所属地区",
+ // label: "所属辖区",
// hide: true,
// prop: "region",
// rules: [
// {
// required: true,
- // message: "请输入所属地区",
+ // message: "请输入所属辖区",
// trigger: "blur",
// },
// ],
diff --git a/src/views/licenseApproval/crossRegion.vue b/src/views/licenseApproval/crossRegion.vue
index e40e2d5..25953fc 100644
--- a/src/views/licenseApproval/crossRegion.vue
+++ b/src/views/licenseApproval/crossRegion.vue
@@ -412,13 +412,13 @@
],
},
// {
- // label: "所属地区",
+ // label: "所属辖区",
// hide: true,
// prop: "region",
// rules: [
// {
// required: true,
- // message: "请输入所属地区",
+ // message: "请输入所属辖区",
// trigger: "blur",
// },
// ],
diff --git a/src/views/licenseApproval/securityGuard.vue b/src/views/licenseApproval/securityGuard.vue
index 9960f52..eac0235 100644
--- a/src/views/licenseApproval/securityGuard.vue
+++ b/src/views/licenseApproval/securityGuard.vue
@@ -465,13 +465,13 @@
],
},
// {
- // label: "所属地区",
+ // label: "所属辖区",
// hide: true,
// prop: "region",
// rules: [
// {
// required: true,
- // message: "请输入所属地区",
+ // message: "请输入所属辖区",
// trigger: "blur",
// },
// ],
diff --git a/src/views/licenseApproval/securityPermit.vue b/src/views/licenseApproval/securityPermit.vue
index abf573e..04f1154 100644
--- a/src/views/licenseApproval/securityPermit.vue
+++ b/src/views/licenseApproval/securityPermit.vue
@@ -427,13 +427,13 @@
],
},
// {
- // label: "所属地区",
+ // label: "所属辖区",
// hide: true,
// prop: "region",
// rules: [
// {
// required: true,
- // message: "请输入所属地区",
+ // message: "请输入所属辖区",
// trigger: "blur",
// },
// ],
diff --git a/src/views/licenseApproval/securityTraining.vue b/src/views/licenseApproval/securityTraining.vue
index 778a1b1..e2de008 100644
--- a/src/views/licenseApproval/securityTraining.vue
+++ b/src/views/licenseApproval/securityTraining.vue
@@ -427,13 +427,13 @@
],
},
// {
- // label: "所属地区",
+ // label: "所属辖区",
// hide: true,
// prop: "region",
// rules: [
// {
// required: true,
- // message: "请输入所属地区",
+ // message: "请输入所属辖区",
// trigger: "blur",
// },
// ],
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index b2dd0dd..8237ce0 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -430,7 +430,6 @@
total: 0,
},
query2: {},
- data1: [],
data2: [],
option2: {
card: true,
@@ -1370,7 +1369,7 @@
this.$prompt("离职原因", "提示", {
confirmButtonText: "确定离职",
cancelButtonText: "取消",
- inputErrorMessage: "邮箱格式不正确",
+ inputErrorMessage: "",
}).then(({ value }) => {
console.log(value);
row.reasonForLeav = value;
diff --git a/src/views/securityUnit/data.js b/src/views/securityUnit/data.js
index 2f8ed71..ead3319 100644
--- a/src/views/securityUnit/data.js
+++ b/src/views/securityUnit/data.js
@@ -71,6 +71,7 @@
labelWidth: 160,
prop: "znum",
width: 69,
+ editDisplay: false,
// search: true,
searchSpan: 4,
searchLabelWidth: 100
@@ -81,6 +82,7 @@
prop: "pnum",
width: 69,
// search: true,
+ editDisplay: false,
searchSpan: 4,
searchLabelWidth: 100
},
@@ -89,6 +91,8 @@
labelWidth: 160,
prop: "cnum",
width: 69,
+
+ editDisplay: false,
// search: true,
searchSpan: 4,
searchLabelWidth: 100
@@ -101,7 +105,7 @@
overHidden: true,
type: "date",
format: "yyyy-MM-dd",
- valueFormat: "timestamp",
+ valueFormat: "yyyy-MM-dd",
},
{
@@ -142,10 +146,27 @@
},
{
label: "所属辖区",
- prop: "region",
+ // prop: "region",
labelWidth: 160,
// width: 110,
// search: true,
+ label: "所属辖区",
+ prop: "jurisdiction",
+ // type: "tree",
+ // disabled: true,
+ type: "tree",
+ dicUrl: "/api/jurisdiction/lazy-trees",
+ props: {
+ label: "title",
+ value: "id"
+ },
+ // labelWidth: w,
+ // span: s,
+ rules: [{
+ required: true,
+ message: "请选择所属辖区",
+ trigger: "click",
+ },],
overHidden: true
},
{
@@ -192,12 +213,12 @@
}]
},
{
- label: "辖区",
+ label: "所属辖区",
prop: "jurisdiction",
// type: "tree",
// disabled: true,
type: "tree",
- dicUrl: "/api//jurisdiction/lazy-trees",
+ dicUrl: "/api/jurisdiction/lazy-trees",
props: {
label: "title",
value: "id"
@@ -393,13 +414,13 @@
}]
},
{
- label: "所属地区",
+ label: "所属辖区",
prop: "region",
labelWidth: w,
span: s,
rules: [{
required: true,
- message: "请输入所属地区",
+ message: "请输入所属辖区",
trigger: "blur"
}]
},
--
Gitblit v1.9.3