diff --git a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
index 36feb308b..a5372bbb5 100644
--- a/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
+++ b/src/views/modules/base/epidemic/travelPanshi/travelPanshiForm.vue
@@ -152,7 +152,7 @@
-
@@ -473,10 +473,10 @@ export default {
],
presentAddress: [
- { required: true, message: '来曹居住地点不能为空', trigger: 'change' },
+ { required: true, message: '在曹居住地点不能为空', trigger: 'change' },
],
detailAddress: [
- { required: true, message: '来曹居住详细地址不能为空', trigger: 'change' },
+ { required: true, message: '在曹居住详细地址不能为空', trigger: 'change' },
],
trafficType: [
diff --git a/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
index fdef145e9..882deeffb 100644
--- a/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
+++ b/src/views/modules/base/epidemic/veroFocus/vfVisiteList.vue
@@ -151,10 +151,10 @@ export default {
methods: {
async initTable (row) {
-
- this.formData.idCard = row.idCard
+ console.log(row)
+ this.formData.idCard = row.realIdCard
this.formData.name = row.name
- this.formData.mobile = row.mobile
+ this.formData.mobile = row.realMobile
await this.loadTable()
diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index e9785bebb..2559274b9 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -193,13 +193,14 @@
style="color:#1C6AFD;text-decoration: underline;"
size="small"
@click="handleDetail(scope.row)">查看
- 修改
- 删除
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index fa3cfb952..bc61e38c6 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -128,6 +128,12 @@
label="单位名称"
min-width="100">
+
+
查看
- 修改
- 更多
+ 积分记录
+
diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index 422d1fb72..cc4fcbf79 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -655,10 +655,12 @@ export default {
console.log("handleMoveCenter", e);
//修改地图中心点
const { lat, lng } = map.getCenter();
+ console.log("getCenter", lat);
this.fmData[item.supKeys[0]] = parseFloat(lng);
this.fmData[item.supKeys[1]] = parseFloat(lat);
map.setMarker(lat, lng);
+ console.log("setMarker", lat);
let { msg, data } = await map.getAddress(lat, lng);
if (msg == "success") {
diff --git a/src/views/modules/visual/command/cpts/map-ol.vue b/src/views/modules/visual/command/cpts/map-ol.vue
index 0959d17f8..df446bf40 100644
--- a/src/views/modules/visual/command/cpts/map-ol.vue
+++ b/src/views/modules/visual/command/cpts/map-ol.vue
@@ -456,9 +456,11 @@ export default {
target: "map",
});
- myMap.on("singleclick", function (e) {
- // console.log(e.coordinate)
- // console.log(transform(e.coordinate, 'EPSG:3857', 'EPSG:4326'));
+ myMap.on("singleclick", (event) => {
+ myMap.forEachFeatureAtPixel(event.pixel, function (feature) {
+ // 为移动到的 feature 发送自定义的 mousemove 消息
+ feature.dispatchEvent({ type: "click", event });
+ });
});
await nextTick();
@@ -535,6 +537,21 @@ export default {
}),
];
+ item.on("click", function (event) {
+ console.log("我被点击拉", item, event);
+ // 修改feature的样式为半径100像素的园，用蓝色填充
+ this.setStyle(
+ new ol.style.Style({
+ image: new ol.style.Circle({
+ radius: 100,
+ fill: new ol.style.Fill({
+ color: "blue",
+ }),
+ }),
+ })
+ );
+ });
+
setInterval(() => {
let currStyle = item.getStyle();
if (!Array.isArray(currStyle)) {
diff --git a/src/views/modules/visual/command/index.vue b/src/views/modules/visual/command/index.vue
index fd33754a7..4a08c4291 100644
--- a/src/views/modules/visual/command/index.vue
+++ b/src/views/modules/visual/command/index.vue
@@ -288,7 +288,10 @@ export default {
People,
cptCard,
ScreenLoading,
- gridMap: mapType == "tdzw" ? gridMapOl : gridMap,
+ gridMap:
+ mapType == "tdzw" && SITE_CONFIG["nodeEnv"] == "dev_sdtdt"
+ ? gridMapOl
+ : gridMap,
sidemenu1,
sidemenu2,
sidemenuLeft,
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
index 10d126fb1..050beb36c 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
@@ -1629,8 +1629,6 @@ const vueGis = {
this.zoom = 13
} else if (agencyLevel === 'community') {
this.zoom = 14
- } else {
- this.zoom = 11
}
},
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
index 140fddfc7..2c84054ed 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
@@ -1637,8 +1637,6 @@ const vueGis = {
this.zoom = 13
} else if (agencyLevel === 'community') {
this.zoom = 14
- } else {
- this.zoom = 11
}
},
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
index 9d8245eb3..6d7d9141b 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
@@ -1632,8 +1632,6 @@ const vueGis = {
this.zoom = 13
} else if (agencyLevel === 'community') {
this.zoom = 14
- } else {
- this.zoom = 11
}
},
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/chart.js b/src/views/modules/visual/communityGovern/shijianchuli/chart.js
index a1006c0ac..f7c5dda59 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/chart.js
+++ b/src/views/modules/visual/communityGovern/shijianchuli/chart.js
@@ -7,8 +7,7 @@
* @param pieHeight 立体的高度
* @param opacity 饼或者环的透明度
*/
- const getPie3D = (pieData, internalDiameterRatio, distance, alpha, pieHeight, opacity = 1,beta) => {
-
+ const getPie3D = (pieData, internalDiameterRatio, distance, alpha, pieHeight, opacity = 1) => {
const series = []
let sumValue = 0
let startValue = 0
@@ -54,7 +53,7 @@
}
series.push(seriesItem)
}
-
+
// 使用上一次遍历时，计算出的数据和 sumValue，调用 getParametricEquation 函数，
// 向每个 series-surface 传入不同的参数方程 series-surface.parametricEquation，也就是实现每一个扇形。
legendData = []
@@ -157,7 +156,7 @@
viewControl: {
// 3d效果可以放大、旋转等，请自己去查看官方配置
alpha, // 角度
- beta,
+ beta: -40,
distance, // 调整视角到主体的距离，类似调整zoom
rotateSensitivity: 0, // 设置为0无法旋转
zoomSensitivity: 0, // 设置为0无法缩放
@@ -246,7 +245,6 @@ const getParametricEquation = (startRatio, endRatio, isSelected, isHovered, k, h
* 获取3d丙图的最高扇区的高度
*/
const getHeight3D = (series, height) => {
-
series.sort((a, b) => {
return b.pieData.value - a.pieData.value
})
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js b/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
index 20eb6457e..04b4f9503 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
+++ b/src/views/modules/visual/communityGovern/shijianchuli/lineOption.js
@@ -1,37 +1,16 @@
import * as echarts from 'echarts'
-let circleList = [
- 'image://data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAhCAYAAAC4JqlRAAAFdklEQVRYhY1YTY/bRBh+/BHbiRN7l02bqst+st1dVT0gceXABYk7PfYPwIELv4IfABJ3euuBCxKCKxckBEKi2y1F6Xa3abTZT+fLHxnbaMZje+zE3Y70aiLPzPs888w778xEin/8EO9YJKGbVDEkrvhdWdSKBumGehGJReBVdVZyApsPk/roicSdi4aKb4sUEK38jeLEHIdVRQWOnsgLgORCLWsKzFUDqlmHXEvGRzMCMnEx6XmIgpCDRaU6saMnMTYfRpmMQgzIJdCiNTebqHc6kHUbMYkQBT7ikCReFBWypkNSZUS+A/f0FOOjMSdRtlgglikgypwCK8z0FQPWzgYkpQn/8grT3jFmo0ggjMxhrSWjsWqhcXcP9c4Yo5fH8AYugFDQOSVBx8apAqkzRQBXYd1bhnF7G8HVNZznV4hDhZNWuIkEQm4EkhLC3luGtrwEb9DF8MUV+560R7xmpFXMB1kCYu+1obc3MD7qY9qbAagDqHFTKwhQkBnicIbrgyEaqy6am9uQ5Fdwnp8LfaW0FpcgX3NzvcXARy/6cAchB9e5aZxEqhaEWVGiAQCftU97PuJZH617GzBdH5Njh4/JglKdi3i1XkNzbQuTNwO4A8LBjZJpXAWRAOHgnkBOgjtwoZgD5tM/ewripkHJMFMHuQr2fgehTzB+ORVmTUmYAJoAWgAsAHbJLN7W5H1z1agv6pP6LgZvYRdIkGsKVLOD64Mel1njM6fOGtxxg33rfLwNe3+DjXYOX+H0t64we0nYasnSjLrnWLq/CrnWZ3mDkygSsHdtRLMA/iXhYJqgQELAuvc+9r98BOPWeqbdnU+Ajc+PcfjdDxi+eC2Akywu/MsJ800xrp6epQTkwi5QmzYCZ8yJqYIKCYn6nTYefP1FATwt9Btto31y+TVh16jMN8UQMOWCAnKtgeDaK+SCnISGDx59CrW5PAeeLWhzmfVJ+xe3rMx8yzVTPE+KQSgpOmbD2cKMyBLTzoNK8LQkfcRkJWdKU9+SoolBKJeGS4gjlLZmbkrdupGA0rAqx+e+s1ImEPNVKR+riYX+6EYCoTeqHJ/7XkggRhwGqFk1IYqjQo4fdZ/dSGDUPRTyfij4iZlviiGQSAkkDKPZFJplCMBEyHABuo9/BZlWq0Dbuo9/yfrn4xMi1DfFEC4ossAmBpk4qC01CwdLnts9TE5Ocfjt9wicwRx44CRttE+SkHw+dpaRoL4phoCpZuDURl0HKx9tQVuiW6ac25MMd/l3F79/9Q1WP7uP1vY6l/0YvZ8PEIf07J9yc/nYRAnqU9F1XP/jiAoUCZApAZkO0Npq4+KvMz5YFRJWcuzSdXz90x8A/uTjIz5TnwOnBHIVWlu3mG+KUVoCCCQiOAd9KA0d5pohKJA6pVmSxsCQngAlG/K28ZwC1JfSMJjv/EaEVAFxq0QgLoHbfwlzfQdk2oN/4S3I7W+7D/gF01ckmOsduP3/mO/SJbW4BKkjGguKfgJ7fw3Df9/AO/OEwAxuvBGlshu3FFi7dxFcnjCf+bYsxEB6RUovCSGrr58NYO9FsHY3ob93Aee5w52rhQuHuHzi1rX3bOjtFfjnR/w6Fop3wXRceikt3/9TABX1TgOt7Q12unnnV5icjBB65fhJlkExAHOtBaO9zOQfdV/BPZ1yUlFJgUgkAIFA+V2QkLF2LRjt25BVC2HgI/LpuyCZiaTIkHUdiqYjIkP4F2dcsaiUDefeBSKBRQeIPFerpgJz3YRq1NlDhAlJIhDPxeR4AjKZm2U58BblgfTNFvPnWeHqLMQHQCYSnGd+xeM0fwNWAGbPMv42rHqelx+gVa/lcnnba1gkl5Wq53m587v8NyCOXfR7vgD4H8khvGFl000HAAAAAElFTkSuQmCC',
- 'image://data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAhCAYAAAC4JqlRAAAFb0lEQVRYhY1YW28bRRT+ZtbrS24mjVu3btPUDoiqFIEQ4gUh8dKX8hf4A/wT+Am88cA7b5GgrxVPFIREL0rapHHbOHGcxM7Fa3u9c9BMZrZn1+umI43W2j2Xb75z5pwZi89/JLznEExMTFGhKb+njtyUD+KCZxaILOfTnvGIAfj3z5/hmjGcnpjyLosBPtPvtB+yfsxIMBCuQWY4komnD09eRVHMoISc1R9jTH0EahcDhIisM5V6mhmugfz75t35qlgOyJTTxJQ3MCcqqIo8yhRBIcQQCmOrmYOPgvAgaYQedbCnXuPUgkhPYsBiBjjNzrGnp1hEUd7CCiTmqIsjtYsmnRllyfSMQTELKa5iQVTxsXcZp6qJJh0gAAwrbjgQWpc4gLTznKxjUSyhgR660Qu8hDLv8w5cCkBEZ4joBU4h0fNWsSjr+IQWsKm2cDQlYQ2AdJKdO2+gIi5hhV6jpXYRAijpHLIzlwXAZAMQ6gBFGziWVxGIG2hIgW21iQ6TFe7JGYhjLmuY187VS7SoYwxr5wU78xaEZ+VhaY2Mc2AEYKi/q10MxRgtHUI5wFDtoGd14qTMpTNeFOHLGupqD23qmBVp58XUzFsWOICxdT5g4AR1EFAJbW2TDvGYBnFSCs5AzIJcRZVGGKtX6AOYsasu2d8lxoafAhDalfPwmOTUtsQi5rXt6DFe8zqSTEIfnphBNdrAG+sgb1fuAMzaZ7FxG40rNaxo5fYOtjefYZOtXrCtZkKjmuh4H+E6fLQQGrbEBACvjjKFGFHXCMxaAJyB2cvXcOPre/h+dgE33SpW7wCffoXmnw/w637LrJBYWExeUBdn2rb2Ea1j3wGQiV0wgzKdmAKSs9PnIOY/QOXb7/ADd+7G3AJu6m9ahoUpz3ZNztieQZn7lJwB4WOGjg2NcS1gIPJffoN7+SIW087d0N+0jJNPbVmpbQvfMCs4A2+TUKKAU0PZREXUhipV3J3m3A0rk2N6MmZa25YGWJyEMqUvSLGkTE0/j4WLAPgFI5Opz2zHIw2AbFDSbfW8k4U4uQhAODIymfrMdiYAgsIIcyZuxDpY5MrsYRtPLwJw2MYzm/1OT8UNSNtWplglWnC8YhqjL+bNvlestrsKN3r0EA/sCqeu/tFD/OHkmb4Bom1rH/yAIhkaQh89MY+5RGN5W9sH3QPsPfwdPwd9tNPOg/75Ny1jC9LQ6oYOhLHdN/0g0Q1jBlQTPe8u6qIMSb2J2m4q3M42Nn/7BT/d/gx3KtXzetDZQ/PZv3hCyvT+vp2B1TVMaJsij0K0HgMwIBIAKMCYBmjLZVSinqlWI9Z0XHmNSGH09B/8BeBvq897QcAAxCzIZVzWtrWPLAAOhFIbaMm7qMgaimrHKPNEdeV1eEE3HHAGtC1RRDH6D+vsRAQHgG8VRQOMqY0tUcOHIsAbOjJG0rX9XeeBIZ9iEULUUFVtPNe2kTqkJkLgDOlckHm8kqtYVlvYoQMDImKrfPeJyNIuluDJOmrUxSttk23LRAjcEckdErSQUM/Rlg0or45bqowDtWkMhLy2pw+lfOvKBsryEpbUIV7a45irC/GJOM2AYB+MoFakE/TlMla8L1CmQxypFk4MuZNVVOn+J6+Z45xuWMNoG09o3yTkGMnjOTJ3AYvn252xj9NoH09lHQtiCVdyVdwifScYYYjIynqmxRSEjwKNcUxdbKkXhjGVqoYqlXMTu4BnO88LqbZwiC10RQmeuI5ZUUAJecvCGIqOEag3OKMgEefM21F6F5hh72xkr2eJozPLD1AAQc9NELIup9x4VkOCu5ZN3A3dC+6MGZt2W06Pd92G3QITY9r1PEHTe/43wHWzfk8OAP8D28XBfaJJ48oAAAAASUVORK5CYII='
-]
-
-
export function lineOption () {
return {
tooltip: {
trigger: 'axis',
- // axisPointer: {
- // type: 'cross',
- // label: {
- // backgroundColor: '#6a7985'
- // }
- // },
- formatter: (params) => {
- console.log(params);
- return `
-
${params[0].axisValue}
-
项目数 ${params[0].value}
-
月度新增事件统计
-
-
-
@@ -97,31 +106,37 @@
-
+
@@ -140,15 +155,9 @@ import { lineOption } from "./lineOption.js";
import nextTick from "dai-js/tools/nextTick";
import dateFormat from "dai-js/tools/dateFormat";
-import * as echarts from 'echarts';
-import 'echarts-gl';
-import { getPie3D, getParametricEquation } from './chart.js' //工具类js，页面路径自己修改
-
-const color = ['#0075ff', '#ffa516']
-
export default {
name: "shijianchulifenxi",
- data () {
+ data() {
return {
dataLoading: true,
pieNoData: false,
@@ -173,28 +182,6 @@ export default {
pieInitState: false,
pieData: [],
- optionData: [
- {
- name: '处理中',
- value: 28
- },
- {
- name: '已完成',
- value: 72
- }
- ],
- optionDataLine: [
- {
- name: '处理中',
- value: 50
- },
- {
- name: '已完成',
- value: 50
- }
- ],
- statusChart: null,
- option: {},
legendArray: [
{
@@ -213,13 +200,12 @@ export default {
timeRange: [],
- orgId: '',
- orgType: 'agency',
- queryStartTime: '',
- queryEndTime: '',
- // processStatus: 'closed_case',
- processStatus: '',
- dataType: '1',
+ orgId: "",
+ orgType: "agency",
+ queryStartTime: "",
+ queryEndTime: "",
+ processStatus: "closed_case",
+ dataType: "1",
casOptions: [],
agencyIdArray: [],
@@ -310,49 +296,37 @@ export default {
},
showProject: false,
- eventId: '',
-
- beta: 20,
- selectedIndex: ''
-
+ eventId: "",
};
},
// mixins: [animate]
- beforeDestroy () { },
- async created () { },
+ beforeDestroy() {},
+ async created() {},
- async mounted () {
+ async mounted() {
this.dataLoading = true;
//初始化时间、各组件
- this.initData()
- await this.getAgencylist()//获取组织级别
- this.handleChangeDate(this.dataType, false)
+ this.initData();
+ await this.getAgencylist(); //获取组织级别
+ this.handleChangeDate(this.dataType);
//获取服务器数据
-
- await this.getProjectTotal()
- await this.getLineChart()
- await this.getTable()
-
- this.dataLoading = false
+ await this.getProjectTotal();
+ await this.getLineChart();
this.dataLoading = false;
- this.assignData()
-
+ // this.assignData()
},
methods: {
- async getApiData () {
- this.getTable()
- await this.getProjectTotal()
- await this.getLineChart()
-
- this.assignData()
+ async getApiData() {
+ await this.getProjectTotal();
+ await this.getLineChart();
this.assignData();
},
- async handleChangeDate (index, isRefresh) {
+ async handleChangeDate(index) {
let end = new Date();
let start = new Date();
if (index === "1") {
@@ -373,26 +347,25 @@ export default {
this.queryStartTime = dateFormat(start, "yyyy-MM-dd") + " 00:00:00";
this.queryEndTime = dateFormat(end, "yyyy-MM-dd") + " 23:59:59";
}
- if (index !== '0' && isRefresh) {
- await this.getApiData()
-
+ if (index !== "0") {
+ await this.getApiData();
+ // this.assignPieChart()
}
},
- assignData () {
- this.initChart()
-
- this.getLine()
+ assignData() {
+ this.getPie();
+ this.getLine();
},
- handleSelectChange (value) {
+ handleSelectChange(value) {
this.queryStartTime = value[0] + " 00:00:00";
this.queryEndTime = value[1] + " 23:59:59";
this.getApiData();
},
// 获取当前登录人员信息及组织信息
- async getAgencylist () {
+ async getAgencylist() {
const url = "/gov/org/customeragency/agencygridtree";
//const url = '/gov/org/customeragency/agencylist'
@@ -417,11 +390,11 @@ export default {
},
//加载项目
- async getProjectTotal () {
- // if (this.$refs.pieChart) {
- // this.$refs.pieChart.showLoading()
- // this.$refs.pieChart.clear()
- // }
+ async getProjectTotal() {
+ if (this.$refs.pieChart) {
+ this.$refs.pieChart.showLoading();
+ this.$refs.pieChart.clear();
+ }
const url = "/gov/project/icEvent/processAnalysis/processStatusRatio";
//const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/processStatusRatio";
@@ -433,9 +406,9 @@ export default {
};
const { data, code, msg } = await requestPost(url, params);
- // if (this.$refs.pieChart) {
- // this.$refs.pieChart.hideLoading()
- // }
+ if (this.$refs.pieChart) {
+ this.$refs.pieChart.hideLoading();
+ }
if (code === 0) {
this.projectTotal =
parseInt(data.processingCount) + parseInt(data.closedCount);
@@ -451,84 +424,27 @@ export default {
name: "已完成",
count: data.processingCount,
percent: data.processingRatio,
- url: require('@/assets/img/shuju/measure/lv@2x.png')
- }
- ]
- let dataClosed = Math.floor(data.closedRatio * 10000) / 100
- let dataPro = Math.floor(data.processingRatio * 10000) / 100
- if (data.closedRatio === 0 && data.processingRatio === 0) {
- dataClosed = 50
- dataPro = 50
- }
- let dataClosedLine = Math.floor(data.closedRatio * 10000) / 100
- let dataProLine = Math.floor(data.processingRatio * 10000) / 100
-
- // dataClosed = 5
- // dataPro = 95
-
- // dataClosed = 10
- // dataPro = 90
- // dataClosedLine = 10
- // dataProLine = 90
-
- // dataClosed = 20
- // dataPro = 80
-
- // dataClosed = 30
- // dataPro = 70
-
- // dataClosed = 40
- // dataPro = 60
-
- // dataClosed = 50
- // dataPro = 50
-
-
- if (Math.abs(dataClosed - dataPro) > 80) {
- this.beta = 70
- } else if (Math.abs(dataClosed - dataPro) > 70) {
- this.beta = 60
- } else if (Math.abs(dataClosed - dataPro) > 50) {
- this.beta = 20
- } else if (Math.abs(dataClosed - dataPro) > 30) {
- this.beta = -20
- } else if (Math.abs(dataClosed - dataPro) > 10) {
- this.beta = -30
- } else {
- this.beta = -60
- }
-
- this.optionData = [
- {
- name: "已完成",
- value: dataClosed
+ url: require("@/assets/img/shuju/measure/lv@2x.png"),
},
- {
- name: "处理中",
- value: dataPro
- },
- ]
-
- this.optionDataLine = [
+ ];
+ this.pieData = [
{
name: "已完成",
- value: dataClosedLine
+ value: Math.floor(data.closedRatio * 10000) / 100,
},
{
name: "处理中",
- value: dataProLine
+ value: Math.floor(data.processingRatio * 10000) / 100,
},
- ]
- this.setLabel()
-
+ ];
} else {
this.$message.error(msg);
}
},
//加载组织数据
- async getTable () {
+ async getTable() {
const url = "/gov/project/icEvent/processAnalysis/eventList";
//const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/processAnalysis/eventList";
let params = {
@@ -570,26 +486,26 @@ export default {
}
},
- handlePageNoChange_demand (val) {
+ handlePageNoChange_demand(val) {
this.demand.pageNo = val;
this.getTable();
},
- toEventInfo (index) {
+ toEventInfo(index) {
const { tableList } = this;
this.eventId = tableList[index].eventId;
this.showProject = true;
},
- pieInitOk (dom) {
+ pieInitOk(dom) {
this.pieChartS = dom;
this.pieInitState = true;
},
- lineInitOk () {
+ lineInitOk() {
this.lineInitState = true;
},
- getLine () {
+ getLine() {
if (this.lineInitState) {
this.assignLineChart();
} else {
@@ -599,7 +515,7 @@ export default {
}
},
// 获取折线图
- async getLineChart () {
+ async getLineChart() {
if (this.$refs.lineChart) {
this.$refs.lineChart.clear();
this.$refs.lineChart.showLoading();
@@ -641,390 +557,106 @@ export default {
}
},
- assignLineChart () {
-
- this.lineOption = lineOption()
- this.$refs.lineChart.setOption(this.lineOption, true)
- this.$refs.lineChart.setOption({
- xAxis: { data: this.lineXaxis },
- series: [
- { data: this.lineSeriesData },
- { data: this.lineSeriesData },
-
- ]
- }, true)
- },
-
- setLabel () {
- this.optionDataLine.forEach((item, index) => {
-
- item.itemStyle = {
- color: color[index]
- }
- item.label = {
- normal: {
- show: true,
- color: color[index],
- formatter: [
- '{d|{d}%}',
- '{b|{b}}'
- ].join('\n'), // 用\n来换行
- rich: {
- b: {
- color: '#fff',
- lineHeight: 25,
- align: 'left',
- fontSize: 13,
- marginTop: 20
- },
- c: {
- fontSize: 22,
- color: '#fff',
- textShadowColor: '#1c90a6',
- textShadowOffsetX: 0,
- textShadowOffsetY: 2,
- textShadowBlur: 5
- },
- d: {
- color: color[index],
- fontSize: 22,
- align: 'left'
- }
- }
- }
- }
- item.labelLine = {
-
- normal: {
- show: true,
- length: 30,
- length2: 80,
- lineStyle: {
- width: 1,
- color: 'rgba(255,255,255,0.7)'
- }
- }
- }
- item.labelLayout = function (params) {
- const isLeft = params.labelRect.x < myChart.getWidth() / 2;
- const points = params.labelLinePoints;
- // Update the end point.
- points[2][0] = isLeft
- ? params.labelRect.x
- : params.labelRect.x + params.labelRect.width;
- return {
- labelLinePoints: points
- };
- }
- })
- this.optionData.forEach((item, index) => {
-
- item.itemStyle = {
- color: color[index]
- }
- item.label = {
- normal: {
- show: true,
- color: color[index],
- formatter: [
- '{d|{d}%}',
- '{b|{b}}'
- ].join('\n'), // 用\n来换行
- rich: {
- b: {
- color: '#fff',
- lineHeight: 25,
- align: 'left',
- fontSize: 13,
- marginTop: 20
- },
- c: {
- fontSize: 22,
- color: '#fff',
- textShadowColor: '#1c90a6',
- textShadowOffsetX: 0,
- textShadowOffsetY: 2,
- textShadowBlur: 5
- },
- d: {
- color: color[index],
- fontSize: 22,
- align: 'left'
- }
- }
- }
- }
- item.labelLine = {
-
- normal: {
- show: true,
- length: 30,
- length2: 80,
- lineStyle: {
- width: 1,
- color: 'rgba(255,255,255,0.7)'
- }
- }
- }
- item.labelLayout = function (params) {
- const isLeft = params.labelRect.x < myChart.getWidth() / 2;
- const points = params.labelLinePoints;
- // Update the end point.
- points[2][0] = isLeft
- ? params.labelRect.x
- : params.labelRect.x + params.labelRect.width;
- return {
- labelLinePoints: points
- };
- }
- })
+ assignLineChart() {
+ this.lineOption = lineOption();
+ this.$refs.lineChart.setOption(this.lineOption, true);
+ this.$refs.lineChart.setOption(
+ {
+ xAxis: { data: this.lineXaxis },
+ series: [{ data: this.lineSeriesData }],
+ },
+ true
+ );
},
- // 图表初始化
- initChart () {
- this.$nextTick(() => {
-
- if (!this.statusChart) {
- this.statusChart = echarts.init(document.getElementById('cityGreenLand'));
- this.bindListen(this.statusChart)
- }
- // let statusChart = echarts.init(document.getElementById('cityGreenLand-charts'));
-
- // 传入数据生成 option, 构建3d饼状图, 参数工具文件已经备注的很详细
- this.option = getPie3D(this.optionData, 0.8, 300, 28, 22, 0.5, this.beta)
- console.log(this.option)
- this.statusChart.setOption(this.option)
- // 是否需要label指引线，如果要就添加一个透明的2d饼状图并调整角度使得labelLine和3d的饼状图对齐，并再次setOption
- this.option.series.push({
- name: '', //自己根据场景修改
- backgroundColor: 'transparent',
- type: 'pie',
- label: {
- opacity: 1,
- fontSize: 13,
- lineHeight: 20
- },
- startAngle: -this.beta, // 起始角度，支持范围[0, 360]。
- clockwise: false, // 饼图的扇区是否是顺时针排布。上述这两项配置主要是为了对齐3d的样式
- radius: ['30%', '35%'],
- center: ['50%', '50%'],
- data: this.optionDataLine,
- itemStyle: {
- opacity: 0 //这里必须是0，不然2d的图会覆盖在表面
- },
-
- })
- this.statusChart.setOption(this.option)
-
- })
-
+ getPie() {
+ if (this.pieInitState) {
+ this.assignPieChart();
+ } else {
+ setTimeout(() => {
+ this.getPie();
+ }, 500);
+ }
},
- // 监听鼠标事件，实现饼图选中效果（单选），近似实现高亮（放大）效果。
- // optionName是防止有多个图表进行定向option传递，单个图表可以不传，默认是opiton
- bindListen (myChart, optionName = 'option') {
- // let selectedIndex = ''
- let hoveredIndex = ''
-
- // 监听点击事件，实现选中效果（单选）
- myChart.on('click', (params) => {
- let dataIndex = null
- console.log('params', params)
- console.log('params.seriesIndex', params.seriesIndex)
- console.log('this[optionName].series', this[optionName].series)
- console.log('this[optionName].series[params.seriesIndex]', this[optionName].series[params.seriesIndex])
-
- if (params.componentSubType === 'pie') {//点击指引线
- dataIndex = params.dataIndex
- this.click3DPie(myChart, 'option', dataIndex)
-
-
- if (dataIndex === 0) {//序列1 已完成
- this.processStatus = 'closed_case'
-
- } else if (dataIndex === 1) {//序列2 处理中
- this.processStatus = 'processing'
- } else {
- this.processStatus = ''
- }
- if (!this.selectedIndex) {
- this.processStatus = ''
- }
-
- } else {//点击环形
- dataIndex = params.seriesIndex
- this.click3DPie(myChart, 'option', dataIndex)
+ // 获取饼状图
+ async assignPieChart() {
+ let maxIndex = 0;
+ const _that = this;
- //刷新右侧table
- if (this.selectedIndex || this.selectedIndex === 0) {
+ // 获取pieChart配置
+ this.pieOption = pieOption(this.pieChartS);
- if (this.selectedIndex === 0) {
- this.processStatus = 'closed_case'
- } else if (this.selectedIndex === 1) {
- this.processStatus = 'processing'
- }
+ this.pieData[0].selected = false;
+ this.pieData[1].selected = false;
+ this.pieOption.title.text = this.projectTotal;
- } else {
- this.processStatus = ''
+ this.clickPie();
- }
+ let fun = function (params) {
+ _that.clickPie(params);
+ };
+ this.$refs.pieChart.handleClick(fun);
+ },
+ clickPie(params) {
+ let dataIndex = params ? params.dataIndex : null;
+ let componentIndex = params ? params.componentIndex : null;
+ if (componentIndex === 1) {
+ //点击数据
+ if (dataIndex === 0) {
+ this.processStatus = "closed_case";
+ } else if (dataIndex === 1) {
+ this.processStatus = "processing";
}
+ } else if (componentIndex === 2) {
+ //点击中心
+ this.processStatus = "";
+ dataIndex = 3;
+ }
- this.getTable()
-
- })
- // 监听 mouseover，近似实现高亮（放大）效果
- // myChart.on('mouseover', (params) => {
- // // 准备重新渲染扇形所需的参数
- // let isSelected
- // let isHovered
- // let startRatio
- // let endRatio
- // let k
- // // 如果触发 mouseover 的扇形当前已高亮，则不做操作
- // if (hoveredIndex === params.seriesIndex) {
- // // 否则进行高亮及必要的取消高亮操作
- // } else {
- // // 如果当前有高亮的扇形，取消其高亮状态（对 option 更新）
- // if (hoveredIndex !== '') {
- // // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 false。
- // isSelected = this[optionName].series[hoveredIndex].pieStatus.selected
- // isHovered = false
- // startRatio = this[optionName].series[hoveredIndex].pieData.startRatio
- // endRatio = this[optionName].series[hoveredIndex].pieData.endRatio
- // k = this[optionName].series[hoveredIndex].pieStatus.k
- // // 对当前点击的扇形，执行取消高亮操作（对 option 更新）
- // this[optionName].series[
- // hoveredIndex
- // ].parametricEquation = getParametricEquation(
- // startRatio,
- // endRatio,
- // isSelected,
- // isHovered,
- // k,
- // this[optionName].series[hoveredIndex].pieData.value
- // )
- // this[optionName].series[hoveredIndex].pieStatus.hovered = isHovered
- // // 将此前记录的上次选中的扇形对应的系列号 seriesIndex 清空
- // hoveredIndex = ''
- // }
- // // 如果触发 mouseover 的扇形不是透明圆环，将其高亮（对 option 更新）
- // if (
- // params.seriesName !== 'mouseoutSeries' &&
- // params.seriesName !== 'pie2d'
- // ) {
- // // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 true。
- // isSelected =
- // this[optionName].series[params.seriesIndex].pieStatus.selected
- // isHovered = true
- // startRatio =
- // this[optionName].series[params.seriesIndex].pieData.startRatio
- // endRatio = this[optionName].series[params.seriesIndex].pieData.endRatio
- // k = this[optionName].series[params.seriesIndex].pieStatus.k
- // // 对当前点击的扇形，执行高亮操作（对 option 更新）
- // this[optionName].series[
- // params.seriesIndex
- // ].parametricEquation = getParametricEquation(
- // startRatio,
- // endRatio,
- // isSelected,
- // isHovered,
- // k,
- // this[optionName].series[params.seriesIndex].pieData.value + 60
- // )
- // this[optionName].series[
- // params.seriesIndex
- // ].pieStatus.hovered = isHovered
- // // 记录上次高亮的扇形对应的系列号 seriesIndex
- // hoveredIndex = params.seriesIndex
- // }
- // // 使用更新后的 option，渲染图表
- // myChart.setOption(this[optionName])
- // }
- // })
- // // 修正取消高亮失败的 bug
- // myChart.on('globalout', () => {
- // // 准备重新渲染扇形所需的参数
- // let isSelected
- // let isHovered
- // let startRatio
- // let endRatio
- // let k
- // if (hoveredIndex !== '') {
- // // 从 option.series 中读取重新渲染扇形所需的参数，将是否高亮设置为 true。
- // isSelected = this[optionName].series[hoveredIndex].pieStatus.selected
- // isHovered = false
- // k = this[optionName].series[hoveredIndex].pieStatus.k
- // startRatio = this[optionName].series[hoveredIndex].pieData.startRatio
- // endRatio = this[optionName].series[hoveredIndex].pieData.endRatio
- // // 对当前点击的扇形，执行取消高亮操作（对 option 更新）
- // this[optionName].series[
- // hoveredIndex
- // ].parametricEquation = getParametricEquation(
- // startRatio,
- // endRatio,
- // isSelected,
- // isHovered,
- // k,
- // this[optionName].series[hoveredIndex].pieData.value
- // )
- // this[optionName].series[hoveredIndex].pieStatus.hovered = isHovered
- // // 将此前记录的上次选中的扇形对应的系列号 seriesIndex 清空
- // hoveredIndex = ''
- // }
- // // 使用更新后的 option，渲染图表
- // myChart.setOption(this[optionName])
- // })
+ if (dataIndex === 3) {
+ this.$refs.pieChart.clear();
+ }
+ this.pieData.forEach((element, index) => {
+ if (index === dataIndex) {
+ element.selected = true;
+ element.label = {
+ show: true,
+ };
+ element.labelLine = {
+ show: true,
+ lineStyle: {
+ opacity: 1,
+ },
+ };
+ // element.selected = !element.selected
+ } else {
+ element.selected = false;
+ element.label = {
+ show: false,
+ };
+ element.labelLine = {
+ show: false,
+ lineStyle: {
+ opacity: 0,
+ color: "rgba(255,255,255,0)",
+ },
+ };
+ element.selected = false;
+ }
+ });
- },
+ this.pieOption.series[1].data = this.pieData;
+ this.demand.pageNo = 1;
+ this.getTable();
- click3DPie (myChart, optionName, seriesIndex) {
-
- // 从 option.series 中读取重新渲染扇形所需的参数，将是否选中取反。
- const isSelected = !this[optionName].series[seriesIndex].pieStatus.selected
- const isHovered = this[optionName].series[seriesIndex].pieStatus.hovered
- const k = this[optionName].series[seriesIndex].pieStatus.k
-
- const startRatio = this[optionName].series[seriesIndex].pieData.startRatio
- const endRatio = this[optionName].series[seriesIndex].pieData.endRatio
-
-
- // 如果之前选中过其他扇形，将其取消选中（对 option 更新）
- if (this.selectedIndex !== '' && this.selectedIndex !== null && this.selectedIndex !== seriesIndex) {
- this[optionName].series[
- this.selectedIndex
- ].parametricEquation = getParametricEquation(
- this[optionName].series[this.selectedIndex].pieData.startRatio,
- this[optionName].series[this.selectedIndex].pieData.endRatio,
- false,
- false,
- k,
- this[optionName].series[this.selectedIndex].pieData.value
- )
- this[optionName].series[this.selectedIndex].pieStatus.selected = false
- }
- // 对当前点击的扇形，执行选中/取消选中操作（对 option 更新）
- this[optionName].series[
- seriesIndex
- ].parametricEquation = getParametricEquation(
- startRatio,
- endRatio,
- isSelected,
- isHovered,
- k,
- this[optionName].series[seriesIndex].pieData.value
- )
- this[optionName].series[seriesIndex].pieStatus.selected = isSelected
-
- // 如果本次是选中操作，记录上次选中的扇形对应的系列号 seriesIndex
- this.selectedIndex = isSelected ? seriesIndex : null
- // 使用更新后的 option，渲染图表
- myChart.setOption(this[optionName])
+ // this.$refs.pieChart.hideLoading()
+ this.$refs.pieChart.setOption(this.pieOption);
},
- handleChangeAgency () {
+ handleChangeAgency() {
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data;
if (obj) {
this.orgType = obj.level === "grid" ? "grid" : "agency";
@@ -1038,7 +670,7 @@ export default {
},
//初始化时间
- initData () {
+ initData() {
var time = new Date().getTime() - 24 * 60 * 60 * 1000;
var nowdate = new Date(time); // 获取的是前一天日期
var y = nowdate.getFullYear();
@@ -1071,15 +703,15 @@ export default {
},
watch: {
- dateIdShow () {
+ dateIdShow() {
// let dataArray = this.dateIdShow.split('-')
// this.dateId = dataArray.join('')
},
- uid (id) {
+ uid(id) {
this.userId = id;
},
- userId () {
-
+ userId() {
+ // this.getApiData();
window.scrollTo(0, 0);
},
},
@@ -1096,34 +728,3 @@ export default {
src="@/assets/scss/modules/visual/search_1.scss"
scoped
>
-
-
-
-
diff --git a/src/views/modules/workSys/dataOpenConfig.vue b/src/views/modules/workSys/dataOpenConfig.vue
index e8bdad7a5..54bcfba5a 100644
--- a/src/views/modules/workSys/dataOpenConfig.vue
+++ b/src/views/modules/workSys/dataOpenConfig.vue
@@ -76,16 +76,6 @@
:inline="true"
:model="formData">
-
- {{selRow.deptName}}
-
-
- {{selRow.dataName}}
-
@@ -157,7 +147,6 @@ export default {
scopeList: [],
dataSyncConfigId: '',
- selRow:{}
}
},
@@ -199,8 +188,7 @@ export default {
async getOrgList () {
- // const url = '/gov/org/customeragency/my-subagency-list'
- const url = '/gov/org/customeragency/agencylist'
+ const url = '/gov/org/customeragency/my-subagency-list'
let params = {};
@@ -307,7 +295,6 @@ export default {
// 编辑 customerId,parentCategoryId,dateform
editShow (row) {
- this.selRow=row
this.dataSyncConfigId = row.id
this.orgIdArray = []
diff --git a/src/views/modules/workSys/mapConfig.vue b/src/views/modules/workSys/mapConfig.vue
index 96f209a03..939b9e36b 100644
--- a/src/views/modules/workSys/mapConfig.vue
+++ b/src/views/modules/workSys/mapConfig.vue
@@ -647,27 +647,27 @@ const vueGis = {
gaodeMapLayer = new TileLayer({
title: "地图",
- source: new XYZ({
- url: "http://t4.tianditu.com/DataServer?T=vec_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
- }),
// source: new XYZ({
- // url: "http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926&x={x}&y={y}&l={z}"
+ // url: "http://t4.tianditu.com/DataServer?T=vec_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
// }),
// source: new XYZ({
- // //指定url瓦片
- // url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}',
- // wrapX: true//x方向平铺，也可以选择false
+ // url: "http://api.tianditu.gov.cn/api?v=4.0&tk=c4dc987b442bd141a887d8d4a5d07926&x={x}&y={y}&l={z}"
// }),
+ source: new XYZ({
+ //指定url瓦片
+ url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&style=7<ype=7&scl=0&size=0&x={x}&y={y}&z={z}",
+ wrapX: true, //x方向平铺，也可以选择false
+ }),
// zIndex: 20
});
- var sourceMark = new XYZ({
- url: "http://t4.tianditu.com/DataServer?T=cva_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
- // zIndex: 22
- });
- var tileMark = new TileLayer({
- title: "标注图层",
- source: sourceMark,
- });
+ // var sourceMark = new XYZ({
+ // url: "http://t4.tianditu.com/DataServer?T=cva_w&tk=8a08c117ab9ee45d508686b01cc8d397&x={x}&y={y}&l={z}",
+ // // zIndex: 22
+ // });
+ // var tileMark = new TileLayer({
+ // title: "标注图层",
+ // source: sourceMark,
+ // });
(mapView = new View({
//中心点坐标
@@ -680,7 +680,8 @@ const vueGis = {
//初始化map和地图底图
//创建地图容器
(map = new Map({
- layers: [gaodeMapLayer, tileMark],
+ layers: [gaodeMapLayer],
+ // layers: [gaodeMapLayer, tileMark],
//加载瓦片图层数据
view: mapView,
target: "map",
diff --git a/src/views/pages/yantai-index.vue b/src/views/pages/yantai-index.vue
deleted file mode 100644
index 7dcac702f..000000000
--- a/src/views/pages/yantai-index.vue
+++ /dev/null
@@ -1,209 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
管理平台
-
-
-
-
-
-
-
数据分析平台
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{ $t("brand.work") }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
![]()
-
-
- {{ $t("login.title") }}
-
- 请使用小程序端的账号密码登录
-
-
-
-
-
-
-
-
-
-
-
- {{
- item.customerName
- }}
-
-
-