Skip to content

M
mes-ui
Commit e9eaefa9 authored by renjintao's avatar renjintao
Browse files
Options

Merge branch 'master' of git.mes123.com:zhouyx/mes-ui into product-rjt

parents 637f96b3 43a40006
Expand all Show whitespace changes
Inline Side-by-side
Showing with 447 additions and 581 deletions
layouts/basic-layout/tabs/index.vue
View file @ e9eaefa9
...@@ -9,6 +9,8 @@ ...@@ -9,6 +9,8 @@
@on-click="handleClickTab" @on-click="handleClickTab"
@on-tab-remove="handleClickClose" @on-tab-remove="handleClickClose"
> >
<TabPane key="welcome" label="首页" name="/" :closable="false" />
<TabPane key="/home" label="个人中心" name="/home" :closable="false" />
<TabPane <TabPane
v-for="page in opened" v-for="page in opened"
:key="page.fullPath" :key="page.fullPath"
...@@ -17,26 +19,30 @@ ...@@ -17,26 +19,30 @@
:closable="page.meta && page.meta.closable" :closable="page.meta && page.meta.closable"
/> />
</Tabs> </Tabs>
<Dropdown class="i-layout-tabs-close" @on-click="handleClose" placement="bottom-end"> <Dropdown
class="i-layout-tabs-close"
@on-click="handleClose"
placement="bottom-end"
>
<div class="i-layout-tabs-close-main"> <div class="i-layout-tabs-close-main">
<Icon type="ios-arrow-down" /> <Icon type="ios-arrow-down" />
</div> </div>
<DropdownMenu slot="list"> <DropdownMenu slot="list">
<DropdownItem name="left"> <DropdownItem name="left">
<Icon type="md-arrow-back" /> <Icon type="md-arrow-back" />
{{ $t('basicLayout.tabs.left') }} {{ $t("basicLayout.tabs.left") }}
</DropdownItem> </DropdownItem>
<DropdownItem name="right"> <DropdownItem name="right">
<Icon type="md-arrow-forward" /> <Icon type="md-arrow-forward" />
{{ $t('basicLayout.tabs.right') }} {{ $t("basicLayout.tabs.right") }}
</DropdownItem> </DropdownItem>
<DropdownItem name="other"> <DropdownItem name="other">
<Icon type="md-close" /> <Icon type="md-close" />
{{ $t('basicLayout.tabs.other') }} {{ $t("basicLayout.tabs.other") }}
</DropdownItem> </DropdownItem>
<DropdownItem name="all"> <DropdownItem name="all">
<Icon type="md-close-circle" /> <Icon type="md-close-circle" />
{{ $t('basicLayout.tabs.all') }} {{ $t("basicLayout.tabs.all") }}
</DropdownItem> </DropdownItem>
</DropdownMenu> </DropdownMenu>
</Dropdown> </Dropdown>
...@@ -64,7 +70,7 @@ export default { ...@@ -64,7 +70,7 @@ export default {
"headerFix", "headerFix",
"headerStick", "headerStick",
"isMobile", "isMobile",
"menuCollapse" "menuCollapse",
]), ]),
...mapGetters("admin/menu", ["hideSider"]), ...mapGetters("admin/menu", ["hideSider"]),
classes() { classes() {
...@@ -92,13 +98,13 @@ export default { ...@@ -92,13 +98,13 @@ export default {
// } // }
return style; return style;
} },
}, },
data() { data() {
return { return {
// 得到所有侧边菜单，并转为平级，查询图标用 // 得到所有侧边菜单，并转为平级，查询图标用
allSiderMenu: getAllSiderMenu(menuSider), allSiderMenu: getAllSiderMenu(menuSider),
scrollTop: 0 scrollTop: 0,
}; };
}, },
methods: { methods: {
...@@ -107,7 +113,7 @@ export default { ...@@ -107,7 +113,7 @@ export default {
"closeLeft", "closeLeft",
"closeRight", "closeRight",
"closeOther", "closeOther",
"closeAll" "closeAll",
]), ]),
tabLabel(h, page) { tabLabel(h, page) {
const title = h("span", this.tTitle(page.meta.title) || "未命名"); const title = h("span", this.tTitle(page.meta.title) || "未命名");
...@@ -119,27 +125,28 @@ export default { ...@@ -119,27 +125,28 @@ export default {
? page.fullPath.split("?")[0] ? page.fullPath.split("?")[0]
: page.fullPath; : page.fullPath;
const currentMenu = const currentMenu =
this.allSiderMenu.find(menu => menu.path === fullPathWithoutQuery) || this.allSiderMenu.find(
{}; (menu) => menu.path === fullPathWithoutQuery
) || {};
let icon; let icon;
if (currentMenu.icon) { if (currentMenu.icon) {
icon = h("Icon", { icon = h("Icon", {
props: { props: {
type: currentMenu.icon type: currentMenu.icon,
} },
}); });
} else if (currentMenu.custom) { } else if (currentMenu.custom) {
icon = h("Icon", { icon = h("Icon", {
props: { props: {
custom: currentMenu.custom custom: currentMenu.custom,
} },
}); });
} else if (currentMenu.img) { } else if (currentMenu.img) {
icon = h("img", { icon = h("img", {
attrs: { attrs: {
src: currentMenu.img src: currentMenu.img,
} },
}); });
} }
...@@ -152,26 +159,30 @@ export default { ...@@ -152,26 +159,30 @@ export default {
return h( return h(
"div", "div",
{ {
class: "i-layout-tabs-title" class: "i-layout-tabs-title",
}, },
slot slot
); );
}, },
handleClickTab(tabName) { handleClickTab(tabName) {
if (tabName === this.current) { if (tabName === this.current) {
if (this.tabsReload) { if (this.tabsReload) {
this.$emit("on-reload"); this.$emit("on-reload");
} }
} else { } else {
const page = this.opened.find(page => page.fullPath === tabName); const page = this.opened.find((page) => page.fullPath === tabName);
if (page) {
const { name, params, query } = page; const { name, params, query } = page;
this.$router.push({ name, params, query }, () => {});
if (page) this.$router.push({ name, params, query }, () => {}); } else {
this.$router.push(tabName, () => {});
}
} }
}, },
handleClickClose(tagName) { handleClickClose(tagName) {
this.close({ this.close({
tagName tagName,
}); });
}, },
handleScroll() { handleScroll() {
...@@ -182,7 +193,7 @@ export default { ...@@ -182,7 +193,7 @@ export default {
}, },
handleClose(name) { handleClose(name) {
const params = { const params = {
pageSelect: this.current pageSelect: this.current,
}; };
switch (name) { switch (name) {
case "left": case "left":
...@@ -198,7 +209,7 @@ export default { ...@@ -198,7 +209,7 @@ export default {
this.closeAll(); this.closeAll();
break; break;
} }
} },
}, },
mounted() { mounted() {
document.addEventListener("scroll", this.handleScroll, { passive: true }); document.addEventListener("scroll", this.handleScroll, { passive: true });
...@@ -206,6 +217,6 @@ export default { ...@@ -206,6 +217,6 @@ export default {
}, },
beforeDestroy() { beforeDestroy() {
document.removeEventListener("scroll", this.handleScroll); document.removeEventListener("scroll", this.handleScroll);
} },
}; };
</script> </script>
pages/aps/ai/components/excute.vue
View file @ e9eaefa9
This diff is collapsed.
pages/index.vue
View file @ e9eaefa9
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</template> </template>
<script> <script>
import iview from "./home/index.vue"; import iview from "./welcome/index.vue";
export default { export default {
components: { components: {
iview iview
......
pages/welcome/index.vue
View file @ e9eaefa9
...@@ -28,183 +28,10 @@ ...@@ -28,183 +28,10 @@
<script> <script>
import { isInteger } from "lodash"; import { isInteger } from "lodash";
export default { export default {
layout: "empty",
data() { data() {
return { return {
list: [], list: [],
arrList: [], arrList: [],
// arrList: [
// {
// name: "设计区",
// style: {
// top: "247px",
// left: "280px",
// height: "40px",
// width: "80px",
// // border: " 1px solid red",
// transform: " rotate(-13deg) skew(-74deg, 42deg)",
// },
// list: [
// { name: "物料编码" },
// { name: "物料分类" },
// { name: "物料管理" },
// ],
// },
// {
// name: "工艺区",
// style: {
// top: "319px",
// left: "405px",
// height: "40px",
// width: "80px",
// // border: " 1px solid red",
// transform: " rotate(-13deg) skew(-74deg, 42deg)",
// },
// list: [
// { name: "产品管理" },
// { name: "工艺规程" },
// { name: "工艺设置" },
// ],
// },
// {
// name: "市场处",
// style: {
// top: "570px",
// left: "293px",
// height: "40px",
// width: "80px",
// // border: " 1px solid red",
// transform: " rotate(-13deg) skew(-74deg, 42deg)",
// },
// list: [
// { name: "客户管理" },
// { name: "项目管理" },
// { name: "销售管理" },
// { name: "合同管理" },
// ],
// },
// // {
// // name: "管理区",
// // style: {
// // top: "677px",
// // left: "102px",
// // height: "40px",
// // width: "80px",
// // // border: " 1px solid red",
// // transform: " rotate(-13deg) skew(-74deg, 42deg)",
// // },
// // list: [
// // { name: "设备类型" },
// // { name: "设备管理" },
// // { name: "排产资源" },
// // ],
// // },
// {
// name: "综合生产处",
// style: {
// top: "467px",
// left: "440px",
// height: "33px",
// width: "75px",
// // border: " 1px solid red",
// transform: " rotate(197deg) skew(77deg,134deg)",
// },
// list: [
// { name: "订单管理" },
// { name: "订单监控" },
// { name: "订单报价" },
// ],
// },
// {
// name: "生产班组派工",
// style: {
// top: "513px",
// left: "757px",
// height: "33px",
// width: "75px",
// // border: " 1px solid red",
// transform: " rotate(197deg) skew(77deg,134deg)",
// },
// list: [{ name: "班组派工" }],
// },
// {
// name: "设备管理",
// style: {
// top: "638px",
// left: "947px",
// height: "33px",
// width: "75px",
// // border: " 1px solid red",
// transform: " rotate(197deg) skew(77deg,134deg)",
// },
// list: [
// { name: "设备类型" },
// { name: "设备管理" },
// { name: "排产资源" },
// ],
// },
// {
// name: "质检",
// style: {
// top: "186px",
// left: "1304px",
// height: "33px",
// width: "75px",
// // border: " 1px solid red",
// transform: " rotate(197deg) skew(77deg,134deg)",
// },
// list: [
// { name: "原材料复检" },
// { name: "质量检验" },
// { name: "数据包追溯" },
// { name: "产品合格证" },
// ],
// },
// {
// name: "原料仓库",
// style: {
// top: "216px",
// left: "646px",
// height: "79px",
// width: "175px",
// // border: " 1px solid red",
// transform: " rotate(-11deg) skew(-72deg, 41deg)",
// },
// list: [
// { name: "库房位置" },
// { name: "物料管理" },
// { name: "料单配套" },
// { name: "制造资源" },
// ],
// },
// {
// name: "车间计调",
// style: {
// top: "380px",
// left: "553px",
// height: "33px",
// width: "81px",
// // border: " 1px solid red",
// transform: " rotate(-12deg) skew(-72deg, 41deg)",
// },
// list: [
// { name: "计划管理" },
// { name: "排产结果" },
// ],
// },
// {
// name: "组件区",
// style: {
// top: "293px",
// left: "949px",
// height: "144px",
// width: "232px",
// // border: " 1px solid red",
// transform: " rotate(-11deg) skew(-71deg, 40deg)",
// },
// list: [{ name: "工单执行" }, { name: "转序交接" }],
// },
// ],
isIndex: -1, isIndex: -1,
oneShow: false, oneShow: false,
menu: false, menu: false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment