diff --git a/src/api/yingji/keyEnterprise.js b/src/api/yingji/keyEnterprise.js index fee0c54..2faf740 100644 --- a/src/api/yingji/keyEnterprise.js +++ b/src/api/yingji/keyEnterprise.js @@ -68,6 +68,13 @@ export function enforcingDetail(data) { }) } +//执法列表详情 +export function enforcingGet(id) { + return request({ + url: `/pharmaceuticals/examine/${id}`, + method: 'get', + }) +} // 根据字段查询字典信息 export function listDist(query) { diff --git a/src/views/yingji/echarts/completePlan.vue b/src/views/yingji/echarts/completePlan.vue index 8293b1f..8569695 100644 --- a/src/views/yingji/echarts/completePlan.vue +++ b/src/views/yingji/echarts/completePlan.vue @@ -1,5 +1,5 @@ @@ -21,7 +21,8 @@ export default { }, mounted() { this.$nextTick(() => { - this.getData(); + // this.getData(); + this.initChart() }); }, methods: { @@ -89,20 +90,20 @@ export default { yAxis: [ { type: "category", - // data: [ - // "高新区", - // "工业园区", - // "相城区", - // "姑苏区", - // "吴中区", - // "吴江区", - // "昆山市", - // "太仓市", - // "常熟市", - // "张家港市", - // "苏州", - // ], - data: this.arr1, + data: [ + "高新区", + "工业园区", + "相城区", + "姑苏区", + "吴中区", + "吴江区", + "昆山市", + "太仓市", + "常熟市", + "张家港市", + "苏州", + ], + // data: this.arr1, axisLabel: { // 超出指定长度显示省略号 formatter: function (value) { @@ -128,8 +129,8 @@ export default { }, { type: "category", - // data: [33, 63, 115, 167, 210, 225, 245, 283, 300, 321, 1000], - data: this.arr2, + data: [33, 63, 115, 167, 210, 225, 245, 283, 300, 321, 1000], + // data: this.arr2, axisLabel: { formatter: function (value, index) { return `{a|${value}}{b|家}`; @@ -163,8 +164,8 @@ export default { label: { show: false, //是否显示标签 }, - // data: [63, 115, 167, 210, 225, 245, 283, 300, 321, 678, 1000], - data: this.arr2, + data: [63, 115, 167, 210, 225, 245, 283, 300, 321, 678, 1000], + // data: this.arr2, barWidth: 12, itemStyle: { color: { diff --git a/src/views/yingji/echarts/executionPlan.vue b/src/views/yingji/echarts/executionPlan.vue index 0142efb..72356e9 100644 --- a/src/views/yingji/echarts/executionPlan.vue +++ b/src/views/yingji/echarts/executionPlan.vue @@ -1,5 +1,5 @@ @@ -16,7 +16,8 @@ export default { }, mounted() { this.$nextTick(() => { - this.getData(); + // this.getData(); + this.init(); }); }, methods: { @@ -68,20 +69,20 @@ export default { xAxis: [ { type: "category", - data: this.arr1, - // data: [ - // "苏州", - // "张家港市", - // "常熟市", - // "太仓市", - // "昆山市", - // "吴江区", - // "吴中区", - // "姑苏区", - // "相城区", - // "工业园区", - // "高新区", - // ], + // data: this.arr1, + data: [ + "苏州", + "张家港市", + "常熟市", + "太仓市", + "昆山市", + "吴江区", + "吴中区", + "姑苏区", + "相城区", + "工业园区", + "高新区", + ], axisTick: { show: false, }, @@ -136,8 +137,8 @@ export default { ]), }, z: 100, - // data: [700, 400, 600, 300, 580, 250, 490, 200, 390, 460, 90], - data: this.arr2, + data: [700, 400, 600, 300, 580, 250, 490, 200, 390, 460, 90], + // data: this.arr2, //高亮的效果 emphasis: { label: { diff --git a/src/views/yingji/echarts/finishRate.vue b/src/views/yingji/echarts/finishRate.vue index 3c5af2c..bf6a226 100644 --- a/src/views/yingji/echarts/finishRate.vue +++ b/src/views/yingji/echarts/finishRate.vue @@ -1,5 +1,5 @@ @@ -22,7 +22,8 @@ export default { }, mounted() { this.$nextTick(() => { - this.getData(); + // this.getData(); + this.initChart(); }); }, methods: { @@ -102,22 +103,23 @@ export default { arrA += value.value; }); const item = option.legend.data.find((item) => item.name === name); - return `{a|${name}}{b|${( item.value / arrA * 100)}%}`; + // return `{a|${name}}{b|${( item.value / arrA * 100)}%}`; + return `{a|${name}}{b|15%}`; }, //将waiyuan的数据拿过来,就会只显示该外圆的数据 - // data: [ - // { value: 15, name: "张家港市" }, - // { value: 10, name: "吴中区" }, - // { value: 8, name: "常熟市" }, - // { value: 10, name: "姑苏区" }, - // { value: 18, name: "太仓市" }, - // { value: 6, name: "相城区" }, - // { value: 10, name: "昆山市" }, - // { value: 4, name: "工业园区" }, - // { value: 10, name: "吴江区" }, - // { value: 5, name: "高新区" }, - // ], - data: this.arr1, + data: [ + { value: 15, name: "张家港市" }, + { value: 10, name: "吴中区" }, + { value: 8, name: "常熟市" }, + { value: 10, name: "姑苏区" }, + { value: 18, name: "太仓市" }, + { value: 6, name: "相城区" }, + { value: 10, name: "昆山市" }, + { value: 4, name: "工业园区" }, + { value: 10, name: "吴江区" }, + { value: 5, name: "高新区" }, + ], + // data: this.arr1, }, series: [ { @@ -183,19 +185,19 @@ export default { labelLine: { show: false, }, - // data: [ - // { value: 15, name: "张家港市" }, - // { value: 10, name: "吴中区" }, - // { value: 8, name: "常熟市" }, - // { value: 10, name: "姑苏区" }, - // { value: 18, name: "太仓市" }, - // { value: 6, name: "相城区" }, - // { value: 10, name: "昆山市" }, - // { value: 4, name: "工业园区" }, - // { value: 10, name: "吴江区" }, - // { value: 5, name: "高新区" }, - // ], - data: this.arr1, + data: [ + { value: 15, name: "张家港市" }, + { value: 10, name: "吴中区" }, + { value: 8, name: "常熟市" }, + { value: 10, name: "姑苏区" }, + { value: 18, name: "太仓市" }, + { value: 6, name: "相城区" }, + { value: 10, name: "昆山市" }, + { value: 4, name: "工业园区" }, + { value: 10, name: "吴江区" }, + { value: 5, name: "高新区" }, + ], + // data: this.arr1, }, ], }; diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue index 54626fe..b69d98c 100644 --- a/src/views/yingji/enforcing.vue +++ b/src/views/yingji/enforcing.vue @@ -162,6 +162,7 @@ import { businessList, enforcingDetail, xzTree, + enforcingGet, } from "@/api/yingji/keyEnterprise.js"; import { mapState } from "vuex"; export default { @@ -173,9 +174,9 @@ export default { loads: true, total: 0, //这个是点击搜索之前的值 - district:[], + district: [], form: { - district: '', + district: "", plannedYear: "", //检测状态 checkStatus: "", @@ -374,24 +375,13 @@ export default { look(e) { this.addShow = true; this.detailLoad = true; - businessList({ uscCode: e.enterpriseId, ...this.searchBefore }).then( - (res) => { - this.details = res.data.list[0]; - this.detailLoad = false; - for (let key in this.details) { - this.listDes.forEach((value1, index1) => { - if (key == value1.eng) { - this.listDes[index1].value = this.details[key]; - return; - } - }); - } - } - ); + enforcingGet(e.longId).then((res) => { + console.log(res); + }); }, searchList() { if (this.district) { - this.form.district = this.district[0] + this.form.district = this.district[0]; } this.searchBefore = { ...this.searchBefore, ...this.form }; this.getList(); diff --git a/src/views/yingji/enterprise.vue b/src/views/yingji/enterprise.vue index c58dc14..3d1332e 100644 --- a/src/views/yingji/enterprise.vue +++ b/src/views/yingji/enterprise.vue @@ -206,7 +206,7 @@
- + { return "0" + value.dictValue == b; }); } + arr = a.filter((value) => { + return value.dictValue == b; + }); return arr[0].dictLabel; }, shutDownDetail() { @@ -607,22 +623,28 @@ export default { look(e) { this.addShow = true; console.log(e); - // businessList({ uscCode: e.enterpriseId, ...this.searchBefore }).then( - // (res) => { this.details = e; for (let key in this.details) { this.listDes.forEach((value1, index1) => { + // if(key == value1.eng ){ + // this.listDes[index1].value =this.filterTable(this.isPointOption, this.details[key]) ; + // return; + // } if (key == value1.eng) { this.listDes[index1].value = this.details[key]; + return; } }); } - // } - // ); + for (let key1 in this.listDes) { + + } + console.log(this.filterTable(this.isPointOption, this.listDes[30].value) ); }, getDict() { xzTree().then((res1) => { + console.log(res1); if (this.dept.parentId == 0) { res1.data.forEach((value, index) => { this.xzList.push({ diff --git a/src/views/yingji/home.vue b/src/views/yingji/home.vue index de8c19f..26885f3 100644 --- a/src/views/yingji/home.vue +++ b/src/views/yingji/home.vue @@ -100,11 +100,11 @@ {{ scope.row.deptName }} - +