+

liuyg

2021-09-15 fccd93a5a4fe73a2081f2d8188efcb65d1d91c5b

+

 src/page/index/top/index.vue

@@ -1,81 +1,98 @@
<template>
  <div class="avue-top">
    <div class="top-bar__left">
      <div class="avue-breadcrumb"
      <div
        class="avue-breadcrumb"
           :class="[{ 'avue-breadcrumb--active': isCollapse }]"
           v-if="showCollapse">
        <i class="icon-navicon"
           @click="setCollapse"></i>
        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"
      <el-tooltip
        v-if="showColor"
                  effect="dark"
                  :content="$t('navbar.color')"
                  placement="bottom">
        placement="bottom"
      >
        <div class="top-bar__item">
          <top-color></top-color>
        </div>
      </el-tooltip>
      <el-tooltip v-if="showDebug"
      <el-tooltip
        v-if="showDebug"
                  effect="dark"
                  :content="logsFlag?$t('navbar.bug'):logsLen+$t('navbar.bugs')"
                  placement="bottom">
        placement="bottom"
      >
        <div class="top-bar__item">
          <top-logs></top-logs>
        </div>
      </el-tooltip>
      <el-tooltip v-if="showLock"
      <el-tooltip
        v-if="showLock"
                  effect="dark"
                  :content="$t('navbar.lock')"
                  placement="bottom">
        placement="bottom"
      >
        <div class="top-bar__item">
          <top-lock></top-lock>
        </div>
      </el-tooltip>
      <el-tooltip v-if="showTheme"
      <el-tooltip
        v-if="showTheme"
                  effect="dark"
                  :content="$t('navbar.theme')"
                  placement="bottom">
        placement="bottom"
      >
        <div class="top-bar__item top-bar__item--show">
          <top-theme></top-theme>
        </div>
      </el-tooltip>
      <el-tooltip effect="dark"
      <!-- <el-tooltip

        effect="dark"
                  :content="$t('navbar.notice')"
                  placement="bottom">
        placement="bottom"
      >
        <div class="top-bar__item top-bar__item--show">
          <top-notice></top-notice>
        </div>
      </el-tooltip>
      <el-tooltip effect="dark"
      </el-tooltip> -->
      <el-tooltip
        effect="dark"
                  :content="$t('navbar.language')"
                  placement="bottom">
        placement="bottom"
      >
        <div class="top-bar__item top-bar__item--show">
          <top-lang></top-lang>
        </div>
      </el-tooltip>
      <el-tooltip v-if="showFullScren"
      <el-tooltip
        v-if="showFullScren"
                  effect="dark"
                  :content="isFullScren?$t('navbar.screenfullF'):$t('navbar.screenfull')"
                  placement="bottom">
        :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}}
@@ -83,13 +100,15 @@
        </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,7 +116,7 @@
  </div>
</template>
<script>
  import {resetRouter} from '@/router/router'
import { resetRouter } from "@/router/router";
  import {mapGetters, mapState} from "vuex";
  import {fullscreenToggel, listenfullscreen} from "@/util/util";
  import topLock from "./top-lock";
@@ -106,7 +125,7 @@
  import topTheme from "./top-theme";
  import topLogs from "./top-logs";
  import topColor from "./top-color";
  import topNotice from './top-notice'
import topNotice from "./top-notice";
  import topLang from "./top-lang";

  export default {
@@ -118,28 +137,27 @@
      topLogs,
      topColor,
      topNotice,
      topLang
    topLang,
    },
    name: "top",
    data() {
      return {};
    },
    filters: {},
    created() {
    },
  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
      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",
@@ -149,8 +167,8 @@
        "isCollapse",
        "tag",
        "logsLen",
        "logsFlag"
      ])
      "logsFlag",
    ]),
    },
    methods: {
      handleScreen() {
@@ -166,15 +184,15 @@
        this.$confirm(this.$t("logoutTip"), this.$t("tip"), {
          confirmButtonText: this.$t("submitText"),
          cancelButtonText: this.$t("cancelText"),
          type: "warning"
        type: "warning",
        }).then(() => {
          this.$store.dispatch("LogOut").then(() => {
            resetRouter();
            this.$router.push({path: "/login"});
          });
        });
      }
    }
    },
  },
  };
</script>


 src/styles/element-ui.scss

@@ -299,3 +299,7 @@
    // 统计图持证表格按钮过长
    width: 320px !important;
}

// .securityGuard .avue-upload__avatar {
//     height: 221px !important;
// }

 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",

 src/views/licenseApproval/branchOffice.vue

@@ -414,13 +414,13 @@
            ],
          },
          // {
          //   label: "所属地区",
          //   label: "所属辖区",
          //   hide: true,
          //   prop: "region",
          //   rules: [
          //     {
          //       required: true,
          //       message: "请输入所属地区",
          //       message: "请输入所属辖区",
          //       trigger: "blur",
          //     },
          //   ],

 src/views/licenseApproval/cancellationOfFiling.vue

@@ -315,13 +315,13 @@
            ],
          },
          // {
          //   label: "所属地区",
          //   label: "所属辖区",
          //   hide: true,
          //   prop: "region",
          //   rules: [
          //     {
          //       required: true,
          //       message: "请输入所属地区",
          //       message: "请输入所属辖区",
          //       trigger: "blur",
          //     },
          //   ],

 src/views/licenseApproval/crossRegion.vue

@@ -412,13 +412,13 @@
            ],
          },
          // {
          //   label: "所属地区",
          //   label: "所属辖区",
          //   hide: true,
          //   prop: "region",
          //   rules: [
          //     {
          //       required: true,
          //       message: "请输入所属地区",
          //       message: "请输入所属辖区",
          //       trigger: "blur",
          //     },
          //   ],

 src/views/licenseApproval/securityGuard.vue

@@ -465,13 +465,13 @@
            ],
          },
          // {
          //   label: "所属地区",
          //   label: "所属辖区",
          //   hide: true,
          //   prop: "region",
          //   rules: [
          //     {
          //       required: true,
          //       message: "请输入所属地区",
          //       message: "请输入所属辖区",
          //       trigger: "blur",
          //     },
          //   ],

 src/views/licenseApproval/securityPermit.vue

@@ -427,13 +427,13 @@
            ],
          },
          // {
          //   label: "所属地区",
          //   label: "所属辖区",
          //   hide: true,
          //   prop: "region",
          //   rules: [
          //     {
          //       required: true,
          //       message: "请输入所属地区",
          //       message: "请输入所属辖区",
          //       trigger: "blur",
          //     },
          //   ],

 src/views/licenseApproval/securityTraining.vue

@@ -427,13 +427,13 @@
            ],
          },
          // {
          //   label: "所属地区",
          //   label: "所属辖区",
          //   hide: true,
          //   prop: "region",
          //   rules: [
          //     {
          //       required: true,
          //       message: "请输入所属地区",
          //       message: "请输入所属辖区",
          //       trigger: "blur",
          //     },
          //   ],

 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;

 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"
  }]
},