jianguan
/
yxt-supervise-gd36524-ui
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2033-11-16

master
guoxing 1 year ago
parent
a9cd9901a9
commit
fe6072aed5
4 changed files with 150 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/views/echarts/barlineEacharts.vue
  2. 2
      src/views/echarts/mixins/resize.js
  3. 14
      src/views/echarts/pieLineEacharts.vue
  4. 173
      src/views/mortgage/index.vue

5
src/views/echarts/barlineEacharts.vue
View File

@ -85,7 +85,7 @@ export default {
legend: {
textStyle: {
color:'#fff',
fontSize:14,
fontSize:16,
padding:[0,10]
},
},
@ -102,6 +102,7 @@ export default {
axisLabel: {
textStyle: {
color:'#fff',
fontSize:16,
}
}
}
@ -117,6 +118,8 @@ export default {
formatter: '{value} 元',
textStyle: {
color:'#fff',
fontSize:18,
}
}
}

2
src/views/echarts/mixins/resize.js
View File

@ -1,4 +1,4 @@
import debounce from '@/utils'
import {debounce} from '@/utils'
export default {
data() {

14
src/views/echarts/pieLineEacharts.vue
View File

@ -80,16 +80,16 @@ export default {
text: this.chartData.pledgeRatePercent+"%",
subtext: "质押率 " + this.chartData.bankPledgeRate + "%",
textStyle:{
fontSize:16,
fontSize:18,
color:this.chartData.state == '2' ? "#ff7e4b" : "#ccc"
},
subtextStyle: {
fontSize: 14,
fontSize: 16,
color: '#bbbaba'
},
textAlign:"center",
x: '34.5%',
x: '30.5%',
y: '43%',
}],
tooltip: {
@ -108,14 +108,14 @@ export default {
y: 'center',
x:"right",
orient: 'vertical',
left:'70%',
left:'62%',
align:'left',
top:'80',
itemGap:30,
padding:[20,0,20,10],
textStyle: {
color:'#fff',
fontSize:14,
fontSize:20,
padding:[0,10]
},
height:'auto',
@ -126,8 +126,8 @@ export default {
{
name:'标签',
type:'pie',
center: ['35%', '50%'],
radius: ['40%', '65%'],
center: ['31%', '50%'],
radius: ['30%', '55%'],
clockwise: false, //饼图的扇区是否是顺时针排布
avoidLabelOverlap: false,
label: {

173
src/views/mortgage/index.vue
View File

@ -94,7 +94,7 @@
<div class="mortgage_top_item_cons_right">
<div class="mortgage_top_item_cons_right_top">
<div class="mortgage_top_item_cons_right_top_video">
<iframe :src="spUrl" width="500" height="230" id="ysOpenDevice" allowfullscreen>
<iframe :src="spUrl" width="500" height="300" id="ysOpenDevice" allowfullscreen>
</iframe>
</div>
<div class="mortgage_top_item_cons_right_top_foor">
@ -120,7 +120,27 @@
</div>
<div class="titele_right"></div>
</div>
<div class="containers">
<div class="banner">
<div class="scroll-list">
<div class="container_item2">
2023-10-19&nbsp;&nbsp;20:05:16&nbsp;&nbsp;&nbsp;&nbsp;<span
class="container_item-tetxt2">365国润四通道摄像头离线解除</span>
</div>
<div class="container_item1">
2023-10-19&nbsp;&nbsp;19:33:21&nbsp;&nbsp;&nbsp;&nbsp;<span>365国润四通道摄像头离线</span>
</div>
<div class="container_item2">
2023-10-16&nbsp;&nbsp;16:13:36&nbsp;&nbsp;&nbsp;&nbsp;<span>365国润三通道摄像头离线解除</span>
</div>
<div class="container_item1">
2023-10-16&nbsp;&nbsp;15:26:12&nbsp;&nbsp;&nbsp;&nbsp;<span>365国润三通道摄像头离线</span>
</div>
</div>
</div>
<!-- <div class="containers" @mouseenter="mEnter" @mouseleave="mLeave" :style="{ transform: `translate(0px,-${scrollTop}px)` }">
<div class="container_item2">
2023-10-19&nbsp;&nbsp;20:05:16&nbsp;&nbsp;&nbsp;&nbsp;<span
class="container_item-tetxt2">365国润四通道摄像头离线解除</span>
@ -131,10 +151,10 @@
<div class="container_item2">
2023-10-16&nbsp;&nbsp;16:13:36&nbsp;&nbsp;&nbsp;&nbsp;<span>365国润三通道摄像头离线解除</span>
</div>
<!-- <div class="container_item1">
<div class="container_item1">
2023-10-16&nbsp;&nbsp;15:26:12&nbsp;&nbsp;&nbsp;&nbsp;<span>365国润三通道摄像头离线</span>
</div> -->
</div>
</div>
</div> -->
</div>
</div>
</div>
@ -184,7 +204,7 @@
货值分析
</div>
<div class="mortgage_bom_item_tit_right">
<el-select v-model="dayValue" placeholder="请选择日期">
<el-select v-model="dayValue" placeholder="请选择日期" @change="dayValueChange">
<el-option v-for="item in day" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@ -203,8 +223,8 @@
库存货值
</div>
<div class="mortgage_bom_item_tit_right">
<span style="margin-right: 20px;border-bottom: solid 1px #58A55C;padding-bottom: 2px;
color: #58A55C;position: absolute;bottom: 12px;" @click="dialogVisible = true">门店市区分布图>></span>
<span style="margin-right: 10px;border-bottom: solid 1px #58A55C;padding-bottom: 2px;
color: #58A55C;position: absolute;bottom: 12px; font-size: 18px;" @click="dialogVisible = true">门店市区分布图>></span>
</div>
</div>
<div class="mortgage_bom_item_cont">
@ -212,7 +232,7 @@
<div v-for="(item,index) in inventoryList" class="mortgage_bom_item_cont_list"
v-show="inventoryList.length>0">
<div class="mortgage_bom_item_cont_list_item" >
<div class="mortgage_bom_item_cont_list_item">
<div class="mortgage_bom_item_cont_list_item_left">{{item.name}}</div>
<div class="mortgage_bom_item_cont_list_item_right">{{item.amount}}元</div>
</div>
@ -220,7 +240,7 @@
</div>
<div style="width: 100%;height:300px; text-align: center;margin-top: 100px;
font-size: 18px;font-weight: 600;font-family: sans-serif;
font-size: 30px;font-weight: 600;font-family: sans-serif;
color: #ccc;" v-show="inventoryList.length==0">当日无数据</div>
<!-- <div class="mortgage_bom_item_cont_item">
@ -283,6 +303,7 @@
},
data() {
return {
times: getDateRang('yesterday'),
warehouse: [{
value: "选项1",
@ -290,10 +311,13 @@
}],
wareValue: "常温仓",
day: [{
value: "选项1",
value: "7",
label: "7日",
}, {
value: "15",
label: "15日",
}],
dayValue: "15日",
dayValue: "15",
dialogVisible: false,
videos: true,
lookvideo: false,
@ -339,14 +363,30 @@
},
created() {
this.loadList()
this.getOtherList();
this.getStatusCount();
this.getInventory()
this.getReportInventory()
this.getOtherList();
this.getStatusCount();
},
methods: {
dayValueChange(val) {
console.log('val:', val)
this.dayValue = val
this.getReportInventory()
},
getReportInventory() {
req.getReportInventory().then(res => {
var params = {
startDate: this.times,
intervalTime: this.dayValue
}
console.log('params:', params)
req.getReportInventory(params).then(res => {
console.log('getReportInventory:', res)
this.chartData2 = {
@ -377,7 +417,10 @@
getStatusCount() {
req.getStatusCount().then(res => {
console.log('getStatusCount:', res)
this.StatusCountInfo = res.data
if (res.data) {
this.StatusCountInfo = res.data
}
}).catch(e => {
@ -387,10 +430,13 @@
getOtherList() {
req.getOtherList().then(res => {
console.log('getOtherList:', res)
this.cameraList = res.data
if (res.data) {
this.cameraList = res.data
this.cameraInfo = res.data[0]
this.getVedioPcLiveById(res.data[0].id)
}
this.cameraInfo = res.data[0]
this.getVedioPcLiveById(res.data[0].id)
}).catch(e => {
@ -503,9 +549,11 @@
selectTime(val) {
console.log('val:', val)
this.times = val
this.loadList()
this.getInventory()
this.getReportInventory()
// this.getOtherList();
// this.getStatusCount();
},
@ -586,6 +634,7 @@
color: #fff;
background: transparent;
border: none;
font-size: 20px;
}
}
}
@ -600,12 +649,13 @@
}
::v-deep .el-date-editor {
width: 150px;
width: 180px;
.el-input__inner {
color: #fff;
background: transparent;
border: none;
font-size: 20px;
}
.el-input__prefix {
@ -634,6 +684,9 @@
width: auto;
margin-right: 10px;
color: #fff;
font-size: 30px;
font-weight: 600;
font-family: sans-serif;
}
}
@ -645,6 +698,7 @@
color: #fff;
background: transparent;
border: none;
font-size: 20px;
}
}
}
@ -683,7 +737,9 @@
display: flex;
align-items: center;
margin-right: 10px;
font-size: 20px;
font-size: 30px;
font-weight: 600;
font-family: sans-serif;
span {
margin-right: 10px;
@ -739,7 +795,7 @@
span {
color: #49a6e2;
font-weight: bold;
font-size: 18px;
font-size: 20px;
}
}
}
@ -845,7 +901,7 @@
}
.mortgage_top_item_cons_right_top_foor {
margin-top: 35px;
top: 105px;
width: 100%;
height: 10%;
display: flex;
@ -857,6 +913,9 @@
color: #fff;
display: flex;
align-items: center;
font-size: 18px;
font-weight: 600;
font-family: sans-serif;
}
.huishie {
@ -870,6 +929,9 @@
span {
margin-left: 10px;
font-size: 18px;
font-weight: 600;
font-family: sans-serif;
}
}
}
@ -879,7 +941,7 @@
height: calc(50% - 10px);
width: 100%;
position: relative;
margin-top: 50px;
top: 105px;
.titele {
width: 100%;
@ -893,6 +955,9 @@
height: 100%;
line-height: 40px;
margin-right: 5px;
font-size: 30px;
font-weight: 600;
font-family: sans-serif;
}
.titele_right {
@ -912,22 +977,33 @@
}
}
.containers {
width: 100%;
height: calc(100% - 80px);
.banner {
position: relative;
/* 父容器需要有明确的高度 */
height: 30px;
width: 100%;
margin: auto;
overflow: hidden;
display: flex;
background: transparent;
justify-content: center;
flex-wrap: wrap;
margin-top: 10px;
margin-top: 20px;
}
.banner>.scroll-list {
position: absolute;
top: 0;
left: 0;
width: 100%;
animation: scroll 5s linear infinite normal;
.container_item1 {
width: 100%;
height: 30px;
line-height: 30px;
height: 50px;
line-height: 50px;
color: #E43961;
font-size: 16px;
font-size: 18px;
font-family: '微软雅黑';
box-sizing: border-box;
padding-left: 20px;
@ -939,10 +1015,10 @@
.container_item2 {
width: 100%;
height: 30px;
line-height: 30px;
height: 50px;
line-height: 50px;
color: #A0D090;
font-size: 16px;
font-size: 18px;
font-family: '微软雅黑';
box-sizing: border-box;
padding-left: 20px;
@ -952,6 +1028,16 @@
}
}
}
@keyframes scroll {
100% {
/* 需要滚动内容的总高度 */
top: -180px;
}
}
}
}
}
@ -1129,7 +1215,7 @@
width: 43%;
box-sizing: border-box;
padding: 15px;
margin-left: 30px;
margin-left: 15px;
}
&:nth-of-type(3) {
@ -1161,7 +1247,9 @@
align-items: center;
margin-right: 5px;
height: 100%;
font-size: 20px;
font-size: 30px;
font-weight: 600;
font-family: sans-serif;
color: #fff;
span {
@ -1184,6 +1272,7 @@
color: #fff;
background: transparent;
border: none;
font-size: 20px;
}
}
}
@ -1226,6 +1315,9 @@
align-items: center;
color: #0EC0B4;
margin-left: 10px;
font-size: 20px;
font-weight: 600;
font-family: sans-serif;
}
.mortgage_bom_item_cont_list_item_right {
@ -1236,6 +1328,9 @@
align-items: center;
justify-content: right;
color: #FF7E3F;
font-size: 23px;
font-weight: 600;
font-family: sans-serif;
}
}
}
@ -1253,6 +1348,9 @@
display: flex;
align-items: center;
color: #0EC0B4;
font-size: 20px;
font-weight: 600;
font-family: sans-serif;
}
.mortgage_bom_item_cont_item_right {
@ -1262,6 +1360,9 @@
align-items: center;
justify-content: right;
color: #FF7E3F;
font-size: 23px;
font-weight: 600;
font-family: sans-serif;
}
}
}

Write Preview
Loading…
Cancel
Save