role1.0
fanluyan 1 year ago
parent 63bd189786
commit 18ce1d2a85

@ -134,10 +134,10 @@ export default {
index: "/roleManagement", index: "/roleManagement",
title: "角色管理", title: "角色管理",
}, },
{ // {
index: "/menuManagement", // index: "/menuManagement",
title: "菜单功能管理", // title: "",
}, // },
{ {
index: "/deviceUpgrade", index: "/deviceUpgrade",
title: "升级管理", title: "升级管理",
@ -273,16 +273,6 @@ export default {
console.log("我是超管"); console.log("我是超管");
this.items = this.items; this.items = this.items;
} }
// if (this.role == 0) {
// this.items = this.items;
// } else if (this.role == 1) {
// this.items = this.items1;
// } else if (this.role == 2) {
// this.items = this.items2;
// } else if (this.role == 4) {
// this.items = this.hnjcitems;
// }
}, },
}; };
</script> </script>

@ -64,6 +64,16 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="规约" class="isonLineClass">
<el-select v-model="formdata.protocol" filterable>
<el-option
v-for="item in protocolOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-input <el-input
v-model="formdata.search" v-model="formdata.search"
@ -331,6 +341,7 @@ import {
deleteTerminalJoggle, deleteTerminalJoggle,
getSearchInfo, getSearchInfo,
getTerminalListExcel, getTerminalListExcel,
getProtocolList,
} from "@/utils/api/index"; } from "@/utils/api/index";
import moment from "moment"; import moment from "moment";
import addPhotoDialog from "./components/addPhotoDialog.vue"; import addPhotoDialog from "./components/addPhotoDialog.vue";
@ -370,12 +381,14 @@ export default {
{ id: 1, name: "在线" }, { id: 1, name: "在线" },
{ id: 0, name: "离线" }, { id: 0, name: "离线" },
], ],
protocolOptions: [{ id: -1, name: "全部" }], //
formdata: { formdata: {
dyId: -1, dyId: -1,
lineId: -1, lineId: -1,
towerId: -1, towerId: -1,
search: "", search: "",
isonline: -1, isonline: -1,
protocol: -1,
}, },
roleUser: "", roleUser: "",
terminalTableData: [], // terminalTableData: [], //
@ -418,6 +431,7 @@ export default {
}, },
mounted() { mounted() {
this.getSearchdy(); this.getSearchdy();
this.getProtocol();
this.terminalList(); this.terminalList();
}, },
methods: { methods: {
@ -472,7 +486,17 @@ export default {
}) })
.catch((err) => {}); .catch((err) => {});
}, },
getProtocol() {
//
getProtocolList()
.then((res) => {
console.log(res);
this.protocolOptions = [{ id: -1, name: "全部" }];
this.protocolOptions = this.protocolOptions.concat(res.data.list);
this.formdata.protocol = this.protocolOptions[0].id;
})
.catch((err) => {});
},
// //
onSubmit() { onSubmit() {
this.page = 1; this.page = 1;

@ -73,9 +73,14 @@ export default {
if (res.code == 200) { if (res.code == 200) {
console.log(res); console.log(res);
this.allCheckList = res.data; this.allCheckList = res.data;
this.menuCheckOption = res.data.filter((item) => const menuItems = res.data.filter((item) => item.key.includes("/"));
item.key.includes("/") this.menuCheckOption = menuItems.filter((item) => {
); return (
item.key !== "/userManagement" &&
item.key !== "/menuManagement" &&
item.key !== "/roleManagement"
);
});
this.btnCheckOption = res.data.filter((item) => this.btnCheckOption = res.data.filter((item) =>
item.key.includes("Btn") item.key.includes("Btn")
); );
@ -183,7 +188,7 @@ export default {
<style lang="less"> <style lang="less">
.blindMenuDialog { .blindMenuDialog {
.treeBoxList { .treeBoxList {
height: 600px; height: 500px;
overflow: auto; overflow: auto;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;

@ -3,12 +3,12 @@ const { defineConfig } = require("@vue/cli-service");
// const webpack = require("webpack"); // const webpack = require("webpack");
module.exports = defineConfig({ module.exports = defineConfig({
//打包清除console //打包清除console
// chainWebpack(config) { chainWebpack(config) {
// config.optimization.minimizer("terser").tap((args) => { config.optimization.minimizer("terser").tap((args) => {
// args[0].terserOptions.compress.drop_console = true; args[0].terserOptions.compress.drop_console = true;
// return args; return args;
// }); });
// }, },
productionSourceMap: false, // 生产环境是否要生成 sourceMap productionSourceMap: false, // 生产环境是否要生成 sourceMap
publicPath: process.env.PUBLIC_PATH ? process.env.PUBLIC_PATH : "./", // 部署应用包时的基本 URL publicPath: process.env.PUBLIC_PATH ? process.env.PUBLIC_PATH : "./", // 部署应用包时的基本 URL
//assetsPublicPath: process.env.NODE_ENV === "production" ? "" : "/", //assetsPublicPath: process.env.NODE_ENV === "production" ? "" : "/",

Loading…
Cancel
Save