From 7a0d7a81f02515bbb185a4cb954e9debb07bff6c Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 04 九月 2025 15:23:33 +0800
Subject: [PATCH] 1、全局调整样式名称 2、新增倍率报表页面
---
src/components/jeecgbiz/modal/JSelectEquipmentProductionModal.vue | 4
src/views/system/DepartListSync.vue | 6
src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue | 4
src/views/system/modules/GateWayRouteModal.vue | 4
src/views/mdc/base/modules/EquipmentFailureRepaireReport/EquipmentFailureRepaireReportList.vue | 2
src/views/system/modules/DeptRoleAuthModal.vue | 4
src/views/mdc/base/modules/MagnificationReport/MagnificationReportList.vue | 207 +++++++++++++++++++++++++++++
src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue | 4
src/components/jeecgbiz/modal/JSelectEquipmentDepartModal.vue | 4
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue | 8
/dev/null | 20 --
src/views/mdc/base/MagnificationReport.vue | 82 +++++++++++
src/views/system/DepartList.vue | 4
src/views/system/modules/UserRoleModal.vue | 4
src/components/jeecgbiz/modal/JSelectProductionModal.vue | 4
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddTree.vue | 4
src/components/jeecgbiz/modal/JSelectDepartModal.vue | 6
src/views/system/modules/DeptRoleUserModal.vue | 4
18 files changed, 322 insertions(+), 53 deletions(-)
diff --git a/src/components/jeecgbiz/modal/JSelectDepartModal.vue b/src/components/jeecgbiz/modal/JSelectDepartModal.vue
index 87c1c7f..230fd4a 100644
--- a/src/components/jeecgbiz/modal/JSelectDepartModal.vue
+++ b/src/components/jeecgbiz/modal/JSelectDepartModal.vue
@@ -30,7 +30,7 @@
</a-spin>
<!--搴曢儴鐖跺瓙鍏宠仈鎿嶄綔鍜岀‘璁ゅ彇娑堟寜閽�-->
<template slot="footer" v-if="treeOpera && multi">
- <div class="drawer-bootom-button">
+ <div class="drawer-bottom-button">
<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
<a-menu slot="overlay">
<a-menu-item key="1" @click="switchCheckStrictly(1)">鐖跺瓙鍏宠仈</a-menu-item>
@@ -280,13 +280,13 @@
// 闄愬埗閮ㄩ棬閫夋嫨鏍戦珮搴︼紝閬垮厤閮ㄩ棬澶鏃剁偣鍑荤‘瀹氫笉渚�
.my-dept-select-tree{
height:350px;
-
+
&.fullscreen{
height: calc(100vh - 250px);
}
overflow-y: scroll;
}
- .drawer-bootom-button {
+ .drawer-bottom-button {
position: absolute;
bottom: 0;
width: 100%;
diff --git a/src/components/jeecgbiz/modal/JSelectEquipmentDepartModal.vue b/src/components/jeecgbiz/modal/JSelectEquipmentDepartModal.vue
index beca2c5..5d7f850 100644
--- a/src/components/jeecgbiz/modal/JSelectEquipmentDepartModal.vue
+++ b/src/components/jeecgbiz/modal/JSelectEquipmentDepartModal.vue
@@ -40,7 +40,7 @@
</a-spin>
<!--搴曢儴鐖跺瓙鍏宠仈鎿嶄綔鍜岀‘璁ゅ彇娑堟寜閽�-->
<!--<template slot="footer" v-if="treeOpera && multi">-->
- <!--<div class="drawer-bootom-button">-->
+ <!--<div class="drawer-bottom-button">-->
<!--<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">-->
<!--<a-menu slot="overlay">-->
<!--<a-menu-item key="1" @click="switchCheckStrictly(1)">鐖跺瓙鍏宠仈</a-menu-item>-->
@@ -348,7 +348,7 @@
}
overflow-y: scroll;
}
- .drawer-bootom-button {
+ .drawer-bottom-button {
position: absolute;
bottom: 0;
width: 100%;
diff --git a/src/components/jeecgbiz/modal/JSelectEquipmentProductionModal.vue b/src/components/jeecgbiz/modal/JSelectEquipmentProductionModal.vue
index b85d3b1..d586127 100644
--- a/src/components/jeecgbiz/modal/JSelectEquipmentProductionModal.vue
+++ b/src/components/jeecgbiz/modal/JSelectEquipmentProductionModal.vue
@@ -36,7 +36,7 @@
</a-spin>
<!--搴曢儴鐖跺瓙鍏宠仈鎿嶄綔鍜岀‘璁ゅ彇娑堟寜閽�-->
<!--<template slot="footer">-->
- <!--<div class="drawer-bootom-button">-->
+ <!--<div class="drawer-bottom-button">-->
<!--<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">-->
<!--<a-menu slot="overlay">-->
<!--<a-menu-item key="1" @click="switchCheckStrictly(1)">鐖跺瓙鍏宠仈</a-menu-item>-->
@@ -334,7 +334,7 @@
}
overflow-y: scroll;
}
- .drawer-bootom-button {
+ .drawer-bottom-button {
position: absolute;
bottom: 0;
width: 100%;
diff --git a/src/components/jeecgbiz/modal/JSelectProductionModal.vue b/src/components/jeecgbiz/modal/JSelectProductionModal.vue
index 33ea6d4..a2374c0 100644
--- a/src/components/jeecgbiz/modal/JSelectProductionModal.vue
+++ b/src/components/jeecgbiz/modal/JSelectProductionModal.vue
@@ -36,7 +36,7 @@
</a-spin>
<!--搴曢儴鐖跺瓙鍏宠仈鎿嶄綔鍜岀‘璁ゅ彇娑堟寜閽�-->
<!--<template slot="footer">-->
- <!--<div class="drawer-bootom-button">-->
+ <!--<div class="drawer-bottom-button">-->
<!--<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">-->
<!--<a-menu slot="overlay">-->
<!--<a-menu-item key="1" @click="switchCheckStrictly(1)">鐖跺瓙鍏宠仈</a-menu-item>-->
@@ -296,7 +296,7 @@
}
overflow-y: scroll;
}
- .drawer-bootom-button {
+ .drawer-bottom-button {
position: absolute;
bottom: 0;
width: 100%;
diff --git a/src/views/mdc/base/IdleDataMaintenance.vue b/src/views/mdc/base/IdleDataMaintenance.vue
deleted file mode 100644
index 2c44b2d..0000000
--- a/src/views/mdc/base/IdleDataMaintenance.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<template>
- <a-card>
- 绌鸿浆鏁版嵁缁存姢
- </a-card>
-</template>
-
-<script>
- export default {
- name: 'IdleDataMaintenance',
- components: {},
- data() {
- return {}
- },
- methods: {}
- }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/mdc/base/MagnificationReport.vue b/src/views/mdc/base/MagnificationReport.vue
new file mode 100644
index 0000000..8758543
--- /dev/null
+++ b/src/views/mdc/base/MagnificationReport.vue
@@ -0,0 +1,82 @@
+<template>
+ <div style="width: 100%; height: 100%;">
+ <a-card :bordered="false">
+ <a-row type="flex" :gutter="16">
+ <a-col :md="5">
+ <a-tabs :activeKey="activeKey" @change="tabChange">
+ <a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
+ <base-tree @getCurrSelected="changeSelectionNode"></base-tree>
+ </a-tab-pane>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">,
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
+ </a-tab-pane>
+ </a-tabs>
+ </a-col>
+ <a-col :md="19">
+ <MagnificationReportList :nodePeople='selectPeople' :nodeTree='selectEquipment' :Type="selectTypeTree"/>
+ </a-col>
+ </a-row>
+ </a-card>
+ </div>
+
+</template>
+
+<script>
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import BaseTree from '../common/BaseTree'
+ import MagnificationReportList from './modules/MagnificationReport/MagnificationReportList'
+ import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import { mapActions } from 'vuex'
+
+ export default {
+ name: 'MagnificationReport',
+ components: {
+ BaseTree,
+ DepartTree,
+ MagnificationReportList
+ },
+ data() {
+ return {
+ activeKey: '1',
+ selectEquipmentId: '',
+ selectEquipment: {},
+ selectPeople: {},
+ selectTypeTree: '',
+ isDepartType: ''
+ }
+ },
+ created() {
+ this.queryTreeData()
+ },
+ methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ }).finally(() => {
+ })
+ },
+ tabChange(val) {
+ this.activeKey = val
+ this.selectTypeTree = val
+ },
+ changeSelectionNode(val) {
+ this.selectEquipment = val
+ this.selectTypeTree = '1'
+ },
+ changeSelectionNodedd(val) {
+ this.selectPeople = val
+ this.selectTypeTree = '2'
+ }
+ }
+
+ }
+</script>
\ No newline at end of file
diff --git a/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue b/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue
index f128940..dffeac8 100644
--- a/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue
+++ b/src/views/mdc/base/modules/DepartList/DepartListTree/DepartTree.vue
@@ -7,7 +7,7 @@
<a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">鍙栨秷</a>
</div>
</a-alert>
- <div class="drawer-bootom-button">
+ <div class="drawer-bottom-button">
<a-dropdown :trigger="['click']" placement="bottomCenter">
<a-menu slot="overlay">
<a-menu-item key="1" @click="expandAll">灞曞紑鎵�鏈�</a-menu-item>
@@ -369,7 +369,7 @@
padding: 5px 15px 5px 37px;
}
- .drawer-bootom-button {
+ .drawer-bottom-button {
position: absolute;
top: 1px;
/* padding: 10px 16px; */
diff --git a/src/views/mdc/base/modules/EquipmentFailureRepaireReport/EquipmentFailureRepaireReportList.vue b/src/views/mdc/base/modules/EquipmentFailureRepaireReport/EquipmentFailureRepaireReportList.vue
index b1bec5a..e8488eb 100644
--- a/src/views/mdc/base/modules/EquipmentFailureRepaireReport/EquipmentFailureRepaireReportList.vue
+++ b/src/views/mdc/base/modules/EquipmentFailureRepaireReport/EquipmentFailureRepaireReportList.vue
@@ -132,7 +132,7 @@
width: 150
},
{
- title: '鏃ユ湡',
+ title: '鏈堜唤',
align: 'center',
dataIndex: 'theDate',
width: 150
diff --git a/src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue b/src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue
index ce4eb25..e2536ee 100644
--- a/src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue
+++ b/src/views/mdc/base/modules/EquipmentList/EquipmentModal.vue
@@ -116,7 +116,7 @@
</a-spin>
- <div class="drawer-bootom-button" v-show="!disableSubmit">
+ <div class="drawer-bottom-button" v-show="!disableSubmit">
<a-popconfirm title="纭畾鏀惧純缂栬緫锛�" @confirm="handleCancel" okText="纭畾" cancelText="鍙栨秷">
<a-button style="margin-right: .8rem">鍙栨秷</a-button>
</a-popconfirm>
@@ -539,7 +539,7 @@
padding-bottom:10px;
}
- .drawer-bootom-button {
+ .drawer-bottom-button {
position: absolute;
bottom: -8px;
width: 100%;
diff --git a/src/views/mdc/base/modules/IdleDataMaintenance/IdleDataMaintenanceModal.vue b/src/views/mdc/base/modules/IdleDataMaintenance/IdleDataMaintenanceModal.vue
deleted file mode 100644
index d13c248..0000000
--- a/src/views/mdc/base/modules/IdleDataMaintenance/IdleDataMaintenanceModal.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<template>
- <div>
-
- </div>
-</template>
-
-<script>
- export default {
- name: 'IdleDataMaintenanceModal',
- components: {},
- data() {
- return {}
- },
- methods: {}
- }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/mdc/base/modules/MagnificationReport/MagnificationReportList.vue b/src/views/mdc/base/modules/MagnificationReport/MagnificationReportList.vue
new file mode 100644
index 0000000..f41985d
--- /dev/null
+++ b/src/views/mdc/base/modules/MagnificationReport/MagnificationReportList.vue
@@ -0,0 +1,207 @@
+<template>
+ <div class="device_list">
+ <!-- 鏌ヨ鍖哄煙 -->
+ <div class="table-page-search-wrapper">
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="璁惧缂栧彿">
+ <a-input placeholder="璇疯緭鍏ヨ澶囩紪鍙�" v-model="queryParam.equipmentId"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鏃ユ湡">
+ <a-range-picker value-format="YYYY-MM-DD" v-model="queryParam.dates" @change="dateParamChange"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-space>
+ <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
+ <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button>
+ </a-space>
+ </a-col>
+ </a-row>
+ </a-form>
+ </div>
+ <!-- 鏌ヨ鍖哄煙-END -->
+
+ <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
+ <div class="table-operator">
+ <a-button type="primary" icon="download" @click="handleExportXls('鍊嶇巼鎶ヨ〃')">瀵煎嚭</a-button>
+ </div>
+
+ <!-- table鍖哄煙-begin -->
+ <div id="DeviceList" style="flex: 1;overflow: hidden">
+ <a-table :scroll="{x:'max-content',y:scrollY}" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
+ :pagination="ipagination" :loading="loading" @change="handleTableChange"/>
+ </div>
+ </div>
+</template>
+
+<script>
+ import moment from 'moment'
+ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+ export default {
+ name: 'MagnificationReportList',
+ mixins: [JeecgListMixin],
+ components: {},
+ props: { nodeTree: '', Type: '', nodePeople: '' },
+ data() {
+ return {
+ disableMixinCreated: true,
+ /* 鍒嗛〉鍙傛暟 */
+ ipagination: {
+ current: 1,
+ pageSize: 30,
+ pageSizeOptions: ['30', '50', '100'],
+ showTotal: (total, range) => {
+ return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
+ },
+ showQuickJumper: true,
+ showSizeChanger: true,
+ total: 0
+ },
+ queryParam: {
+ dates: [moment().subtract(1, 'day').startOf('day'), moment().subtract(1, 'day').endOf('day')]
+ },
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ }
+ },
+ {
+ title: '璁惧缂栧彿',
+ align: 'center',
+ dataIndex: 'equipmentId',
+ width: 300
+ },
+ {
+ title: '涓昏酱鍊嶇巼骞冲潎鍊�',
+ align: 'center',
+ dataIndex: 'spindlebeilv'
+ },
+ {
+ title: '杩涚粰鍊嶇巼骞冲潎鍊�',
+ align: 'center',
+ dataIndex: 'feedbeilv'
+ },
+ {
+ title: '鏃ユ湡',
+ align: 'center',
+ dataIndex: 'theDate',
+ width: 300
+ }
+ ],
+ scrollY: 465,
+ url: {
+ list: '/mdc/magnification/list',
+ exportXlsUrl: '/mdc/magnification/exportXls'
+ }
+ }
+ },
+ watch: {
+ Type(valmath) {
+ this.dataList = []
+ this.queryParam.typeTree = valmath
+ },
+ nodeTree(val) { //鐩戝惉currSelected 鍙樺寲锛屽皢鍙樺寲鍚庣殑鏁板�间紶閫掔粰 getCurrSelected 浜嬩欢
+ if (JSON.stringify(val) != '{}') {
+ if (val.equipmentId) {
+ this.queryParam.parentId = ''
+ this.queryParam.equipmentId = val.equipmentId
+ } else {
+ this.queryParam.parentId = val.key
+ this.queryParam.equipmentId = ''
+ }
+ this.searchQuery()
+ }
+ },
+ nodePeople(val) {
+ if (JSON.stringify(val) != '{}') {
+ if (val.equipmentId) {
+ this.queryParam.parentId = ''
+ this.queryParam.equipmentId = val.equipmentId
+ } else {
+ this.queryParam.parentId = val.key
+ this.queryParam.equipmentId = ''
+ }
+ this.searchQuery()
+ }
+ }
+ },
+ created() {
+ this.queryParam.startTime = moment(this.queryParam.dates[0]).format('YYYY-MM-DD')
+ this.queryParam.endTime = moment(this.queryParam.dates[1]).format('YYYY-MM-DD')
+ this.loadData(1)
+ },
+ mounted() {
+ window.addEventListener('resize', this.handleWindowResize)
+ this.handleWindowResize()
+ },
+ beforeDestroy() {
+ window.removeEventListener('resize', this.handleWindowResize)
+ },
+ methods: {
+ dateParamChange(dateArray) {
+ this.queryParam.startTime = dateArray[0]
+ this.queryParam.endTime = dateArray[1]
+ },
+
+ /**
+ * 褰撴祻瑙堝櫒鍙绐楀彛灏哄鍙戠敓鏀瑰彉鏃惰Е鍙�
+ */
+ handleWindowResize() {
+ const boxHeight = +window.getComputedStyle(document.getElementById('DeviceList')).height.slice(0, -2)
+ const tableHeadHeight = +window.getComputedStyle(document.querySelector('.ant-table-thead th')).height.slice(0, -2)
+ this.scrollY = boxHeight - tableHeadHeight - 100
+ }
+ }
+ }
+</script>
+<style scoped>
+ @import '~@assets/less/common.less';
+
+ .device_list {
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ }
+
+ @media screen and (min-width: 1920px) {
+ .device_list {
+ height: 811px !important;
+ }
+ }
+
+ @media screen and (min-width: 1680px) and (max-width: 1920px) {
+ .device_list {
+ height: 811px !important;
+ }
+ }
+
+ @media screen and (min-width: 1400px) and (max-width: 1680px) {
+ .device_list {
+ height: 663px !important;
+ }
+ }
+
+ @media screen and (min-width: 1280px) and (max-width: 1400px) {
+ .device_list {
+ height: 564px !important;
+ }
+ }
+
+ @media screen and (max-width: 1280px) {
+ .device_list {
+ height: 564px !important;
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue
index a5e511a..004fe7d 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAdd.vue
@@ -8,7 +8,7 @@
<span v-else>鏃�</span>
</div>
</a-alert>
- <div class="drawer-bootom-button">
+ <div class="drawer-bottom-button">
<a-dropdown :trigger="['click']" placement="bottomCenter">
<a-menu slot="overlay">
<!--<a-menu-item key="1" @click="switchCheckStrictly(1)">鐖跺瓙鍏宠仈</a-menu-item>-->
@@ -51,7 +51,7 @@
</a-card>
- <!--<div class="drawer-bootom-button">-->
+ <!--<div class="drawer-bottom-button">-->
<!--<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">-->
<!--<a-menu slot="overlay">-->
<!--<a-menu-item key="1" @click="switchCheckStrictly(1)">鐖跺瓙鍏宠仈</a-menu-item>-->
@@ -412,7 +412,7 @@
/*.tree_con{*/
/*position: relative;*/
/*}*/
- .drawer-bootom-button {
+ .drawer-bottom-button {
position: absolute;
top: 1px;
/* padding: 10px 16px; */
@@ -486,7 +486,7 @@
padding: 5px 15px 5px 37px;
}
- /*.drawer-bootom-button {*/
+ /*.drawer-bottom-button {*/
/*position: absolute;*/
/*bottom: 1px;*/
/*padding: 10px 16px;*/
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddTree.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddTree.vue
index fb238f0..7d06385 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddTree.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarAddTree.vue
@@ -31,7 +31,7 @@
</a-form-item>
</a-form>
- <!--<div class="drawer-bootom-button">-->
+ <!--<div class="drawer-bottom-button">-->
<!--<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">-->
<!--<a-menu slot="overlay">-->
<!--<a-menu-item key="1" @click="switchCheckStrictly(1)">鐖跺瓙鍏宠仈</a-menu-item>-->
@@ -241,7 +241,7 @@
</script>
<style lang="less" scoped>
- .drawer-bootom-button {
+ .drawer-bottom-button {
position: absolute;
bottom: 0;
width: 100%;
diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index 910c04b..8ee2e54 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -53,7 +53,7 @@
</div>
</a-card>
<!---- author:os_chengtgen -- date:20190827 -- for:鍒囨崲鐖跺瓙鍕鹃�夋ā寮� =======------>
- <div class="drawer-bootom-button">
+ <div class="drawer-bottom-button">
<a-dropdown :trigger="['click']" placement="topCenter">
<a-menu slot="overlay">
<a-menu-item key="1" @click="switchCheckStrictly(1)">鐖跺瓙鍏宠仈</a-menu-item>
@@ -624,7 +624,7 @@
margin-left: 3px
}
- .drawer-bootom-button {
+ .drawer-bottom-button {
/*position: absolute;*/
bottom: 0;
width: 100%;
diff --git a/src/views/system/DepartListSync.vue b/src/views/system/DepartListSync.vue
index c29c6b6..cb64df0 100644
--- a/src/views/system/DepartListSync.vue
+++ b/src/views/system/DepartListSync.vue
@@ -54,7 +54,7 @@
</div>
</a-card>
<!---- author:os_chengtgen -- date:20190827 -- for:鍒囨崲鐖跺瓙鍕鹃�夋ā寮� =======------>
- <div class="drawer-bootom-button">
+ <div class="drawer-bottom-button">
<a-dropdown :trigger="['click']" placement="topCenter">
<a-menu slot="overlay">
<a-menu-item key="1" @click="switchCheckStrictly(1)">鐖跺瓙鍏宠仈</a-menu-item>
@@ -275,7 +275,7 @@
that.departTree = []
//鎵�鏈夌殑鏍戣妭鐐筴ey淇℃伅
that.allIds = []
-
+
that.iExpandedKeys = []
//update-begin---author:wangshuai ---date:20220105 for锛歔JTC-364]sqlserver 閮ㄩ棬瀵煎叆瀵煎叆澶辫触锛岄儴闂ㄦ爲鏁版嵁涓㈠け------------
//閮ㄩ棬鏍憊-if鐢ㄥ埌浜唋oading,鍜屼笂浼爈oading鍐茬獊浜嗭紝鎹竴涓悕绉�
@@ -677,7 +677,7 @@
}
/** Button鎸夐挳闂磋窛 */
- .drawer-bootom-button {
+ .drawer-bottom-button {
/*position: absolute;*/
bottom: 0;
width: 100%;
diff --git a/src/views/system/modules/DeptRoleAuthModal.vue b/src/views/system/modules/DeptRoleAuthModal.vue
index d84845d..7a3368e 100644
--- a/src/views/system/modules/DeptRoleAuthModal.vue
+++ b/src/views/system/modules/DeptRoleAuthModal.vue
@@ -31,7 +31,7 @@
</a-form-item>
</a-form>
- <div class="drawer-bootom-button">
+ <div class="drawer-bottom-button">
<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
<a-menu slot="overlay">
<a-menu-item key="1" @click="switchCheckStrictly(1)">鐖跺瓙鍏宠仈</a-menu-item>
@@ -198,7 +198,7 @@
</script>
<style lang="less" scoped>
- .drawer-bootom-button {
+ .drawer-bottom-button {
position: absolute;
bottom: 0;
width: 100%;
diff --git a/src/views/system/modules/DeptRoleUserModal.vue b/src/views/system/modules/DeptRoleUserModal.vue
index 12f2530..590261a 100644
--- a/src/views/system/modules/DeptRoleUserModal.vue
+++ b/src/views/system/modules/DeptRoleUserModal.vue
@@ -30,7 +30,7 @@
</a-form>
<div v-else><h3>鏃犲彲閰嶇疆瑙掕壊!</h3></div>
</a-spin>
- <div class="drawer-bootom-button">
+ <div class="drawer-bottom-button">
<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
<a-menu slot="overlay">
<a-menu-item key="1" @click="checkALL">鍏ㄩ儴鍕鹃��</a-menu-item>
@@ -186,7 +186,7 @@
</script>
<style scoped>
- .drawer-bootom-button {
+ .drawer-bottom-button {
position: absolute;
bottom: 0;
width: 100%;
diff --git a/src/views/system/modules/GateWayRouteModal.vue b/src/views/system/modules/GateWayRouteModal.vue
index bd017a1..025fb98 100644
--- a/src/views/system/modules/GateWayRouteModal.vue
+++ b/src/views/system/modules/GateWayRouteModal.vue
@@ -104,7 +104,7 @@
</a-dropdown>
</p>
</a-form-model-item>
- <a-row :style="{textAlign:'right'}" class="drawer-bootom-button">
+ <a-row :style="{textAlign:'right'}" class="drawer-bottom-button">
<a-button :style="{marginRight: '8px'}" @click="handleCancel">
鍏抽棴
</a-button>
@@ -368,7 +368,7 @@
</script>
<style lang="less" scoped>
- .drawer-bootom-button {
+ .drawer-bottom-button {
position: absolute;
bottom: 0;
width: 100%;
diff --git a/src/views/system/modules/UserRoleModal.vue b/src/views/system/modules/UserRoleModal.vue
index 48b8f97..04143f0 100644
--- a/src/views/system/modules/UserRoleModal.vue
+++ b/src/views/system/modules/UserRoleModal.vue
@@ -28,7 +28,7 @@
</a-form-item>
</a-form>
- <div class="drawer-bootom-button">
+ <div class="drawer-bottom-button">
<a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
<a-menu slot="overlay">
<a-menu-item key="1" @click="switchCheckStrictly(1)">鐖跺瓙鍏宠仈</a-menu-item>
@@ -185,7 +185,7 @@
</script>
<style lang="less" scoped>
- .drawer-bootom-button {
+ .drawer-bottom-button {
position: absolute;
bottom: 0;
width: 100%;
--
Gitblit v1.9.3