diff --git a/src/components/Duration/Duration.js b/src/components/Duration/Duration.js index e8caddf..4e9ee92 100644 --- a/src/components/Duration/Duration.js +++ b/src/components/Duration/Duration.js @@ -31,12 +31,33 @@ const mixin = { xAxis: { type: 'category', boundaryGap: false, - data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日'], + data: [ + '呼叫', + '到场', + '评估', + '采血', + 'CT', + '谈话', + '签字', + '注射', + '介入', + '手术', + '穿刺', + 'DSA', + '溶栓', + '再通', + '支架', + '解脱', + '结束', + ], axisLabel: { textStyle: { fontWeight: 'normal', color: '#ccc', //标题颜色 }, + formatter: function(value) { + return value.split('').join('\n'); + }, }, }, yAxis: { @@ -61,6 +82,7 @@ const mixin = { { name: '我院记录', type: 'line', + connectNulls: true, stack: '总量', symbolSize: 6, // symbol: 'star', @@ -75,6 +97,7 @@ const mixin = { { name: '国际水准', type: 'line', + connectNulls: true, stack: '总量', symbolSize: 6, data: this.pointTimeInternation, @@ -88,6 +111,7 @@ const mixin = { { name: '当前数据', type: 'line', + connectNulls: true, stack: '总量', symbolSize: 6, data: this.pointTimeCurrentList, diff --git a/src/components/Map/Map.js b/src/components/Map/Map.js index 7ad96f3..dedfdd3 100644 --- a/src/components/Map/Map.js +++ b/src/components/Map/Map.js @@ -4,47 +4,53 @@ var option = { type: 'map3D', name: '山西', selectedMode: 'single', //地图高亮单选 - boxDepth: 90, //地图倾斜度 - regionHeight: 8, //地图高度 + boxDepth: 230, //地图倾斜度 + regionHeight: 6, //地图高度 map: '山西', viewControl: { - distance: 150, //地图视角 控制初始大小 - rotateSensitivity: 0, //禁止旋转 - zoomSensitivity: 0, //禁止缩放 + distance: 1000, //地图视角 控制初始大小 + rotateSensitivity: 1, //禁止旋转 + zoomSensitivity: 1, //禁止缩放 }, label: { show: true, //是否显示市 textStyle: { - color: '#0a1640', //文字颜色 + color: '#aaa', //文字颜色 fontSize: 12, //文字大小 backgroundColor: 'rgba(0,0,0,0)', //透明度0清空文字背景 }, }, itemStyle: { - color: '#81d0f1', //地图颜色 - borderWidth: 0.5, //分界线wdith + color: 'rgb(18,57,90)', //地图颜色 + borderWidth: 1, //分界线wdith borderColor: '#459bca', //分界线颜色 }, emphasis: { label: { show: true, //是否显示高亮 - textStyle: { - color: '#fff', //高亮文字颜色 - }, - }, - itemStyle: { - color: '#0489d6', //地图高亮颜色 + textStyle: { color: '#fff' }, //高亮文字颜色 }, + itemStyle: { color: '#A7820D' }, //地图高亮颜色 }, - //高亮市区 echarts bug 不生效 - regions: [ + data: [ { name: '运城市', - itemStyle: { - areaColor: '#f00', - }, + value: 0, + label: { textStyle: { color: '#fff' } }, //高亮文字颜色 + itemStyle: { color: '#A7820D' }, //地图高亮颜色 }, ], + //高亮市区 echarts bug 不生效 + // regions: [ + // { + // name: '运城市', + // value: 0, + // itemStyle: { + // areaColor: 'red', + // label: { show: false }, + // }, + // }, + // ], }, ], }; diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue index 6759b73..d4999a9 100644 --- a/src/components/Map/Map.vue +++ b/src/components/Map/Map.vue @@ -1,6 +1,6 @@ @@ -22,6 +22,7 @@ export default { let hg = window.innerHeight; this.width = wh + 'px'; this.height = hg + 'px'; + console.log(this.width); console.log(this.height); window.onresize = () => { return (() => { @@ -50,88 +51,4 @@ export default { }; - + diff --git a/src/components/Sensor/Sensor.js b/src/components/Sensor/Sensor.js index d36ceec..8691980 100644 --- a/src/components/Sensor/Sensor.js +++ b/src/components/Sensor/Sensor.js @@ -3,8 +3,8 @@ const mixin = { data() { return { series1: [10, 20, 30, 10, 20, 30, 10, 20, 30], // 传感器1 - series2: [20, 30, 10, 20, 30, 10, 20, 30, 10], // 传感器1 - series3: [30, 10, 20, 30, 10, 20, 30, 10, 20], // 传感器1 + series2: [20, 30, 10, 20, 30, 10, 20, 30, 10], // 传感器2 + series3: [30, 10, 20, 30, 10, 20, 30, 10, 20], // 传感器3 }; }, computed: { @@ -13,7 +13,7 @@ const mixin = { return { legend: { x: 'center', - y: 'top', + y: '8%', data: ['传感器1', '传感器2', '传感器3'], textStyle: { fontWeight: 'normal', diff --git a/src/components/Statistics/Statistics.js b/src/components/Statistics/Statistics.js index 71cff98..57fa16f 100644 --- a/src/components/Statistics/Statistics.js +++ b/src/components/Statistics/Statistics.js @@ -17,7 +17,7 @@ const mixin = { legend: [ { x: 'center', - y: 'top', + y: '8%', data: ['本年', '去年'], textStyle: { fontWeight: 'normal', diff --git a/src/router/index.js b/src/router/index.js index 0cd1f16..bd6ac85 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,12 +11,12 @@ const routes = [ name: 'Home', component: Home, }, - // 白框框显示内容界面 - // { - // path: '/Index', - // name: 'Index', - // component: () => import(/* webpackChunkName: "Index" */ 'views/Index/Index.vue'), - // }, + // 模拟按钮界面 + { + path: '/BtnPage', + name: 'BtnPage', + component: () => import(/* webpackChunkName: "Index" */ 'views/BtnPage/BtnPage.vue'), + }, ]; const router = new VueRouter({ diff --git a/src/views/BtnPage/BtnPage.vue b/src/views/BtnPage/BtnPage.vue new file mode 100644 index 0000000..1ca651a --- /dev/null +++ b/src/views/BtnPage/BtnPage.vue @@ -0,0 +1,49 @@ + + + + +