| src/assets/terminal/login-bg.jpg | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/dnc/base/OperatorLogin.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mdc/base/equipmentAvailCompare.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mdc/base/equipmentDayAvail.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mdc/base/modules/EquipmentAvailCompare/EquipmentAvailCompareMain.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/assets/terminal/login-bg.jpg
@@ -46,10 +46,6 @@ <a-button type="primary" size="large" block :loading="loading" @click="handleLogin">登录</a-button> </a-form-model> <!--<div class="footer">--> <!--<a @click="handleRegister">注册账号</a>--> <!--<a @click="handleForget">忘记密码</a>--> <!--</div>--> </a-card> </div> </div> @@ -192,13 +188,6 @@ callback() } } // handleRegister() { // this.$router.push('/register') // }, // handleForget() { // this.$message.info('请联系管理员重置密码') // } } } </script> @@ -210,7 +199,7 @@ align-items: center; min-height: 100vh; background: linear-gradient(rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7)), url('../../../assets/operator-login-bg.png') no-repeat center; url('../../../assets/terminal/login-bg.jpg') no-repeat center; background-size: cover; .login-container { src/views/mdc/base/equipmentAvailCompare.vue
@@ -38,14 +38,9 @@ data() { return { activeKey: '1', description: '设备信息', selectEquipmentId: '', selectEquipment: {}, selectPeople: {}, selectTypeTree: '', url: { equipmentStatistics: '/mdc/equipment/equipmentStatistics' }, isDepartType: '' } }, @@ -64,7 +59,6 @@ description: res.message }) } }).finally(() => { }) }, tabChange(val) { src/views/mdc/base/equipmentDayAvail.vue
@@ -1,6 +1,5 @@ <template> <a-card :bordered="false"> <div style="width: 100%; height: 100%;overflow: hidden"> <a-row type="flex" :gutter="16"> <a-col :md="5"> <a-tabs :activeKey="activeKey" @change="tabChange"> @@ -16,7 +15,6 @@ <equipment-day-avail-main ref="equipmentDayAvailMain" :nodeTree='selectEquipment' :nodePeople='selectPeople' :Type="selectTypeTree"></equipment-day-avail-main> </a-col> </a-row> </div> </a-card> </template> @@ -36,14 +34,9 @@ data() { return { activeKey: '1', description: '设备信息', selectEquipmentId: '', selectEquipment: {}, selectPeople:{}, selectTypeTree: '', url: { equipmentStatistics: '/mdc/equipment/equipmentStatistics' }, isDepartType:'', } }, @@ -57,17 +50,14 @@ 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) { // console.log(val) this.activeKey = val this.selectTypeTree = val }, @@ -82,7 +72,3 @@ } } </script> <style scoped> </style> src/views/mdc/base/modules/EquipmentAvailCompare/EquipmentAvailCompareMain.vue
@@ -1,31 +1,31 @@ <template> <a-spin :spinning="loading"> <div :bordered="false" class="device_list"> <div class="com_box"> <div class="device_list"> <!-- 查询区域 --> <div style="width: 100%; background-color: #fff" class="table-page-search-wrapper"> <div style="background-color: #fff" class="table-page-search-wrapper"> <a-form layout="inline" @keyup.enter.native="searchQuery"> <a-row :gutter="24"> <a-col :md="4" :sm="4"> <a-form-item label="设备编号"> <a-input placeholder="输入设备编号查询" :readOnly="readOnly" v-model="queryParams.equipmentId"></a-input> <a-input placeholder="输入设备编号查询" readOnly v-model="queryParams.equipmentId"></a-input> </a-form-item> </a-col> <a-col :md="4" :sm="4"> <a-col :md="5" :sm="5"> <a-form-item label="设备名称"> <a-input placeholder="输入设备名称查询" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input> <a-input placeholder="输入设备名称查询" readOnly v-model="queryParams.equipmentName"></a-input> </a-form-item> </a-col> <a-col :md="5" :sm="5" :xs="5"> <a-col :md="6" :sm="6" :xs="6"> <a-form-item label="时间"> <a-range-picker @change="dateParamChange" v-model="dates" format="YYYYMMDD" :allow-clear="false"/> </a-form-item> </a-col> <a-col :md="6" :sm="6" :xs="6"> <a-form-item label="时间段"> <a-time-picker :default-value="moment('00:00', 'HH:mm')" format="HH:mm" @change="onChangeStart" :allow-clear="false"/> <a-time-picker :default-value="moment('00:00', 'HH:mm')" format="HH:mm" @change="onChangeStart" :allow-clear="false"/> 至 <a-time-picker :default-value="moment('08:00', 'HH:mm')" format="HH:mm" @change="onChangeEnd" :allow-clear="false"/> <a-time-picker :default-value="moment('08:00', 'HH:mm')" format="HH:mm" @change="onChangeEnd" :allow-clear="false"/> </a-form-item> </a-col> <a-col :md="2" :sm="3" :xs="3"> @@ -34,16 +34,11 @@ </a-row> </a-form> </div> <!-- table区域-begin --> <div id="DeviceList"> <div style="padding: 5px;width: 100%;height: 100%"> <a-spin :spinning="spinning"> <div style="width: 100%;height: 100%" id="dayAvailBar"></div> </div> </div> <!-- table区域-end --> </div> </div> </a-spin> </div> </template> <script> @@ -51,77 +46,65 @@ import { getAction } from '@/api/manage' export default { name: 'equipmentAvailCompareMain', name: 'EquipmentAvailCompareMain', props: { nodeTree: '', Type: '', nodePeople: '' }, data() { return { activeKey: '1', typeTree: '', typeParent: 1, typeEquipment: 1, spaceTime: [], usingRates: [], dates: [], readOnly: true, queryParam: {}, queryParams: {}, queryParamEquip: {}, queryParamPeople: {}, url: { dayUtilizationRateContrast: '/mdc/efficiencyReport/dayUtilizationRateContrast', getEquipmentByPid: '/mdc/mdcEquipment/getEquipmentByPid', getEquipmentByDepPid: '/mdc/mdcEquipment/getEquipmentByDepPid' }, AnalysisList: {}, loading: false spinning: false } }, watch: { Type(valmath) { this.dataList = [] this.queryParams.typeTree = valmath // console.log(this.queryParams.typeTree) }, nodeTree(val) { //监听currSelected 变化，将变化后的数值传递给 getCurrSelected 事件 if (JSON.stringify(val) != '{}') { if (val.equipmentId) { // this.$set(this.queryParam, 'tierName', val.title) this.queryParamEquip.parentId = '' this.queryParams.equipmentId = val.equipmentId this.queryParams.equipmentName = val.equipmentName this.queryParamEquip.equipmentId = val.equipmentId this.searchQuery() } else { // this.$set(this.queryParam, 'tierName', val.title) this.queryParamEquip.parentId = val.key this.queryParams.equipmentId = '' this.initEquipment(val.key) } } }, nodePeople(val) { if (JSON.stringify(val) != '{}') { if (val.equipmentId) { // this.$set(this.queryParam, 'tierName', val.title) this.queryParamEquip.parentId = '' this.queryParams.equipmentId = val.equipmentId this.queryParamEquip.equipmentId = val.equipmentId this.searchQuery() } else { // this.$set(this.queryParam, 'tierName', val.title) this.queryParamEquip.parentId = val.key this.queryParams.equipmentId = '' this.initEquipmentDep(val.key) } } } }, methods: { drawTu() { let dayAvailBar = this.$echarts.init(document.getElementById('dayAvailBar'), 'macarons') //dayAvailLine = echarts.init(document.getElementById('dayAvailLine')); let dayAvailBarOption = { title: { text: '设备日利用率图', @@ -186,37 +169,25 @@ moment, onChangeStart(time, timeString) { this.queryParam.startTime = timeString // console.log(time, timeString); }, onChangeEnd(time, timeString) { this.queryParam.endTime = timeString // console.log(time, timeString); }, disabledDate(current) { //Can not slect days before today and today return current && current > moment().subtract('days', 1) }, dataChange(val) { if (val) this.queryParam.dateTime = val.format('YYYYMMDD') }, handleChange(value) { this.queryParam.timeType = value // console.log(this.queryParam.timeType) }, tabChange(val) { this.activeKey = val }, dateParamChange(v1, v2) { // console.log(v1,v2) this.queryParam.startDate = v2[0] this.queryParam.endDate = v2[1] // console.log(v2[0],v2[1]) }, loadAnalysis() { this.loading = true this.spaceTime = [] this.usingRates = [] this.spinning = true getAction(this.url.dayUtilizationRateContrast, this.queryParam).then(res => { if (res.success) { this.spaceTime.push(res.result.dataList) this.spaceTime = res.result.dateList for (let i = 0; i < res.result.dayRateDto.length; i++) { this.usingRates.push(res.result.dayRateDto[i].utilizationRate) } @@ -225,7 +196,7 @@ this.$message.warning(res.message) } }).finally(() => { this.loading = false this.spinning = false }) }, numFilter(value) { @@ -236,118 +207,12 @@ } }, searchQuery() { this.loading = true this.spaceTime = [] this.usingRates = [] if (this.queryParams.typeTree == '1') { this.queryParams.parentId = this.queryParamEquip.parentId // this.queryParams.equipmentId = this.queryParamEquip.equipmentId } else { this.queryParams.parentId = this.queryParamEquip.parentId // this.queryParams.equipmentId = "" } this.AnalysisList = [] //获取查询条件 this.queryParam.parentId = this.queryParams.parentId this.queryParam.equipmentId = this.queryParams.equipmentId this.queryParam.typeTree = this.queryParams.typeTree getAction(this.url.dayUtilizationRateContrast, this.queryParam).then((res) => { if (res.success) { this.spaceTime = res.result.dateList for (let i = 0; i < res.result.dayRateDto.length; i++) { // res.result[i].useRateDayShift = this.numFilter(res.result[i].useRateDayShift) this.usingRates.push(this.numFilter(res.result.dayRateDto[i].utilizationRate)) } this.drawTu() } else { // this.$message.warning(res.message) this.$notification.warning({ message: '消息', description: res.message }) } }).finally(() => { this.loading = false }) }, searchReset() { this.loading = true this.spaceTime = [] this.usingRates = [] if (this.queryParams.typeTree == '1') { this.typeTree = this.queryParams.typeTree this.typeParent = this.queryParams.parentId this.typeEquipment = this.queryParams.equipmentId this.queryParams = {} this.queryParam = {} this.queryParams.typeTree = this.typeTree this.queryParams.parentId = this.typeParent if (this.queryParams.parentId != '') { this.queryParams.equipmentId = '' this.initEquipment() } else { if (this.queryParams.equipmentId == this.queryParamEquip.equipmentId) { this.queryParams.equipmentId = this.typeEquipment } else { this.queryParams.equipmentId = this.queryParamEquip.equipmentId } } getAction(this.url.dayUtilizationRateContrast, this.queryParams).then((res) => { if (res.success) { this.spaceTime = res.result.dateList for (let i = 0; i < res.result.dayRateDto.length; i++) { this.usingRates.push(this.numFilter(res.result.dayRateDto[i].utilizationRate)) } this.drawTu() } else { // this.$message.warning(res.message) this.$notification.warning({ message: '消息', description: res.message }) } }).finally(() => { this.loading = false }) } else { this.typeTree = this.queryParams.typeTree this.typeParent = this.queryParams.parentId this.typeEquipment = this.queryParams.equipmentId this.queryParams = {} this.queryParam = {} this.dates = [] this.queryParams.typeTree = this.typeTree this.queryParams.parentId = this.typeParent if (this.queryParams.parentId != '') { this.queryParams.equipmentId = '' this.initEquipment() } else { if (this.queryParams.equipmentId == this.queryParamEquip.equipmentId) { this.queryParams.equipmentId = this.typeEquipment } else { this.queryParams.equipmentId = this.queryParamEquip.equipmentId } } getAction(this.url.dayUtilizationRateContrast, this.queryParams).then((res) => { if (res.success) { this.spaceTime = res.result.dateList for (let i = 0; i < res.result.dayRateDto.length; i++) { this.usingRates.push(this.numFilter(res.result.dayRateDto[i].utilizationRate)) } this.drawTu() } else { // this.$message.warning(res.message) this.$notification.warning({ message: '消息', description: res.message }) } }).finally(() => { this.loading = false }) } this.loadAnalysis() }, initEquipment(id) { let _this = this @@ -361,16 +226,13 @@ _this.searchQuery() } else { this.queryParams = {} // this.queryList() this.equipment = {} // _this.$message.warning('请联系管理员，开放设备权限！') _this.$notification.warning({ message: '消息', description: '请联系管理员，开放设备权限！' }) } } else { // this.$message.warning(res.message) _this.$notification.warning({ message: '消息', description: res.message @@ -390,9 +252,7 @@ _this.searchQuery() } else { this.queryParams = {} // this.queryList() this.equipment = {} // _this.$message.warning('请联系管理员，开放设备权限！') _this.$notification.warning({ message: '消息', description: '请联系管理员，开放设备权限！' @@ -415,67 +275,52 @@ this.queryParam.startTime = '00:00' this.queryParam.endTime = '08:00' this.queryParams.typeTree = '1' }, mounted() { this.initEquipment() } }, } </script> <style lang="less" scoped> /*@import '~@assets/less/common.less';*/ .device_list { display: flex; flex-direction: column; /deep/ .ant-spin-nested-loading { flex: 1; .ant-spin-container { height: 100%; } } } @media screen and (min-width: 1920px) { .device_list { height: 811px !important; overflow: auto; } } @media screen and (min-width: 1680px) and (max-width: 1920px) { .device_list { height: 811px !important; overflow: auto; } } @media screen and (min-width: 1400px) and (max-width: 1680px) { .device_list { height: 663px !important; overflow: auto; } } @media screen and (min-width: 1280px) and (max-width: 1400px) { .device_list { height: 564px !important; overflow: auto; } } @media screen and (max-width: 1280px) { .device_list { height: 564px !important; overflow: auto; } } /deep/ .ant-card-body { height: 100% !important; } .device_list .com_box { display: flex !important; height: 100% !important; flex-direction: column !important; } .device_list .table-page-search-wrapper { height: 6% !important; } .device_list #DeviceList { height: 90% !important; } </style> src/views/mdc/base/modules/EquipmentDayAvail/EquipmentDayAvailMain.vue
@@ -1,30 +1,28 @@ <template> <a-spin :spinning="loading"> <div :bordered="false" class="device_list"> <div class="com_box"> <div class="device_list"> <!-- 查询区域 --> <div style="width: 100%; background-color: #fff" class="table-page-search-wrapper"> <div style=" background-color: #fff" class="table-page-search-wrapper"> <a-form layout="inline" @keyup.enter.native="searchQuery"> <a-row :gutter="24"> <a-col :md="4" :sm="4"> <a-form-item label="设备编号"> <a-input placeholder="输入设备编号查询" :readOnly="readOnly" v-model="queryParams.equipmentId"></a-input> <a-input placeholder="输入设备编号查询" readOnly v-model="queryParams.equipmentId"></a-input> </a-form-item> </a-col> <a-col :md="4" :sm="4"> <a-col :md="5" :sm="5"> <a-form-item label="设备名称"> <a-input placeholder="输入设备名称查询" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input> <a-input placeholder="输入设备名称查询" readOnly v-model="queryParams.equipmentName"></a-input> </a-form-item> </a-col> <a-col :md="4" :sm="4" :xs="4"> <a-form-item label="日期"> <a-date-picker v-model="queryParam.dateTime" :disabledDate="disabledDate" format='YYYYMMDD' :allow-clear="false" @change="dataChange"/> <a-date-picker v-model="queryParam.dateTime" :disabledDate="disabledDate" :allow-clear="false" value-format="YYYYMMDD"/> </a-form-item> </a-col> <a-col :md="4" :sm="4" :xs="4"> <a-form-item label="间隔"> <a-select default-value="2" style="width: 140px" v-model="queryParam.timeType"> <a-select default-value="2" v-model="queryParam.timeType"> <a-select-option :value="2"> 2 </a-select-option> @@ -38,8 +36,10 @@ 6 </a-select-option> </a-select> 小时 </a-form-item> </a-col> <a-col :md="1" :sm="1" :xs="1"> <a-form-item label="">小时</a-form-item> </a-col> <a-col :md="3" :sm="3" :xs="3"> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button> @@ -47,17 +47,11 @@ </a-row> </a-form> </div> <!-- table区域-begin --> <div id="DeviceList"> <div style="padding: 5px;width: 100%;height: 100%"> <a-spin :spinning="spinning"> <div style="width: 100%;height: 100%" id="dayAvailBar"></div> </div> </div> <!-- table区域-end --> </div> </div> </a-spin> </div> </template> <script> @@ -65,84 +59,62 @@ import { getAction } from '@/api/manage' export default { name: 'equipmentDayAvailMain', components: { }, name: 'EquipmentDayAvailMain', props: { nodeTree: '', Type: '', nodePeople: '' }, data() { return { activeKey: '1', typeTree: '', typeParent: 1, typeEquipment: 1, spaceTime: [], useingRates: [], dates: [], xianshi: '', readOnly: true, usingRates: [], queryParam: { dateTime: undefined, timeType: '2' }, queryParams: {}, queryParamEquip: {}, queryParamPeople: {}, dataStartsoucre: [], url: { comparativeAnalysis: '/mdc/efficiencyReport/comparativeAnalysis', dayUtilizationRate: '/mdc/efficiencyReport/dayUtilizationRate', getEquipmentByPid: '/mdc/mdcEquipment/getEquipmentByPid', getEquipmentByDepPid: '/mdc/mdcEquipment/getEquipmentByDepPid' }, AnalysisList: {}, loading: false spinning: false } }, watch: { Type(valmath) { this.dataList = [] this.queryParams.typeTree = valmath // console.log(this.queryParams.typeTree) }, nodeTree(val) { //监听currSelected 变化，将变化后的数值传递给 getCurrSelected 事件 if (JSON.stringify(val) != '{}') { if (val.equipmentId) { // this.$set(this.queryParam, 'tierName', val.title) this.queryParamEquip.parentId = '' this.queryParams.equipmentId = val.equipmentId this.queryParams.equipmentName = val.equipmentName console.log('XXXval=', val) this.queryParamEquip.equipmentId = val.equipmentId this.searchQuery() } else { // this.$set(this.queryParam, 'tierName', val.title) this.queryParamEquip.parentId = val.key this.queryParams.equipmentId = '' this.initEquipment(val.key) } } }, nodePeople(val) { if (JSON.stringify(val) != '{}') { if (val.equipmentId) { // this.$set(this.queryParam, 'tierName', val.title) this.queryParamEquip.parentId = '' this.queryParams.equipmentId = val.equipmentId this.queryParamEquip.equipmentId = val.equipmentId this.searchQuery() } else { // this.$set(this.queryParam, 'tierName', val.title) this.queryParamEquip.parentId = val.key this.queryParams.equipmentId = '' this.initEquipmentDep(val.key) } } } }, methods: { moment, drawTu() { let dayAvailBar = this.$echarts.init(document.getElementById('dayAvailBar'), 'macarons') let dayAvailBarOption = { @@ -194,7 +166,7 @@ color: '#4169E1' } }, data: this.useingRates, data: this.usingRates, markPoint: { data: [ { type: 'max', name: '最大值', symbolSize: 70 }, @@ -205,34 +177,22 @@ ] } dayAvailBar.setOption(dayAvailBarOption) window.addEventListener('resize', () => dayAvailBar.resize()) }, disabledDate(current) { //Can not slect days before today and today return current && current > moment().subtract('days', 1) }, dataChange(val) { this.queryParam.dateTime = val.format('YYYYMMDD') }, handleChange(value) { this.queryParam.timeType = value // console.log(this.queryParam.timeType) }, tabChange(val) { this.activeKey = val }, dateParamChange(v1, v2) { // console.log(v1,v2) this.queryParam.startTime = v2[0] this.queryParam.endTime = v2[1] // console.log(v2[0],v2[1]) }, loadAnalysis() { this.loading = true this.spaceTime = [] this.usingRates = [] this.spinning = true getAction(this.url.dayUtilizationRate, this.queryParam).then(res => { if (res.success) { this.spaceTime.push(res.result.dataList) this.spaceTime = res.result.dateList for (var i = 0; i < res.result.dayRateDto.length; i++) { this.useingRates.push(res.result.dayRateDto[i].utilizationRate) this.usingRates.push(res.result.dayRateDto[i].utilizationRate) } this.drawTu() } else { @@ -242,7 +202,7 @@ }) } }).finally(() => { this.loading = false this.spinning = false }) }, numFilter(value) { @@ -253,44 +213,16 @@ } }, searchQuery() { if (this.queryParam.dateTime) { this.loading = true this.spaceTime = [] this.useingRates = [] if (this.queryParams.typeTree == '1') { this.queryParams.parentId = this.queryParamEquip.parentId // this.queryParams.equipmentId = this.queryParamEquip.equipmentId } else { this.queryParams.parentId = this.queryParamEquip.parentId // this.queryParams.equipmentId = "" } this.AnalysisList = [] //获取查询条件 this.queryParam.parentId = this.queryParams.parentId this.queryParam.equipmentId = this.queryParams.equipmentId this.queryParam.typeTree = this.queryParams.typeTree getAction(this.url.dayUtilizationRate, this.queryParam).then((res) => { if (res.success) { this.spaceTime = res.result.dateList for (var i = 0; i < res.result.dayRateDto.length; i++) { this.useingRates.push(this.numFilter(res.result.dayRateDto[i].utilizationRate)) } this.drawTu() } else { this.$notification.warning({ message: '消息', description: res.message }) } }).finally(() => { this.loading = false }) } else { this.$notification.warning({ message: '消息', description: '请选择时间' }) } this.loadAnalysis() }, initEquipment(id) { let _this = this @@ -347,75 +279,54 @@ } }, created() { let collectTime = moment(moment().add(-1, 'd'), 'YYYY-MM-DD') this.queryParams.collectTime = collectTime this.queryParam.dateTime = this.queryParams.collectTime.format('YYYYMMDD') this.queryParam.dateTime = moment().add(-1, 'd').format('YYYYMMDD') this.queryParams.typeTree = '1' this.initEquipment() } } </script> <style lang="less" scoped> /*@import '~@assets/less/common.less';*/ .device_list { display: flex; flex-direction: column; /deep/ .ant-spin-nested-loading { flex: 1; .ant-spin-container { height: 100%; } } } @media screen and (min-width: 1920px) { .device_list { height: 811px !important; overflow: auto; } } @media screen and (min-width: 1680px) and (max-width: 1920px) { .device_list { height: 811px !important; overflow: auto; } } @media screen and (min-width: 1400px) and (max-width: 1680px) { .device_list { height: 663px !important; overflow: auto; } } @media screen and (min-width: 1280px) and (max-width: 1400px) { .device_list { height: 564px !important; overflow: auto; } } @media screen and (max-width: 1280px) { .device_list { height: 564px !important; overflow: auto; } } /*.device_list{*/ /*display: flex;*/ /*}*/ /*.device_list .table-page-search-wrapper{*/ /**/ /*}*/ /deep/ .ant-card-body { height: 100% !important; } .device_list .com_box { display: flex !important; height: 100% !important; flex-direction: column !important; } .device_list .table-page-search-wrapper { height: 6% !important; } .device_list #DeviceList { height: 90% !important; } </style>
