diff --git a/package-lock.json b/package-lock.json
index 6177790..5e467e3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17526,6 +17526,11 @@
"videojs-hotkeys": "^0.2.20"
}
},
+ "vue2-scale-box": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/vue2-scale-box/-/vue2-scale-box-0.1.7.tgz",
+ "integrity": "sha512-mI/eEaBg5+9Op8i7sHBPEWnxRC744xBZnl4lf6yF+2ShhURTunipWz7dMcJ0nhgZ1jK+I4rv2BF1oK+0K7CmlA=="
+ },
"vuex": {
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
diff --git a/package.json b/package.json
index d7f094b..f08cc63 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
"vue-svg-component-runtime": "^1.0.1",
"vue-ueditor-wrap": "^2.5.6",
"vue-video-player": "^5.0.2",
+ "vue2-scale-box": "^0.1.7",
"vuex": "^3.1.1",
"wangeditor": "^3.1.1"
},
diff --git a/src/assets/scss/index.scss b/src/assets/scss/index.scss
index 09896b4..d49760e 100644
--- a/src/assets/scss/index.scss
+++ b/src/assets/scss/index.scss
@@ -1,6 +1,5 @@
#index {
color: #d3d6dd;
- // color: #0f1325;
width: 1920px;
height: 1080px;
position: absolute;
@@ -40,7 +39,7 @@
background-repeat: no-repeat;
.title-text {
- font-size: 24px;
+ font-size: 30px;
position: absolute;
bottom: 0;
left: 50%;
@@ -68,11 +67,11 @@
// 平行四边形
.react-right {
- &.react-l-s {
+ /* &.react-l-s {
text-align: right;
width: 500px;
- }
- font-size: 18px;
+ } */
+ font-size: 24px;
width: 300px;
line-height: 50px;
text-align: center;
@@ -99,7 +98,7 @@
width: 500px;
text-align: left;
}
- font-size: 18px;
+ font-size: 24px;
width: 300px;
height: 50px;
line-height: 50px;
diff --git a/src/components/echart/bottom/bottomLeftChart/chart.vue b/src/components/echart/bottom/bottomLeftChart/chart.vue
index a4e2534..e7a3ada 100644
--- a/src/components/echart/bottom/bottomLeftChart/chart.vue
+++ b/src/components/echart/bottom/bottomLeftChart/chart.vue
@@ -1,6 +1,5 @@
-
({})
- },
+ }
},
watch: {
cdata: {
handler (newData) {
this.options = {
tooltip: {
- trigger: "axis",
- backgroundColor: "rgba(255,255,255,0.1)",
+ trigger: 'axis',
+ backgroundColor: 'rgba(255,255,255,0.1)',
axisPointer: {
- type: "shadow",
+ type: 'shadow',
label: {
show: true,
- backgroundColor: "#7B7DDC"
+ backgroundColor: '#7B7DDC'
}
}
},
legend: {
- data: ["已贯通", "计划贯通", "贯通率"],
+ data: ['集中供养数', '供养总人数', '集中供养率'],
textStyle: {
- color: "#B4B4B4"
+ color: '#B4B4B4',
+ fontSize:20
},
- top: "0%"
+ top: '0%'
},
grid: {
- x: "8%",
- width: "88%",
- y: "4%"
+ x: '8%',
+ width: '88%',
+ y: '4%'
},
xAxis: {
data: newData.category,
axisLine: {
lineStyle: {
- color: "#B4B4B4"
+ color: '#B4B4B4'
}
},
axisTick: {
@@ -70,69 +70,69 @@ export default {
splitLine: { show: false },
axisLine: {
lineStyle: {
- color: "#B4B4B4"
+ color: '#B4B4B4'
}
},
axisLabel: {
- formatter: "{value} "
+ formatter: '{value} '
}
},
{
splitLine: { show: false },
axisLine: {
lineStyle: {
- color: "#B4B4B4"
+ color: '#B4B4B4'
}
},
axisLabel: {
- formatter: "{value} "
+ formatter: '{value} '
}
}
],
series: [
{
- name: "贯通率",
- type: "line",
+ name: '集中供养率',
+ type: 'line',
smooth: true,
showAllSymbol: true,
- symbol: "emptyCircle",
+ symbol: 'emptyCircle',
symbolSize: 8,
yAxisIndex: 1,
itemStyle: {
normal: {
- color: "#F02FC2"
+ color: '#F02FC2'
}
},
data: newData.rateData
},
{
- name: "已贯通",
- type: "bar",
+ name: '集中供养数',
+ type: 'bar',
barWidth: 10,
itemStyle: {
normal: {
barBorderRadius: 5,
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
- { offset: 0, color: "#956FD4" },
- { offset: 1, color: "#3EACE5" }
+ { offset: 0, color: '#956FD4' },
+ { offset: 1, color: '#3EACE5' }
])
}
},
data: newData.barData
},
{
- name: "计划贯通",
- type: "bar",
- barGap: "-100%",
+ name: '供养总人数',
+ type: 'bar',
+ barGap: '-100%',
barWidth: 10,
itemStyle: {
normal: {
barBorderRadius: 5,
color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
- { offset: 0, color: "rgba(156,107,211,0.8)" },
- { offset: 0.2, color: "rgba(156,107,211,0.5)" },
- { offset: 1, color: "rgba(156,107,211,0.2)" }
+ { offset: 0, color: 'rgba(156,107,211,0.8)' },
+ { offset: 0.2, color: 'rgba(156,107,211,0.5)' },
+ { offset: 1, color: 'rgba(156,107,211,0.2)' }
])
}
},
@@ -144,7 +144,7 @@ export default {
},
immediate: true,
deep: true
- },
- },
+ }
+ }
}
-
\ No newline at end of file
+
diff --git a/src/components/echart/bottom/bottomLeftChart/index.vue b/src/components/echart/bottom/bottomLeftChart/index.vue
index 1a78ba5..906a529 100644
--- a/src/components/echart/bottom/bottomLeftChart/index.vue
+++ b/src/components/echart/bottom/bottomLeftChart/index.vue
@@ -11,131 +11,56 @@ export default {
return {
cdata: {
category: [
- "市区",
- "万州",
- "江北",
- "南岸",
- "北碚",
- "綦南",
- "长寿",
- "永川",
- "璧山",
- "江津",
- "城口",
- "大足",
- "垫江",
- "丰都",
- "奉节",
- "合川",
- "江津区",
- "开州",
- "南川",
- "彭水",
- "黔江",
- "石柱",
- "铜梁",
- "潼南",
- "巫山",
- "巫溪",
- "武隆",
- "秀山",
- "酉阳",
- "云阳",
- "忠县",
- "川东",
- "检修"
+ '下堡坪村',
+ '蛟龙寺村',
+ '九山村',
+ '马宗岭村',
+ '赵勉河村',
+ '秀水村',
+ '磨坪村',
+ '十八湾村'
],
lineData: [
- 18092,
- 20728,
- 24045,
- 28348,
- 32808,
- 36097,
- 39867,
- 44715,
- 48444,
- 50415,
- 56061,
- 62677,
- 59521,
- 67560,
- 18092,
- 20728,
- 24045,
- 28348,
- 32808,
- 36097,
- 39867,
- 44715,
- 48444,
- 50415,
- 36097,
- 39867,
- 44715,
- 48444,
- 50415,
- 50061,
- 32677,
- 49521,
- 32808
+ 15,
+ 8,
+ 5,
+ 9,
+ 7,
+ 10,
+ 9,
+ 4
],
barData: [
- 4600,
- 5000,
- 5500,
- 6500,
- 7500,
- 8500,
- 9900,
- 12500,
- 14000,
- 21500,
- 23200,
- 24450,
- 25250,
- 33300,
- 4600,
- 5000,
- 5500,
- 6500,
- 7500,
- 8500,
- 9900,
- 22500,
- 14000,
- 21500,
- 8500,
- 9900,
- 12500,
- 14000,
- 21500,
- 23200,
- 24450,
- 25250,
- 7500
+ 13,
+ 6,
+ 4,
+ 7,
+ 6,
+ 3,
+ 7,
+ 3
],
rateData: []
}
- };
+ }
},
components: {
- Chart,
+ Chart
},
mounted () {
- this.setData();
+ this.setData()
},
methods: {
// 根据自己的业务情况修改
setData () {
- for (let i = 0; i < this.cdata.barData.length -1; i++) {
- let rate = this.cdata.barData[i] / this.cdata.lineData[i];
- this.cdata.rateData.push(rate.toFixed(2));
+ for (let i = 0; i < this.cdata.barData.length - 1; i++) {
+ const rate = this.cdata.barData[i] / this.cdata.lineData[i]
+ this.cdata.rateData.push(rate.toFixed(2))
}
- },
+ }
}
-};
+}
\ No newline at end of file
+
diff --git a/src/components/echart/centerLeft/centerLeft1Chart/chart.vue b/src/components/echart/centerLeft/centerLeft1Chart/chart.vue
index d600744..dd3d90e 100644
--- a/src/components/echart/centerLeft/centerLeft1Chart/chart.vue
+++ b/src/components/echart/centerLeft/centerLeft1Chart/chart.vue
@@ -3,8 +3,8 @@
@@ -14,58 +14,59 @@ import Echart from '@/common/echart'
export default {
data () {
return {
- options: {},
- };
+ options: {}
+ }
},
components: {
- Echart,
+ Echart
},
props: {
cdata: {
type: Object,
default: () => ({})
- },
+ }
},
watch: {
cdata: {
handler (newData) {
this.options = {
color: [
- "#37a2da",
- "#32c5e9",
- "#9fe6b8",
- "#ffdb5c",
- "#ff9f7f",
- "#fb7293",
- "#e7bcf3",
- "#8378ea"
+ '#37a2da',
+ '#32c5e9',
+ '#fb7293'
],
tooltip: {
- trigger: "item",
- formatter: "{a}
{b} : {c} ({d}%)"
+ trigger: 'item',
+ formatter: '{a}
{b} : {c} ({d}%)'
},
toolbox: {
show: true
},
calculable: true,
legend: {
- orient: "horizontal",
- icon: "circle",
+ orient: 'horizontal',
+ icon: 'circle',
bottom: 0,
- x: "center",
+ x: 'center',
data: newData.xData,
textStyle: {
- color: "#fff"
+ color: '#fff',
+ "fontSize": 18
}
},
series: [
{
- name: "通过率统计",
- type: "pie",
- radius: [10, 50],
- roseType: "area",
- center: ["50%", "40%"],
- data: newData.seriesData
+ name: '等级统计',
+ type: 'pie',
+ radius: [20, 100],
+ roseType: 'area',
+ center: ['50%', '50%'],
+ data: newData.seriesData,
+ label: {
+ normal: {
+ show: false
+ },
+ },
}
]
}
@@ -74,8 +75,8 @@ export default {
deep: true
}
}
-};
+}
\ No newline at end of file
+
diff --git a/src/components/echart/centerLeft/centerLeft1Chart/index.vue b/src/components/echart/centerLeft/centerLeft1Chart/index.vue
index 583b417..f6a7dd2 100644
--- a/src/components/echart/centerLeft/centerLeft1Chart/index.vue
+++ b/src/components/echart/centerLeft/centerLeft1Chart/index.vue
@@ -5,25 +5,22 @@
\ No newline at end of file
+
diff --git a/src/components/echart/centerLeft/centerLeft2Chart/chart.vue b/src/components/echart/centerLeft/centerLeft2Chart/chart.vue
index 2ce64e6..8f3714c 100644
--- a/src/components/echart/centerLeft/centerLeft2Chart/chart.vue
+++ b/src/components/echart/centerLeft/centerLeft2Chart/chart.vue
@@ -1,290 +1,88 @@
-
+
+
+
diff --git a/src/components/echart/centerLeft/centerLeft2Chart/index.vue b/src/components/echart/centerLeft/centerLeft2Chart/index.vue
index f1dc503..38da485 100644
--- a/src/components/echart/centerLeft/centerLeft2Chart/index.vue
+++ b/src/components/echart/centerLeft/centerLeft2Chart/index.vue
@@ -5,56 +5,21 @@
\ No newline at end of file
+
diff --git a/src/components/echart/centerRight/centerRight1Chart/chart.vue b/src/components/echart/centerRight/centerRight1Chart/chart.vue
new file mode 100644
index 0000000..843de37
--- /dev/null
+++ b/src/components/echart/centerRight/centerRight1Chart/chart.vue
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/echart/centerRight/centerRight1Chart/index.vue b/src/components/echart/centerRight/centerRight1Chart/index.vue
new file mode 100644
index 0000000..668fcf0
--- /dev/null
+++ b/src/components/echart/centerRight/centerRight1Chart/index.vue
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/echart/centerRight/centerRight2Chart/chart.vue b/src/components/echart/centerRight/centerRight2Chart/chart.vue
new file mode 100644
index 0000000..a31bc6c
--- /dev/null
+++ b/src/components/echart/centerRight/centerRight2Chart/chart.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/echart/centerRight/centerRight2Chart/index.vue b/src/components/echart/centerRight/centerRight2Chart/index.vue
new file mode 100644
index 0000000..f8feeed
--- /dev/null
+++ b/src/components/echart/centerRight/centerRight2Chart/index.vue
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/layouts/BigScreenLayout.vue b/src/layouts/BigScreenLayout.vue
index da34ad2..3a649b8 100644
--- a/src/layouts/BigScreenLayout.vue
+++ b/src/layouts/BigScreenLayout.vue
@@ -1,7 +1,7 @@
-
-
+
+
@@ -24,8 +24,8 @@ export default {
diff --git a/src/views/bigScreen/bottomLeft.vue b/src/views/bigScreen/bottomLeft.vue
index 3a17b3d..8615b28 100644
--- a/src/views/bigScreen/bottomLeft.vue
+++ b/src/views/bigScreen/bottomLeft.vue
@@ -6,7 +6,7 @@
- 数据统计图
+ 各村供养人数
diff --git a/src/views/bigScreen/bottomRight.vue b/src/views/bigScreen/bottomRight.vue
index ed7792a..fc65760 100644
--- a/src/views/bigScreen/bottomRight.vue
+++ b/src/views/bigScreen/bottomRight.vue
@@ -3,58 +3,200 @@
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ item.text }}
+ ({{ item.dw }})
+
+
-
\ No newline at end of file
+
+// 让下方单位的精度值隐藏
+::v-deep .dv-capsule-chart .unit-label {
+ visibility: hidden;
+}
+
diff --git a/src/views/bigScreen/center.vue b/src/views/bigScreen/center.vue
index d4b6d9e..8102343 100644
--- a/src/views/bigScreen/center.vue
+++ b/src/views/bigScreen/center.vue
@@ -6,7 +6,7 @@
v-for="item in titleItem"
:key="item.title"
>
-
{{ item.title }}
+
{{ item.title }}
- 年度负责人组件达标榜
+ 所属村组榜
- 今日任务通过率
+ 集中供养率
-
今日任务达标率
+
分散供养率
diff --git a/src/views/bigScreen/centerLeft1.vue b/src/views/bigScreen/centerLeft1.vue
deleted file mode 100644
index 8d7e5f8..0000000
--- a/src/views/bigScreen/centerLeft1.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- ¥
-
-
-
- {{ item.text }}
- (件)
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/bigScreen/centerRight1.vue b/src/views/bigScreen/centerRight1.vue
deleted file mode 100644
index ca7a6bc..0000000
--- a/src/views/bigScreen/centerRight1.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/bigScreen/centerRight2.vue b/src/views/bigScreen/centerRight2.vue
deleted file mode 100644
index 7b8a87f..0000000
--- a/src/views/bigScreen/centerRight2.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-
-
-
- 产品销售渠道分析
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/bigScreen/hldj.vue b/src/views/bigScreen/hldj.vue
new file mode 100644
index 0000000..0b723bf
--- /dev/null
+++ b/src/views/bigScreen/hldj.vue
@@ -0,0 +1,92 @@
+
+
+
+
+
+
+
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 13d0afb..2f8a522 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -1,4 +1,6 @@
+
+
Loading...
@@ -8,9 +10,9 @@
-
+
下堡坪乡农村福利院长者管理系统
-
+
-
+
+
+ 数据统计
- 数据分析2
+ 数据查询
+
+
+ 荣誉展示
-
-
+
+
+
+ 实时监控
+
+
+ 健康预警
+
+
+
+ {{ dateYear }} {{ dateWeek }} {{ dateDay }}
+
@@ -55,12 +78,12 @@
-
+
-
+
@@ -69,12 +92,14 @@
-
+
+
+
-
-
-
+
+
+
@@ -91,23 +116,26 @@
+
+
diff --git a/src/views/bigScreen/jzfp.vue b/src/views/bigScreen/jzfp.vue
new file mode 100644
index 0000000..12517fa
--- /dev/null
+++ b/src/views/bigScreen/jzfp.vue
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
diff --git a/src/views/bigScreen/nltj.vue b/src/views/bigScreen/nltj.vue
new file mode 100644
index 0000000..0156ffb
--- /dev/null
+++ b/src/views/bigScreen/nltj.vue
@@ -0,0 +1,91 @@
+
+
+
+
+
+
+
diff --git a/src/views/bigScreen/centerLeft2.vue b/src/views/bigScreen/xb.vue
similarity index 89%
rename from src/views/bigScreen/centerLeft2.vue
rename to src/views/bigScreen/xb.vue
index 7a9938f..5d9fdaf 100644
--- a/src/views/bigScreen/centerLeft2.vue
+++ b/src/views/bigScreen/xb.vue
@@ -6,7 +6,7 @@
- 地图数据
+ 性别
@@ -28,11 +28,11 @@ export default {
\ No newline at end of file
+
diff --git a/src/views/index/dataSupportList.vue b/src/views/index/dataSupportList.vue
new file mode 100644
index 0000000..12354ec
--- /dev/null
+++ b/src/views/index/dataSupportList.vue
@@ -0,0 +1,206 @@
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 50岁以下
+ 50岁-59岁
+ 60岁-69岁
+ 70岁-79岁
+ 80岁-89岁
+ 90岁以上
+
+
+
+
+
+
+ 男
+ 女
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+ 查询
+ {queryParam = {}, $refs.table.refresh(true)}">重置
+
+
+
+
+
+
+ {{ record.bringTime | moment('YYYY-MM-DD') }}
+
+
+
+ {{ record.sex == 1 ? '男' : '女' }}
+
+
+
+ {{ record.isInHospital == 1 ? '是' : '否' }}
+
+
+
+ 合计人数:{{ totalCount }}
+
+
+
+
+
+
+
diff --git a/src/views/index/welcome.vue b/src/views/index/welcome.vue
index 2198173..cc609ee 100644
--- a/src/views/index/welcome.vue
+++ b/src/views/index/welcome.vue
@@ -5,15 +5,18 @@
-->
-
+
+