Skip to content

F
founder_vue
Commit ac2c9660 by 刘玉帅
Options

xiugai

parent 325854da
Showing with 113 additions and 102 deletions
src/App.vue
<!--
* @Author: your name
* @Date: 2021-11-30 10:33:12
* @LastEditTime: 2021-12-07 12:58:56
* @LastEditors: Please set LastEditors
* @LastEditTime: 2022-01-17 14:32:24
* @LastEditors: LYS
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\App.vue
-->
......@@ -27,7 +27,8 @@ export default {
<style >
body{
/* 解决弹框出现位置偏移情况 */
padding-right: 0 !important
/* padding-right: 0 !important;
overflow: hidden; */
}
</style>
<style lang="scss" scoped>
......
src/assets/fonts3/text.css 0 → 100644
@font-face {
font-family: "DIN";
src: url('./dinb.ttf');
font-weight: normal;
font-style: normal;
}
\ No newline at end of file
src/main.js
/*
* @Author: your name
* @Date: 2021-11-22 14:08:39
* @LastEditTime: 2022-01-13 18:02:23
* @LastEditTime: 2022-01-17 11:12:40
* @LastEditors: LYS
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\main.js
......@@ -21,7 +21,7 @@ import VueBus from 'vue-bus';
Vue.use(VueBus)
// 导入字体图标库
import './assets/fonts2/iconfont.css'
import "@/assets/fonts3/text.css";
Vue.prototype.$driver = new Driver({
className: "scoped-class", // className to wrap driver.js popover
animate: true, // Animate while changing highlighted element
......
src/views/Home.vue
......@@ -377,7 +377,7 @@ export default {
// this.initOptionZQCQLX();
},
mounted() {
this.CustomLoading = $("#mask,#loading")
this.CustomLoading = $("#mask,#loading");
this.initMap();
this.initOption();
this.$nextTick(() => {});
......@@ -426,6 +426,7 @@ export default {
option = {
color: ["#1c63fd", "#f96766", "#ffad4d", "#cccccc"],
title: {
zlevel: 0,
text: self.allpie,
x: "25%",
y: "42%",
......@@ -444,24 +445,7 @@ export default {
tooltip: {
trigger: "item",
},
// graphic: {
// type: "text",
// left: "26%",
// top: "50%",
// style: {
// text: self.allCount, //这里改用实际值
// textAlign: "center",
// fill: "darkgray",
// width: 30,
// height: 25,
// fontSize: 14,
// color: "red",
// },
// onclick: function () {
// console.log('123');
// }
// },
legend: {
type: "scroll",
orient: "vertical",
......@@ -504,17 +488,17 @@ export default {
// formatter: '{a} <br/>{b}: {c} ({d}%)' //a 系列名称，b 数据项名称，c 数值，d 百分比
formatter: function (name) {
console.log(name);
if (name) {
console.log("888");
var opt = myChartZQ.getOption();
opt.title[0].show = false;
myChartZQ.setOption(opt);
} else {
console.log("666");
var opt = myChartZQ.getOption();
opt.title[0].show = true;
myChartZQ.setOption(opt);
}
// if (name) {
// console.log("888");
// var opt = myChartZQ.getOption();
// opt.title[0].show = false;
// myChartZQ.setOption(opt);
// } else {
// console.log("666");
// var opt = myChartZQ.getOption();
// opt.title[0].show = true;
// myChartZQ.setOption(opt);
// }
return name.name; //你的数据;
},
},
......@@ -548,36 +532,28 @@ export default {
radius: ["50%", "80%"],
center: ["28%", "53%"], //这个属性调整图像的位置
avoidLabelOverlap: false,
label: {
show: false,
position: "center",
},
zlevel: 1,
// label: {
// show: false,
// position: "center",
// },
label: {
normal: {
// formatter: "{b}:{c}" + "\n\r" + "({d}%)",
formatter: "100",
formatter: "{c}",
show: false,
position: "center",
},
// emphasis: {
// show: true,
// formatter: "{d}",
// textStyle: {
// fontSize: "15",
// fontWeight: "bold",
// },
// },
backgroundColor: "#2a2c52", //total 改变层级采用覆盖显示
},
emphasis: {
label: {
formatter: "{c}",
show: true,
fontSize: "20",
fontWeight: "bold",
},
},
labelLine: {
show: false,
},
......@@ -597,17 +573,17 @@ export default {
};
option && myChartZQ.setOption(option);
//默认显示总数
myChartZQ.on("mouseover", function () {
console.log("666");
var opt = myChartZQ.getOption();
opt.title[0].show = false;
myChartZQ.setOption(opt);
});
myChartZQ.on("mouseout", function () {
var opt = myChartZQ.getOption();
opt.title[0].show = true;
myChartZQ.setOption(opt);
});
// myChartZQ.on("mouseover", function () {
// console.log("666");
// var opt = myChartZQ.getOption();
// opt.title[0].show = false;
// myChartZQ.setOption(opt);
// });
// myChartZQ.on("mouseout", function () {
// var opt = myChartZQ.getOption();
// opt.title[0].show = true;
// myChartZQ.setOption(opt);
// });
}
// myChartZQ.on("mouseover", { legend }, function (params) {
......@@ -1169,10 +1145,10 @@ export default {
// urlJson = "zgxjxy";
// }
debugger;
if(msg != 'njjqyjs'){
self.eventData = []
if (msg != "njjqyjs") {
self.eventData = [];
}
setTimeout(()=>{
get(`JsonData/${msg}.json`).then((chinaJson) => {
console.log("89898", chinaJson);
debugger;
......@@ -1339,8 +1315,6 @@ export default {
// });
});
self.CustomLoading.hide();
},50)
} else {
get("JsonData/china1.json").then((chinaJson) => {
console.log("89898", chinaJson);
......@@ -1379,6 +1353,7 @@ export default {
],
},
};
self.CustomLoading.hide();
self.mergeProvinces(chinaJson, params.names, params.properties);
// console.log('json',chinaJson);
self.$echarts.registerMap("china", chinaJson); // 注册地图/
......@@ -1409,7 +1384,7 @@ export default {
{ start: 30, end: 40, label: "南京警犬研究所" },
// { start: 0, end: 100 },
],
color: ["#0254CE","#0844A9","#005FFF","#0089FF",],
color: ["#0254CE", "#0844A9", "#005FFF", "#0089FF"],
},
geo: {
map: "china",
......@@ -1478,7 +1453,7 @@ export default {
normal: {
show: true, //关闭省份名展示
fontSize: "12",
color: " #0307f5", //"#9DCCFF",
color: " #9DCCFF", //"#9DCCFF",
},
emphasis: {
show: false,
......@@ -1643,7 +1618,6 @@ export default {
// });
});
});
self.CustomLoading.hide();
}
},
},
......
src/views/sjcj/jqxg.vue
......@@ -4,7 +4,7 @@
* @Autor: LYS
* @Date: 2021-12-24 14:19:51
* @LastEditors: LYS
* @LastEditTime: 2022-01-15 15:32:33
* @LastEditTime: 2022-01-17 14:29:13
-->
<template>
<div v-loading="loading"
......@@ -12,7 +12,9 @@
element-loading-spinner="el-icon-loading"
>
<div
style="width: 97%; margin: 0px auto; border-radius: 8px; background: #fff"
style="width: 97%; margin: 0px auto; border-radius: 8px; background: #fff;height: 100%;
overflow-y: auto;
overflow-x: hidden;"
>
<el-form
:selfUpdate="true"
......
src/views/sjcj/jsryxg.vue
......@@ -4,7 +4,7 @@
* @Autor: LYS
* @Date: 2021-12-24 14:19:51
* @LastEditors: LYS
* @LastEditTime: 2022-01-15 21:52:05
* @LastEditTime: 2022-01-17 14:28:25
-->
<template>
<div
......@@ -13,7 +13,9 @@
element-loading-spinner="el-icon-loading"
>
<div
style="width: 97%; margin: 0px auto; border-radius: 8px; background: #fff"
style="width: 97%; margin: 0px auto; border-radius: 8px; background: #fff;height: 100%;
overflow-y: auto;
overflow-x: hidden;"
>
<el-form
:rules="rules"
......
src/views/sjfx/sjfx.vue
......@@ -4,7 +4,7 @@
* @Autor: LYS
* @Date: 2022-01-13 09:26:10
* @LastEditors: LYS
* @LastEditTime: 2022-01-15 14:37:49
* @LastEditTime: 2022-01-17 15:40:42
-->
<template>
<div class="boxDiv">
......@@ -39,6 +39,7 @@
<el-progress
type="circle"
:percentage="dogAttendance"
v-if="!isNaN(parseInt(dogAttendance))"
:stroke-width="strokeWidth"
></el-progress>
</div>
......@@ -58,6 +59,7 @@
<el-progress
type="circle"
:percentage="retDog"
v-if="!isNaN(parseInt(retDog))"
:stroke-width="strokeWidth"
color="#3DCCC5"
></el-progress>
......@@ -131,14 +133,14 @@ export default {
topFiveList: [],
strokeWidth: 15,
ChinaDog: 3200, //全国警犬数量
technicians: 470, //全国技术人员数
percentage: "1.2%", //百分比
dogAttendance: "87.5%", //警犬出勤率
dogattNum: 21452, //出勤数
dogper1: 87.5, //圈num
retDog: "56.5%", //警犬复训率
retDogNum: "1234", //复训警犬
ChinaDog: null, //全国警犬数量
technicians: null, //全国技术人员数
percentage: null, //百分比
dogAttendance: 0, //警犬出勤率
dogattNum: null, //出勤数
dogper1: null, //圈num
retDog: 0, //警犬复训率
retDogNum: null, //复训警犬
dogper2: 55.55,
zxt1: require("../../assets/img/zxt.png"),
zxt2: require("../../assets/img/zxt2.png"),
......@@ -174,8 +176,8 @@ export default {
if (res.code == 200) {
this.dogattNum = res.data.dogUseCount;
this.ChinaDog = res.data.dogCount;
this.retDog = res.data.dogtransferredPercentage;
this.dogAttendance = res.data.dogUsePercentage;
this.retDog = Number(res.data.dogtransferredPercentage);
this.dogAttendance = Number(res.data.dogUsePercentage);
this.technicians = res.data.atisanCount;
this.retDogNum = res.data.dogtransferredCount;
}
......@@ -254,7 +256,7 @@ export default {
text: "各省警犬数统计",
target: "blank", //主标题超链接打开方式
// padding: 25,
x: 20,
x: 38,
textStyle: {
//设置主标题风格
Color: "green", //设置主标题字体颜色
......@@ -263,6 +265,13 @@ export default {
width: 50,
},
},
grid: {
left: "4%",
right: "4%",
bottom: "6%",
containLabel: true,
},
tooltip: {
trigger: "axis",
axisPointer: {
......@@ -412,7 +421,7 @@ export default {
option = {
title: {
text: "全国警犬出勤排名 Top10",
x: 20,
x: 40,
textStyle: {
//设置主标题风格
Color: "green", //设置主标题字体颜色
......@@ -434,7 +443,7 @@ export default {
grid: {
left: "3%",
right: "4%",
bottom: "3%",
bottom: "6%",
containLabel: true,
},
xAxis: {
......@@ -456,6 +465,7 @@ export default {
textStyle: {
color: "#A2A9B0",
fontFamily: "DIN",
height:'20'
},
},
},
......@@ -489,7 +499,21 @@ export default {
type: "bar",
data: x,
itemStyle: {
normal: { color: "#4DA2FF ", barBorderRadius: [0, 4, 4, 0] },
normal: {
color: "#4DA2FF ",
barBorderRadius: [0, 4, 4, 0],
label: {
show: true,
position: "right",
textStyle: {
fontSize: "10",
fontFamily: "DIN",
fontWeight: 400,
lineHeight: "20",
color: "#A2A9B0",
},
},
},
},
},
],
......@@ -532,19 +556,18 @@ export default {
},
renderFour(arr) {
let self = this;
if(arr && arr !=''&& arr !=null){
arr.forEach(item=>{
if(item.name == '1'){
item.name = '昆明片区'
}else if(item.name == '2'){
item.name = '南昌片区'
}else if(item.name == '3'){
item.name = '南京片区'
}else if(item.name == '4'){
item.name = '沈阳片区'
if (arr && arr != "" && arr != null) {
arr.forEach((item) => {
if (item.name == "1") {
item.name = "昆明片区";
} else if (item.name == "2") {
item.name = "南昌片区";
} else if (item.name == "3") {
item.name = "南京片区";
} else if (item.name == "4") {
item.name = "沈阳片区";
}
})
});
}
var chartDom = document.getElementById("four");
var myChart = this.$echarts.init(chartDom);
......@@ -563,6 +586,8 @@ export default {
legend: {
orient: "vertical",
top: "bottom",
icon: "circle",
// align: "left",
formatter: function (name) {
console.log(name);
// 获取legend显示内容
......@@ -862,7 +887,7 @@ export default {
font-weight: 400;
line-height: 27px;
color: #697077;
// overflow: hidden;　
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
overflow: hidden;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment