Skip to content

F
founder_vue
Commit d5bb37f5 by gao_yingdong
Options

地图渲染

parent 5532224a
Showing with 123 additions and 81 deletions
package-lock.json
......@@ -1762,37 +1762,6 @@
"webpack-merge": "^4.2.2"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995651629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmmirror.com/chalk/download/chalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"debug": {
"version": "4.2.0",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1600502871403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz",
......@@ -1802,35 +1771,11 @@
"ms": "2.1.2"
}
},
"loader-utils": {
"version": "2.0.2",
"resolved": "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz",
"integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
"dev": true
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
"resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
}
}
},
......@@ -2152,7 +2097,7 @@
},
"adler-32": {
"version": "1.2.0",
"resolved": "https://registry.nlark.com/adler-32/download/adler-32-1.2.0.tgz?cache=0&sync_timestamp=1618767770453&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fadler-32%2Fdownload%2Fadler-32-1.2.0.tgz",
"resolved": "https://registry.npm.taobao.org/adler-32/download/adler-32-1.2.0.tgz",
"integrity": "sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU=",
"requires": {
"exit-on-epipe": "~1.0.1",
......@@ -5563,7 +5508,7 @@
},
"file-saver": {
"version": "2.0.5",
"resolved": "https://registry.npmmirror.com/file-saver/download/file-saver-2.0.5.tgz",
"resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz",
"integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
},
"file-uri-to-path": {
......@@ -7001,6 +6946,11 @@
"supports-color": "^7.0.0"
}
},
"jquery": {
"version": "3.6.0",
"resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.6.0.tgz",
"integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
},
"js-base64": {
"version": "2.6.4",
"resolved": "https://registry.npm.taobao.org/js-base64/download/js-base64-2.6.4.tgz?cache=0&sync_timestamp=1599897523811&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjs-base64%2Fdownload%2Fjs-base64-2.6.4.tgz",
......@@ -9548,7 +9498,7 @@
},
"raw-loader": {
"version": "0.5.1",
"resolved": "https://registry.npm.taobao.org/raw-loader/download/raw-loader-0.5.1.tgz",
"resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz",
"integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao="
},
"read-pkg": {
......@@ -11965,6 +11915,63 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"loader-utils": {
"version": "2.0.2",
"resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.2.tgz",
"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-router": {
"version": "3.4.6",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz",
......
src/components/ptCxForm_components.vue
......@@ -6358,7 +6358,8 @@ export default {
self.tableData.forEach((item) => {
self.$set(item, "bscqqz", 0);
self.$set(item, "jrqz", 0);
self.$set(item, "kdjl", item.dogCounts - item.dogOutCounts);
// self.$set(item, "kdjl", item.dogCounts - item.dogOutCounts);
self.$set(item, "kdjl", 0);
self.$set(item, "sj", timeStampTurnTime(new Date()));
});
......
src/views/Home.vue
......@@ -425,7 +425,7 @@ export default {
var myChartZQ = this.$echarts.init(chartDom);
var option;
option = {
color: ["#1c63fd", "#f96766", "#ffad4d", "#cccccc"], //默认色板
color: ["#1c63fd", "#f96766", "#ffad4d", "#cccccc"], //默认色板
title: {
zlevel: 0,
text: self.allpie,
......@@ -443,18 +443,21 @@ export default {
// visible:'false'
// show:false
},
tooltip: { //鼠标悬停提示框
tooltip: {
//鼠标悬停提示框
trigger: "item", //item为默认值 指该点的值
},
legend: { //图例
legend: {
//图例
type: "scroll",
orient: "vertical", //布局 垂直或水平horizontal
right: "10%",
top: "15%", //设置侧边说明 距离
bottom: 10,
// left:10,
formatter: function (name) { //格式化图例文本
formatter: function (name) {
//格式化图例文本
console.log(name);
// 获取legend显示内容
let data = self.ZQList; //你的数据
......@@ -529,39 +532,45 @@ export default {
series: [
{
name: "种犬数",
type: "pie", //pie饼状图 line折线图 bar柱状图 scatter散点图 radar雷达图
type: "pie", //pie饼状图 line折线图 bar柱状图 scatter散点图 radar雷达图
radius: ["50%", "80%"], //半径
center: ["28%", "53%"], //这个属性调整图像的位置
avoidLabelOverlap: false, //是否防止标签重叠
zlevel: 1, //对于canvas分层的 默认0
avoidLabelOverlap: false, //是否防止标签重叠
zlevel: 1, //对于canvas分层的 默认0
// label: {
// show: false,
// position: "center",
// },
label: { //饼图图形上的文本标签
normal: { //普通样式
label: {
//饼图图形上的文本标签
normal: {
//普通样式
// formatter: "{b}:{c}" + "\n\r" + "({d}%)",
formatter: "{c}", // 悬停后中间显示的数量 b为一级/二级/三级
show: false,
position: "center",
backgroundColor: "#2a2c52", //total 改变层级采用覆盖显示
},
emphasis: { // 高亮
emphasis: {
// 高亮
show: true,
fontSize: "20",
fontWeight: "bold",
},
},
labelLine: { // 标签的视觉引导线样式
labelLine: {
// 标签的视觉引导线样式
show: false,
},
tooltip: { //悬停后的文本提示
tooltip: {
//悬停后的文本提示
trigger: "item",
formatter: "{a} <br/>{b}: {c} ({d}%)", //a 系列名称，b 数据项名称，c 数值，d 百分比
},
// itemStyle: { normal: { borderColor: "rgba(255,255,255,0.1)", borderWidth: 10, }},
itemStyle: { // 图形样式
itemStyle: {
// 图形样式
borderWidth: 2, //设置border的宽度有多大
borderColor: "rgba(1, 8, 48,0.4)",
},
......@@ -1137,7 +1146,7 @@ export default {
//中国地图
initOption(msg) {
let self = this;
if (msg) {
let urlJson;
// if (msg == "中国刑警学院") {
......@@ -1323,6 +1332,13 @@ export default {
// // debugger;
let jsondata = resJson.data.data.rows;
let resdata = res.data.data;
// let resdata = [
// { total: 1, areaName: "", percentage: "16.667%" },
// { total: 4, areaName: "1", percentage: "66.667%" },
// { total: 0, areaName: "3", percentage: "0" },
// { total: 0, areaName: "4", percentage: "0" },
// { total: 1, areaName: "2", percentage: "16.667%" },
// ];
resdata.forEach((item) => {
jsondata.forEach((item2) => {
// // debugger;
......@@ -1353,19 +1369,37 @@ export default {
//把各个大区的省份用二维数组分开
["黑龙江", "吉林", "辽宁", "河北", "山西", "内蒙古"],
["西藏", "四川", "云南", "重庆", "贵州", "广西", "广东"],
["新疆","青海","甘肃","宁夏","陕西","河南","湖北","湖南","江西"],
["北京","天津","山东","江苏","安徽","上海","浙江","福建"],
[
"新疆",
"青海",
"甘肃",
"宁夏",
"陕西",
"河南",
"湖北",
"湖南",
"江西",
],
[
"北京",
"天津",
"山东",
"江苏",
"安徽",
"上海",
"浙江",
"福建",
],
],
properties: {
//自定义大区的名字，要和上面的大区省份一一对应
name: self.newarr,
cp: [
//经纬度可以自己随意定义
[116.24, 42.54], //沈阳
[102.28, 30.13], //南昌
[93.2, 38.32], //南京
[120.28, 30.13], //昆明片区
[93.2, 38.32], //南京 3
[116.24, 42.54], //沈阳 4
[120.28, 30.13], //昆明片区 1
[102.28, 30.13], //南昌 2
],
},
};
......
src/views/login.vue
......@@ -25,7 +25,7 @@
<img src="../assets/img/login/jinhui.png" alt="" />
</div>
<div class="title">
<div>警犬管理与指挥子系统</div>
<div>警犬管理与调度子系统</div>
</div>
<div v-show="ifShowForm" style="height:300px">
<div
......
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