Compare commits

..

No commits in common. "b38ddea72458a059e344024349e5868c6cff8c33" and "fdf9170e00ce8712d2a518d40e4fbc0fa9115494" have entirely different histories.

2 changed files with 12 additions and 42 deletions

View File

@ -1,20 +1,16 @@
<template> <template>
<div class="container_"> <div class="container_">
<div class="top-list"> <div class="top-list">
<div class="list-box" v-for="(item, index) in serviceList.slice(0, 4)" :key="item.id" :span="4"> <div class="list-box" v-for="item in serviceList" :span="4">
<div @click="goRoute(item.id)"> <div @click="goRoute(item.id)">
<img :src="index === 0 ? 'https://th.bing.com/th/id/OIP.Y9YEwiwLwTdvQDkLlA3JbQHaE8?w=251&h=180&c=7&r=0&o=5&dpr=1.5&pid=1.7' : <img :src=" imgUrl + item.coverImg" style="width: 300px; height: 300px;">
index === 1 ? 'https://th.bing.com/th/id/OIP.a8bAOOXWZ_G0POGjCXPYbgHaFj?w=206&h=180&c=7&r=0&o=5&dpr=1.5&pid=1.7' : <!-- <image-preview :width="300" :height="300" :src="item.coverImg"></image-preview>-->
index === 2 ? 'https://th.bing.com/th/id/OIP.9vxxtCP1lmu43fYus2SZ5gHaE7?w=284&h=189&c=7&r=0&o=5&dpr=1.5&pid=1.7' : <div style="font-weight: bold;text-align: center;font-size: 25px">{{ item.name }}</div>
'https://th.bing.com/th/id/OIP.MwxN9-_jrMRNiVLJ9Q7WRQHaE8?w=265&h=180&c=7&r=0&o=5&dpr=1.5&pid=1.7'"
style="width: 300px; height: 300px;">
<div style="font-weight: bold;text-align: center;font-size: 28px">{{ item.name }}</div>
</div> </div>
</div> </div>
</div> </div>
<div class="container-box"> <div class="container-box">
<div class="flex-box"> <div class="flex-box">
<div style=" font-size: 30px;margin-bottom: 30px">临期提醒</div> <div style=" font-size: 30px;margin-bottom: 30px">临期提醒</div>
@ -192,7 +188,6 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: 25px; margin-bottom: 25px;
flex-wrap: wrap;
} }
.list-box{ .list-box{
background: #fff; background: #fff;

View File

@ -472,46 +472,21 @@ export default {
} }
const res = await jcBigScreen.chartLineInspectionAmount(params); const res = await jcBigScreen.chartLineInspectionAmount(params);
res.data.series.forEach(item => { res.data.series.forEach(item => {
// console.log( '475'+ JSON.stringify(res.data.series[0].data))
item.type = 'line' item.type = 'line'
}) })
var chartDom = document.getElementById('khly'); var chartDom = document.getElementById('khly');
var myChart = echarts.init(chartDom); var myChart = echarts.init(chartDom);
var option; var option;
const color = ['#31daf0', '#3367e6', '#d9458d', ];
option = { option = {
legend: { xAxis: {
top: 'bottom' type: 'category',
data: res.data.categories
}, },
toolbox: { yAxis: {
show: true, type: 'value'
feature: {
mark: { show: true },
dataView: { show: true, readOnly: false },
restore: { show: traue },
saveAsImage: { show: true }
}
}, },
series: [ series: res.data.series
{
name: 'Nightingale Chart',
type: 'pie',
radius: [20, 50],
center: ['50%', '50%'],
roseType: 'area',
itemStyle: {
borderRadius: 8
},
data: [
{ value: 40, name: 'rose 1' },
{ value: 38, name: 'rose 2' },
{ value: 32, name: 'rose 3' }
]
}
]
}; };
option && myChart.setOption(option); option && myChart.setOption(option);
}, },
/** /**