Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/directive/index.js

+import local from "@/utils/local";
+// 皮肤模板页面权限
+export const permission = {
+  inserted: function(el, binding) {
+    const { value } = binding;
+    const roles = local.getLocal("baseUserInfo").id;
+    if (value) {
+      const permissionRoles = value;
+      const hasPermission = permissionRoles.includes(roles);
+      if (!hasPermission) {
+        el.remove();
+      }
+    } else {
+      throw new Error(`need roles! Like v-permission="['admin','editor']"`);
+    }
+  },
+};

base-manager-ui/admin/src/main.js

-import Vue from 'vue'
-import App from './App.vue'
-import { initRouter } from './router'
-import './theme/index.less'
-import Antd from 'ant-design-vue'
+import Vue from "vue";
+import App from "./App.vue";
+import { initRouter } from "./router";
+import "./theme/index.less";
+import Antd from "ant-design-vue";
 // import Viser from 'viser-vue'
 // import '@/mock'
-import store from './store'
-import 'animate.css/source/animate.css'
-import './assets/css/common.less'
-import './assets/css/relas.less'
-import './assets/css/use.less'
-import Plugins from '@/plugins'
-import { initI18n } from '@/utils/i18n'
-import bootstrap from '@/bootstrap'
-import 'moment/locale/zh-cn'
-import VueResource from 'vue-resource'
+import store from "./store";
+import "animate.css/source/animate.css";
+import "./assets/css/common.less";
+import "./assets/css/relas.less";
+import "./assets/css/use.less";
+import Plugins from "@/plugins";
+import { initI18n } from "@/utils/i18n";
+import bootstrap from "@/bootstrap";
+import "moment/locale/zh-cn";
+import VueResource from "vue-resource";
 //富文本插件
-import VueQuillEditor from 'vue-quill-editor'
-import 'quill/dist/quill.core.css'
-import 'quill/dist/quill.snow.css'
-import 'quill/dist/quill.bubble.css'
+import VueQuillEditor from "vue-quill-editor";
+import "quill/dist/quill.core.css";
+import "quill/dist/quill.snow.css";
+import "quill/dist/quill.bubble.css";
 
-import {VueJsonp} from 'vue-jsonp'
-Vue.use(VueJsonp)
+import { VueJsonp } from "vue-jsonp";
+Vue.use(VueJsonp);
 // 公共样式
-import "@/assets/css/common.css"
+import "@/assets/css/common.css";
 Vue.use(VueQuillEditor);
 // 全局过滤器
-import * as filters from "@/filters"
-Object.keys(filters).forEach(key=>{
-  Vue.filter(key,filters[key])
-})
+import * as filters from "@/filters";
+Object.keys(filters).forEach((key) => {
+  Vue.filter(key, filters[key]);
+});
+// 引入注册全局指令
+import * as directives from "@/directive";
+Object.keys(directives).forEach((name) =>
+  Vue.directive(name, directives[name])
+);
 // 中央事件总线
-Vue.prototype.$bus = new Vue
+Vue.prototype.$bus = new Vue();
 // 图片预览
-import Viewer from 'v-viewer'
-import 'viewerjs/dist/viewer.css'
+import Viewer from "v-viewer";
+import "viewerjs/dist/viewer.css";
 Vue.use(Viewer);
 // moment 时间处理
-import moment from 'moment';
+import moment from "moment";
 Vue.prototype.$moment = moment;
 
 // echats
-import * as echarts from 'echarts';
-Vue.prototype.$echarts = echarts
+import * as echarts from "echarts";
+Vue.prototype.$echarts = echarts;
 
-export const router = initRouter(store.state.setting.asyncRoutes)
-const i18n = initI18n('CN', 'US')
-Vue.use(Antd)
-Vue.config.productionTip = false
+export const router = initRouter(store.state.setting.asyncRoutes);
+const i18n = initI18n("CN", "US");
+Vue.use(Antd);
+Vue.config.productionTip = false;
 // Vue.use(Viser)
-Vue.use(Plugins)
-Vue.use(VueResource)
+Vue.use(Plugins);
+Vue.use(VueResource);
 
-bootstrap({ router, store, i18n, message: Vue.prototype.$message })
+bootstrap({ router, store, i18n, message: Vue.prototype.$message });
 
 new Vue({
   router,
   store,
   i18n,
-  render: h => h(App),
-}).$mount('#app')
+  render: (h) => h(App),
+}).$mount("#app");

base-manager-ui/admin/src/pages/basicset/jump/jump.vue

@@ -17,8 +17,10 @@ export default {
     // 获取token
     getToken() {
       let token = this.$route.query.token;
+      let userInfo = JSON.parse(this.$route.query.userInfo);
       if (token) {
         local.setLocal("token", token);
+        local.setLocal("baseUserInfo", userInfo);
         this.$router.push("basicset/website");
       } else {
         this.$message.warning("跳转失败,请重新登录");

base-manager-ui/admin/src/pages/basicset/surface/components/LeftMenu.vue

@@ -41,7 +41,6 @@ export default {
       let { data } = res.data.data;
       this.productList = data;
       this.changeMenu(0, this.productList[0]);
-      console.log(res);
     },
     // 搜索
     onSearch(val) {

base-manager-ui/admin/src/pages/basicset/surface/surface.vue

@@ -5,6 +5,7 @@
         <a-button
           slot="extra"
           type="primary"
+          v-permission="[1]"
           @click="$router.push('surface/addsurfacetemplate')"
           >新增皮肤模板</a-button
         >
@@ -79,7 +80,6 @@ export default {
       data.forEach((v) => {
         v.isEdit = false;
       });
-      console.log(data);
       this.classifyList = data;
     },
     // 选择产品

base-manager-ui/admin/src/pages/basicset/workman/personnel.vue

@@ -48,9 +48,6 @@
             <a-menu slot="overlay">
               <a-menu-item key="1">
                 <a style="color: #1890ff" @click="handleUpload"> 批量导入 </a>
-                <!-- <a-button type="primary" @click="handleUpload" class="btn_to"
-                  >批量导入</a-button
-                > -->
               </a-menu-item>
               <a-menu-item key="2">
                 <a style="color: #1890ff" @click="handleDownload"> 模板下载</a>
@@ -539,8 +536,11 @@ export default {
   }
   .person_chang {
     width: 100%;
-
     margin-top: 15px;
+    display: flex;
+    .ant-radio-button-wrapper {
+      margin-bottom: 6px;
+    }
   }
   .btn_add {
     width: 80px;
@@ -582,6 +582,7 @@ export default {
   }
   div.person_gruop1 {
     display: inline;
+    flex: 1;
   }
   div.person_gruop {
     display: inline;
@@ -591,6 +592,7 @@ export default {
   }
   div.person_window1 {
     display: inline;
+    flex: 1;
   }
   .btn_seek {
     width: 278px;

portal-manager-ui/admin/package.json

@@ -39,6 +39,6 @@
   "browserslist": [
     "> 1%",
     "last 2 versions",
-    "not dead"
+    "not ie < 11"
   ]
 }

portal-manager-ui/admin/src/views/siteArrange/siteArrange.vue

@@ -52,14 +52,21 @@ export default {
       let res = await appsListInterface({ siteId: this.siteId });
       let { data } = res.data;
       this.siteModelList = data;
-      console.log(data);
     },
     openWindow(href) {
       let token = Storage.get(2, "Authorization");
       let siteid = Storage.get(2, "siteId");
       let reg = /^((https|http|ftp|rtsp|mms)?:\/\/)[^\s]+/;
+      let info = Storage.get(2, "userInfo");
+      let userInfo = JSON.stringify({
+        id: info.id,
+        name: info.loginName,
+      });
       if (reg.test(href)) {
-        window.open(`${href}?token=${token}&siteid=${siteid}`, "_blank");
+        window.open(
+          `${href}?token=${token}&siteid=${siteid}&userInfo=${userInfo}`,
+          "_blank"
+        );
       }
     },
   },

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/components/EditPwd.vue

@@ -98,7 +98,7 @@ export default {
       this.$refs.formData.validate(async (valid) => {
         if (valid) {
           let res = await editPassword(this.form);
-          if (res.data.code === 1) {
+          if (res.code === 1) {
             this.$message.success("密码修改成功");
             this.handleClose();
           }