bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并冲突

This commit is contained in:
BianLzhaoMin 2024-05-14 15:54:22 +08:00
parent 5316d97e2b 0ce4cc37be
commit 2a284b8d52
11 changed files with 85 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
View File

@ -647,6 +647,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt ON sad.type_id = mt.type_id
AND mt.`level` = '4'
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
LEFT JOIN tm_task tt ON tt.task_id = sad.task_id
WHERE
sad.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00' ) AND CONCAT(#{endDate}, ' 23:59:59' )

3
sgzb-screen/config/index.js
View File

@ -22,7 +22,8 @@ module.exports = {
'/screen': {
// target: 'http://112.29.103.165:21626',//重庆
// target: 'http://192.168.0.14:21624',//测试
target: 'http://10.40.92.140:28080',
// target: 'http://112.29.103.165:21624/', //宁夏
target: 'http://10.40.92.138:28080',
changeOrigin: true,
// secure: true, //如果是https接口，需要配置这个参数
pathRewrite: {

86
sgzb-screen/src/App.vue
View File

@ -21,16 +21,14 @@ export default {
<style lang="less">
.el-dialog {
// 背景色透明
background-color: rgba(0, 0, 0, 0.5);
// background-color: transparent;
// background-color: #000;
background-image: url('./assets/img/dialog/window.png');
background-size: 100% 100%;
background-repeat: no-repeat;
background: rgba(0, 0, 0, 0.5) !important;
background-image: url('./assets/img/dialog/window.png') !important;
background-size: 100% 100% !important;
background-repeat: no-repeat !important;
.el-dialog__headerbtn {
width: 83px;
height: 44px;
background-image: url('./assets/img/dialog/icon_close.png');
background-image: url('./assets/img/dialog/icon_close.png') !important;
background-size: cover;
// 去除原来的 x 按钮
.el-dialog__close {
@ -38,81 +36,81 @@ export default {
}
}
.el-form-item__label {
color: #fff;
color: #fff !important;
}
.el-table th {
// #253855 #30619B 背景色从上到下渐变
background: linear-gradient(to bottom, #2B313D, #3267A7);
color: #fff;
background: linear-gradient(to bottom, #2B313D, #3267A7) !important;
color: #fff !important;
border-bottom: 1px solid #84FCFD !important;
}
.el-table tr {
background-color: #335684;
color: #fff;
background-color: #335684 !important;
color: #fff !important;
}
.el-table--striped .el-table__body tr.el-table__row--striped td {
background-color: #25447D;
color: #fff;
background-color: #25447D !important;
color: #fff !important;
}
.el-table td,.building-top .el-table th.is-leaf {
border-bottom: 1px solid #6983A5;
border-bottom: 1px solid #6983A5 !important;
}
.el-table::before{
border-bottom: 1px solid #6983A5;
background-color: #6983A5;
height: 1px;
border-bottom: 1px solid #6983A5 !important;
background-color: #6983A5 !important;
height: 1px !important;
}
.el-table--enable-row-hover .el-table__body tr:hover>td {
background-color: #6983A5;
background-color: #6983A5 !important;
}
.el-pagination__total {
color: #E1E3E6;
color: #E1E3E6 !important;
}
.el-pagination__jump {
color: #E1E3E6;
color: #E1E3E6 !important;
}
.el-input__inner {
background-color: transparent;
border: 1px solid #77E2E7;
color: #E1E3E6;
background-color: transparent !important;
border: 1px solid #77E2E7 !important;
color: #E1E3E6 !important;
}
.el-pagination__sizes .el-input .el-input__inner {
color: #E3E4E7;
border: 1px solid #E3E4E7;
color: #E3E4E7 !important;
border: 1px solid #E3E4E7 !important;
}
.el-pagination__editor.el-input .el-input__inner {
color: #E3E4E7;
border: 1px solid #E3E4E7;
color: #E3E4E7 !important;
border: 1px solid #E3E4E7 !important;
}
.el-pagination.is-background .btn-prev, .el-pagination.is-background .el-pager li {
color: #E3E4E7;
border: 1px solid #E3E4E7;
background-color: transparent;
color: #E3E4E7 !important;
border: 1px solid #E3E4E7 !important;
background-color: transparent !important;
}
.el-pagination.is-background .btn-next {
color: #E3E4E7;
border: 1px solid #E3E4E7;
background-color: transparent;
color: #E3E4E7 !important;
border: 1px solid #E3E4E7 !important;
background-color: transparent !important;
}
.el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #98F4FB;
color: #000;
background-color: #98F4FB !important;
color: #000 !important;
}
.el-button--primary {
background-color: #84FCFD;
border: #84FCFD;
color: #285050;
background-color: #84FCFD !important;
border: #84FCFD !important;
color: #285050 !important;
}
.el-button--default {
background-color: transparent;
border: 1px solid #84FCFD;
color: #D5D6DA;
background-color: transparent !important;
border: 1px solid #84FCFD !important;
color: #D5D6DA !important;
}
.el-table__empty-block {
background-color: #335684;
background-color: #335684 !important;
.el-table__empty-text {
color: #D5D6DA;
color: #D5D6DA !important;
}
}
}

12
sgzb-screen/src/components/home/centerFold.vue
View File

@ -87,7 +87,7 @@ export default {
getTotalOwnershipApi().then(res => {
this.newArrOne.push(
{ name: '施工机具总保有量', value: res.data[0].totalOwnershipNum },
// { url: GROUP, name: '工器具总保有量', value: res.data[1].totalOwnershipNum },
{ url: GROUP, name: '工器具总保有量', value: res.data[1].totalOwnershipNum },
)
this.newArr.push(
{ url: GROUP, name: '在库机具', value: res.data[0].stockNum },
@ -95,11 +95,11 @@ export default {
{ url: GROUP, name: '在用机具', value: res.data[0].useNum },
{ url: GROUP, name: '在修机具', value: res.data[0].repairNum },
{ url: GROUP, name: '报废机具', value: res.data[0].scrapNum },
// { url: GROUP, name: '在库工器具', value: res.data[1].stockNum },
// { url: GROUP, name: '待入库工器具', value: res.data[1].storedNum },
// { url: GROUP, name: '在用工器具', value: res.data[1].useNum },
// { url: GROUP, name: '在修工器具', value: res.data[1].repairNum },
// { url: GROUP, name: '报废工器具', value: res.data[1].scrapNum },
{ url: GROUP, name: '在库工器具', value: res.data[1].stockNum },
{ url: GROUP, name: '待入库工器具', value: res.data[1].storedNum },
{ url: GROUP, name: '在用工器具', value: res.data[1].useNum },
{ url: GROUP, name: '在修工器具', value: res.data[1].repairNum },
{ url: GROUP, name: '报废工器具', value: res.data[1].scrapNum },
)
})
},

13
sgzb-screen/src/components/home/countFlopOne.vue
View File

@ -40,7 +40,8 @@ export default {
return {
value: [],
numberList: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
compKey: 0
compKey: 0,
maType: ''
};
},
props: ["val", "suffix", 'sonTitle'],
@ -52,12 +53,18 @@ export default {
},
mounted() {
this.value = this.val.toString().split("");
this.$eventBus.$on('maType', (maType) => {
this.maType = maType
});
},
destroyed() {
this.$eventBus.$off('maType');
},
methods: {
handleClick(val) {
handleClick() {
const params = {
open: true,
maType: val
maType: this.maType
}
this.$refs.materialsDialog.setOpen(params);
}

13
sgzb-screen/src/components/home/countFlopTwo.vue
View File

@ -41,7 +41,8 @@ export default {
return {
value: [],
numberList: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
compKey: 0
compKey: 0,
maType: ''
};
},
props: ["val", "suffix", 'sonTitle'],
@ -53,12 +54,18 @@ export default {
},
mounted() {
this.value = this.val.toString().split("");
this.$eventBus.$on('maType', (maType) => {
this.maType = maType
});
},
destroyed() {
this.$eventBus.$off('maType');
},
methods: {
handleClick(val) {
handleClick() {
const params = {
open: true,
maType: val
maType: this.maType
}
this.$refs.returnMaterialsDialog.setOpen(params);
}

1
sgzb-screen/src/components/home/getMaterialsDialog.vue
View File

@ -166,6 +166,7 @@ export default {
setOpen(params) {
this.open = params.open
this.maType = params.maType
console.log('🚀 ~ setOpen ~ this.maType:', this.maType);
this.tableData = []
this.total = 0
setTimeout(() => {

4
sgzb-screen/src/components/home/leftOne.vue
View File

@ -5,9 +5,9 @@
<h5 class="access-rate-box-title">领料数据</h5>
</div>
<CountFlopOne :val="num" sonTitle="施工机具今日出库"></CountFlopOne>
<!-- <div class="access-rate-box-top">
<div class="access-rate-box-top">
<CountFlopOne :val="num2" sonTitle="工器具今日出库"></CountFlopOne>
</div> -->
</div>
</div>
</div>
</template>

4
sgzb-screen/src/components/home/leftTwo.vue
View File

@ -5,9 +5,9 @@
<h5 class="access-rate-box-title">退料数据</h5>
</div>
<CountFlopTwo :val="num" sonTitle="施工机具今日入库"></CountFlopTwo>
<!-- <div class="access-rate-box-top">
<div class="access-rate-box-top">
<CountFlopTwo :val="num2" sonTitle="工器具今日退料"></CountFlopTwo>
</div> -->
</div>
</div>
</div>
</template>

16
sgzb-screen/src/views/Home/index.vue
View File

@ -8,8 +8,8 @@
<div class="leftModuleBox">
<LeftOne></LeftOne>
<LeftTwo></LeftTwo>
<!-- <LeftThree></LeftThree> -->
<LeftFour></LeftFour>
<LeftThree></LeftThree>
<!-- <LeftFour></LeftFour> -->
</div>
@ -20,14 +20,14 @@
</div>
<div class="center-top">
<!-- 宁夏地图 -->
<!-- <CountryMap></CountryMap> -->
<CountryMap></CountryMap>
<!-- 重庆地图 -->
<Center3DMap></Center3DMap>
<!-- <Center3DMap></Center3DMap> -->
</div>
<div class="center-bottom">
<CenterBottom></CenterBottom>
</div>
<!-- <div class="buttom-box">
<div class="buttom-box">
<div class="buttonTop">
<div
:class="maType == 1 ? 'on' : ''"
@ -44,15 +44,15 @@
工器具
</div>
</div>
</div> -->
</div>
</div>
<!-- 右侧数据模块列表 -->
<div class="rightModuleBox">
<RightOne></RightOne>
<rightTwo></rightTwo>
<rightThree></rightThree>
<LeftThree></LeftThree>
<!-- <RightFour></RightFour> -->
<!-- <LeftThree></LeftThree> -->
<RightFour></RightFour>
</div>
</div>
<!-- 获取天气 -->

1
sgzb-ui/src/views/dashboard.vue
View File

@ -17,6 +17,7 @@
methods: {
openNewWindow() {
window.open('http://192.168.0.14:21624/index01.html?token='+localStorage.getItem('token'), '_blank');
// window.open('http://112.29.103.165:21624/index01.html?token='+localStorage.getItem('token'), '_blank'); // 产线
}
}
};