中建四-页面调整

This commit is contained in:
yjl 2023-03-07 16:00:40 +08:00
parent 8244891251
commit 2c392d75a3
5 changed files with 72 additions and 94 deletions

View File

@ -66,7 +66,7 @@ export default new Vuex.Store({
// UPLOADURL: 'http://124.71.67.160:8088/upload/image', // UPLOADURL: 'http://124.71.67.160:8088/upload/image',
// FILEURL: 'http://124.71.67.160:8088/image/', // FILEURL: 'http://124.71.67.160:8088/image/',
//--- //---
// UPLOADURL: 'http://192.168.34.125:6023/upload/image', // UPLOADURL: 'http://192.168.34.125:6023/upload/i·mage',
// FILEURL: 'http://192.168.34.125:6023/image/', // FILEURL: 'http://192.168.34.125:6023/image/',
// UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式

View File

@ -3,6 +3,7 @@
<div class="monitor"> <div class="monitor">
<div class="listLeft"> <div class="listLeft">
<el-date-picker <el-date-picker
style="cursor: pointer"
@change="credad" @change="credad"
v-model="shootingTime" v-model="shootingTime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"

View File

@ -11,6 +11,7 @@
> >
</el-date-picker> --> </el-date-picker> -->
<el-date-picker <el-date-picker
style="cursor: pointer"
v-model="timeValue" v-model="timeValue"
type="daterange" type="daterange"
size="small" size="small"

View File

@ -1,8 +1,8 @@
<template> <template>
<Card title="材料进场记录"> <Card title="材料进场记录">
<div class="box"> <div class="box">
<el-date-picker <el-date-picker
style="cursor: pointer"
@change="checkTypes" @change="checkTypes"
v-model="entryTime" v-model="entryTime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@ -57,9 +57,7 @@
<!-- 列表点击弹框 --> <!-- 列表点击弹框 -->
<div class="informationDialog" v-show="isShow"> <div class="informationDialog" v-show="isShow">
<div class="titleText" > <div class="titleText">材料进场记录</div>
材料进场记录
</div>
<div class="content"> <div class="content">
<div>进场时间{{ tableDataTest.entryTime }}</div> <div>进场时间{{ tableDataTest.entryTime }}</div>
<div>材料类型{{ tableDataTest.materialType }}</div> <div>材料类型{{ tableDataTest.materialType }}</div>
@ -67,23 +65,20 @@
<div>进场量{{ tableDataTest.approachVolume }}</div> <div>进场量{{ tableDataTest.approachVolume }}</div>
<div>车牌号{{ tableDataTest.licensePlateNumber }}</div> <div>车牌号{{ tableDataTest.licensePlateNumber }}</div>
</div> </div>
</div> </div>
</Card> </Card>
</template> </template>
<script> <script>
import Card from "../components/Card.vue"; import Card from '../components/Card.vue'
import { import { getApproachRecordListApi } from '@/assets/js/api/materialManage'
getApproachRecordListApi
} from "@/assets/js/api/materialManage";
export default { export default {
components: { components: {
Card, Card
}, },
data() { data() {
return { return {
sn: "", sn: '',
tableData: [], tableData: [],
entryTime: '', entryTime: '',
// tableData: [ // tableData: [
@ -177,7 +172,7 @@ export default {
nowIndex: -1, nowIndex: -1,
isShow: false, isShow: false,
tableDataTest: {}, tableDataTest: {},
tableDataShow:[], tableDataShow: []
// tableDataShow:[ // tableDataShow:[
// { // {
// showTime:'2023-02-07', // showTime:'2023-02-07',
@ -384,14 +379,14 @@ export default {
// showLicensePlate:'BMT161', // showLicensePlate:'BMT161',
// }, // },
// ], // ],
}; }
}, },
mounted() { mounted() {
this.getList() this.getList()
}, },
methods: { methods: {
checkTypes(val) { checkTypes(val) {
console.log("类型或者时间修改事件值 ", val); console.log('类型或者时间修改事件值 ', val)
this.getList() this.getList()
}, },
// //
@ -399,29 +394,26 @@ export default {
getApproachRecordListApi({ getApproachRecordListApi({
projectSn: this.$store.state.projectSn, projectSn: this.$store.state.projectSn,
entryTime: this.entryTime entryTime: this.entryTime
}).then(res=>{ }).then((res) => {
console.log('材料进场数据查询',res); console.log('材料进场数据查询', res)
if (res) { if (res) {
this.tableData = res.result this.tableData = res.result
this.tableDataShow = res.result this.tableDataShow = res.result
} }
}) })
}, },
// //
showBtn(index) { showBtn(index) {
this.nowIndex = index; this.nowIndex = index
this.isShow = true this.isShow = true
this.tableDataTest = this.tableDataShow[index] this.tableDataTest = this.tableDataShow[index]
}, },
// //
mouseLeave() { mouseLeave() {
this.isShow = false this.isShow = false
}, }
}
}
},
};
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@ -510,7 +502,6 @@ export default {
margin-bottom: 15px; margin-bottom: 15px;
} }
} }
} }
::v-deep .el-date-editor.el-input, ::v-deep .el-date-editor.el-input,
.el-date-editor.el-input__inner { .el-date-editor.el-input__inner {
@ -518,14 +509,12 @@ export default {
margin-left: 420px; margin-left: 420px;
margin-top: 10px; margin-top: 10px;
color: #fff !important; color: #fff !important;
} }
::v-deep .el-input__inner { ::v-deep .el-input__inner {
background: transparent !important ; background: transparent !important ;
border: 1px solid #66d3d8 !important; border: 1px solid #66d3d8 !important;
height: 36px; height: 36px;
color: #fff !important; color: #fff !important;
} }
::v-deep .el-input__icon { ::v-deep .el-input__icon {
line-height: 36px; line-height: 36px;

View File

@ -8,7 +8,7 @@
v-model="typeId" v-model="typeId"
@change="checkTypes" @change="checkTypes"
placeholder="请选择" placeholder="请选择"
style="background: transparent; width: 100px" style="background: transparent; width: 100px; cursor: pointer"
> >
<el-option <el-option
v-for="item in typeList" v-for="item in typeList"
@ -21,6 +21,7 @@
</div> </div>
<div style="margin-left: 20px:cursor: pointer;height:50px"> <div style="margin-left: 20px:cursor: pointer;height:50px">
<el-date-picker <el-date-picker
style="cursor: pointer"
v-model="checkDate" v-model="checkDate"
type="year" type="year"
value-format="yyyy" value-format="yyyy"
@ -92,24 +93,9 @@ export default {
grid: ['18%', '2%', '2%', '2%'], grid: ['18%', '2%', '2%', '2%'],
xData: new Array(12).fill('破产倒闭').map((v, i) => i + 1 + '月'), xData: new Array(12).fill('破产倒闭').map((v, i) => i + 1 + '月'),
yAxis: [ yAxis: {
{ type: 'log'
type: 'value',
scale: true,
name: '偏差比例',
min: 0,
max: 250,
position: 'right',
axisLine: {
lineStyle: {
color: 'red'
}
}, },
axisLabel: {
formatter: '{value} ml'
}
}
],
series: [ series: [
{ {
name: 'BIM模型用量', name: 'BIM模型用量',
@ -139,6 +125,7 @@ export default {
symbolSize: 10, symbolSize: 10,
symbol: 'circle', symbol: 'circle',
smooth: true, smooth: true,
yAxisIndex: 1,
itemStyle: { itemStyle: {
normal: { normal: {
color: 'rgb(206, 190, 69)', color: 'rgb(206, 190, 69)',