Skip to content

M
mancheng_code
Commit ba352213 by heshihao
Options

feat: 平台修改

parent cd261a04
Showing with 389 additions and 160 deletions
src/views/assess/pages/map.vue
...@@ -112,44 +112,69 @@ ...@@ -112,44 +112,69 @@
<div class="other"> <div class="other">
<p>总建筑面积</p> <p>总建筑面积</p>
<p> <p>
<span>{{ areaList.build_total_area }}</span <!-- TODO需要放开 -->
>m² <!-- <span>{{ areaList.build_total_area }}</span> -->
<span>{{ 11 }}</span>
m²
</p> </p>
<p> <p>
同比 同比
<span v-if="areaList.total_area_rate == 0" class="zero">{{ areaList.total_area_rate }}%</span> <!-- TODO需要放开 -->
<!-- <span v-if="areaList.total_area_rate == 0" class="zero">{{ areaList.total_area_rate }}%</span>
<span v-if="areaList.total_area_rate > 0" class="add">{{ areaList.total_area_rate }}%</span> <span v-if="areaList.total_area_rate > 0" class="add">{{ areaList.total_area_rate }}%</span>
<img v-if="areaList.total_area_rate > 0" src="@/assets/images/resources/icon-red.png" alt="" /> <img v-if="areaList.total_area_rate > 0" src="@/assets/images/resources/icon-red.png" alt="" />
<span v-if="areaList.total_area_rate < 0" class="dec">{{ areaList.total_area_rate }}%</span> <span v-if="areaList.total_area_rate < 0" class="dec">{{ areaList.total_area_rate }}%</span>
<img v-if="areaList.total_area_rate < 0" src="@/assets/images/resources/icon-green.png" alt="" /> -->
<span v-if="areaList.total_area_rate == 0" class="zero">{{ 20 }}%</span>
<span v-if="areaList.total_area_rate > 0" class="add">{{ 30 }}%</span>
<img v-if="areaList.total_area_rate > 0" src="@/assets/images/resources/icon-red.png" alt="" />
<span v-if="areaList.total_area_rate < 0" class="dec">{{ 10 }}%</span>
<img v-if="areaList.total_area_rate < 0" src="@/assets/images/resources/icon-green.png" alt="" /> <img v-if="areaList.total_area_rate < 0" src="@/assets/images/resources/icon-green.png" alt="" />
</p> </p>
</div> </div>
<div class="other"> <div class="other">
<p>总闲置面积</p> <p>总闲置面积</p>
<p> <p>
<span>{{ areaList.build_empty_area }}</span <!-- TODO需要放开 -->
>m² <!-- <span>{{ areaList.build_empty_area }}</span> -->
<span>{{ 20 }}</span>
m²
</p> </p>
<p> <p>
同比 同比
<span v-if="areaList.build_empty_rate == 0" class="zero">{{ areaList.build_empty_rate }}%</span> <!-- TODO需要放开 -->
<!-- <span v-if="areaList.build_empty_rate == 0" class="zero">{{ areaList.build_empty_rate }}%</span>
<span v-if="areaList.build_empty_rate > 0" class="add">{{ areaList.build_empty_rate }}%</span> <span v-if="areaList.build_empty_rate > 0" class="add">{{ areaList.build_empty_rate }}%</span>
<img v-if="areaList.build_empty_rate > 0" src="@/assets/images/resources/icon-red.png" alt="" /> <img v-if="areaList.build_empty_rate > 0" src="@/assets/images/resources/icon-red.png" alt="" />
<span v-if="areaList.build_empty_rate < 0" class="dec">{{ areaList.build_empty_rate }}%</span> <span v-if="areaList.build_empty_rate < 0" class="dec">{{ areaList.build_empty_rate }}%</span>
<img v-if="areaList.build_empty_rate < 0" src="@/assets/images/resources/icon-green.png" alt="" /> -->
<span v-if="areaList.build_empty_rate == 0" class="zero">{{ 30 }}%</span>
<span v-if="areaList.build_empty_rate > 0" class="add">{{ 80 }}%</span>
<img v-if="areaList.build_empty_rate > 0" src="@/assets/images/resources/icon-red.png" alt="" />
<span v-if="areaList.build_empty_rate < 0" class="dec">{{ 70 }}%</span>
<img v-if="areaList.build_empty_rate < 0" src="@/assets/images/resources/icon-green.png" alt="" /> <img v-if="areaList.build_empty_rate < 0" src="@/assets/images/resources/icon-green.png" alt="" />
</p> </p>
</div> </div>
<div class="other"> <div class="other">
<p>闲置率</p> <p>闲置率</p>
<p> <p>
<span>{{ areaList.current_build_empty_rate }}%</span> <!-- TODO需要放开 -->
<!-- <span>{{ areaList.current_build_empty_rate }}%</span> -->
<span>{{ 78 }}%</span>
</p> </p>
<p> <p>
同比 同比
<span v-if="areaList.build_rate == 0" class="zero">{{ areaList.build_rate }}%</span> <!-- TODO需要放开 -->
<!-- <span v-if="areaList.build_rate == 0" class="zero">{{ areaList.build_rate }}%</span>
<span v-if="areaList.build_rate > 0" class="add">{{ areaList.build_rate }}%</span> <span v-if="areaList.build_rate > 0" class="add">{{ areaList.build_rate }}%</span>
<img v-if="areaList.build_rate > 0" src="@/assets/images/resources/icon-red.png" alt="" /> <img v-if="areaList.build_rate > 0" src="@/assets/images/resources/icon-red.png" alt="" />
<span v-if="areaList.build_rate < 0" class="dec">{{ areaList.build_rate }}%</span> <span v-if="areaList.build_rate < 0" class="dec">{{ areaList.build_rate }}%</span>
<img v-if="areaList.build_rate < 0" src="@/assets/images/resources/icon-green.png" alt="" /> -->
<span v-if="areaList.build_rate == 0" class="zero">{{ 30 }}%</span>
<span v-if="areaList.build_rate > 0" class="add">{{ 20 }}%</span>
<img v-if="areaList.build_rate > 0" src="@/assets/images/resources/icon-red.png" alt="" />
<span v-if="areaList.build_rate < 0" class="dec">{{ 40 }}%</span>
<img v-if="areaList.build_rate < 0" src="@/assets/images/resources/icon-green.png" alt="" /> <img v-if="areaList.build_rate < 0" src="@/assets/images/resources/icon-green.png" alt="" />
</p> </p>
</div> </div>
...@@ -835,7 +860,8 @@ export default { ...@@ -835,7 +860,8 @@ export default {
}); });
} }
this.upDataChartBar(); // TODO 后续需要放开
// this.upDataChartBar();
}, },
// 更改地区选项 // 更改地区选项
changeActive(district) { changeActive(district) {
...@@ -1531,7 +1557,19 @@ export default { ...@@ -1531,7 +1557,19 @@ export default {
return str; return str;
}, },
}, },
data: [], data: [
"满城镇",
"南韩村镇",
"大册营镇",
"神星镇",
"方顺桥镇",
"于家庄乡",
"要庄乡",
"石井乡",
"坨南乡",
"刘家台乡",
"白龙乡",
],
}, },
yAxis: [ yAxis: [
{ {
...@@ -1611,6 +1649,7 @@ export default { ...@@ -1611,6 +1649,7 @@ export default {
}, },
yAxisIndex: 1, yAxisIndex: 1,
color: ["#78a3ff "], color: ["#78a3ff "],
data: [1, 2, 3, 4, 5, 6, 5, 6, 3, 2, 1],
}, },
{ {
type: "bar", type: "bar",
...@@ -1624,6 +1663,7 @@ export default { ...@@ -1624,6 +1663,7 @@ export default {
}, },
}, },
color: ["#ff7272"], color: ["#ff7272"],
data: [12, 21, 32, 41, 52, 65, 53, 61, 31, 21, 11],
}, },
{ {
type: "bar", type: "bar",
......
src/views/resources/page/overview.vue
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
非固投到位资金完成情况 非固投到位资金完成情况
</li> </li>
</ul> </ul>
<div style="margin-top:20px;"> <div>
<table> <table>
<tr> <tr>
<th width="50">排名</th> <th width="50">排名</th>
...@@ -193,16 +193,83 @@ export default { ...@@ -193,16 +193,83 @@ export default {
data() { data() {
return { return {
data_time: "", data_time: "",
scoreList: [], scoreList: [
{
name: "满城镇",
target: "100",
data: "90",
value: "90",
},
{
name: "南韩村镇",
target: "100",
data: "80",
value: "80",
},
{
name: "大册营镇",
target: "100",
data: "70",
value: "70",
},
{
name: "神星镇",
target: "100",
data: "60",
value: "60",
},
{
name: "方顺桥镇",
target: "100",
data: "50",
value: "50",
},
{
name: "于家庄乡",
target: "100",
data: "40",
value: "40",
},
{
name: "要庄乡",
target: "100",
data: "30",
value: "30",
},
{
name: "石井乡",
target: "100",
data: "20",
value: "20",
},
{
name: "坨南乡",
target: "100",
data: "10",
value: "10",
},
{
name: "刘家台乡",
target: "100",
data: "9",
value: "9",
},
{
name: "白龙乡",
target: "100",
data: "8",
value: "8",
},
],
nums: { nums: {
project_obj_count1: 0, project_obj_count1: 2,
project_obj_count2: 0, project_obj_count2: 2,
project_obj_count3: 0, project_obj_count3: 2,
}, },
nums2: { nums2: {
project_obj_count1: 0, project_obj_count1: 2,
project_obj_count2: 0, project_obj_count2: 2,
project_obj_count3: 0, project_obj_count3: 2,
}, },
chartMap: null, chartMap: null,
district: "晋城市", district: "晋城市",
...@@ -211,8 +278,8 @@ export default { ...@@ -211,8 +278,8 @@ export default {
}, },
mounted() { mounted() {
this.initChartMap(); this.initChartMap();
this.getOverview(); // this.getOverview();
this.getData(); // this.getData();
}, },
methods: { methods: {
changeDistrict() { changeDistrict() {
...@@ -241,7 +308,7 @@ export default { ...@@ -241,7 +308,7 @@ export default {
}, },
changeActiveType(val) { changeActiveType(val) {
this.activeType = val; this.activeType = val;
this.getData(); // this.getData();
}, },
async getData() { async getData() {
let res = await api.GetData({ data_time: "", flag: this.activeType }); let res = await api.GetData({ data_time: "", flag: this.activeType });
......
src/views/resources/page/page/chartType0.vue
...@@ -63,12 +63,29 @@ import api from "@/api/resources/project"; ...@@ -63,12 +63,29 @@ import api from "@/api/resources/project";
export default { export default {
data() { data() {
return { return {
data_time: "", data_time: "2023-11-10",
chartPie: null, chartPie: null,
flag: 1, flag: 1,
project_source: "", project_source: "",
industry_name: "", industry_name: "",
list: [], list: [
{
index: 0,
project_name: "生活用纸1",
industry: "生活用纸",
investor_district: "北京",
investment_volume: "88",
project_type: "生活用纸",
},
{
index: 1,
project_name: "生活用纸2",
industry: "生活用纸",
investor_district: "南京",
investment_volume: "18",
project_type: "生活用纸",
},
],
id_list: [], id_list: [],
page: 1, page: 1,
per_page: 9, per_page: 9,
...@@ -121,11 +138,11 @@ export default { ...@@ -121,11 +138,11 @@ export default {
industry_name: "", industry_name: "",
project_source: this.project_source, project_source: this.project_source,
}); });
this.chartPie.setOption({ // this.chartPie.setOption({
series: { // series: {
data: res, // data: res,
}, // },
}); // });
}, },
async getList() { async getList() {
let res = await api.ArealProject({ let res = await api.ArealProject({
...@@ -142,17 +159,17 @@ export default { ...@@ -142,17 +159,17 @@ export default {
console.log(res); console.log(res);
if (res.success == 0) { if (res.success == 0) {
this.id_list = []; this.id_list = [];
this.data_time = ""; // this.data_time = "";
this.list = []; // this.list = [];
this.total = 0; this.total = 0;
} else { } else {
this.list = res.data.map((item, index) => { // this.list = res.data.map((item, index) => {
item.index = index + 1; // item.index = index + 1;
return item; // return item;
}); // });
this.id_list = res.id_list; // this.id_list = res.id_list;
this.data_time = res.data_time; // this.data_time = res.data_time;
this.total = res.size; // this.total = res.size;
} }
}, },
goProjectInfo(item) { goProjectInfo(item) {
...@@ -241,7 +258,12 @@ export default { ...@@ -241,7 +258,12 @@ export default {
}, },
// selectedMode: "single", // selectedMode: "single",
minAngle: 0, minAngle: 0,
data: [], data: [
{ name: "满城镇", value: 1 },
{ name: "南韩村镇", value: 1 },
{ name: "大册营镇", value: 1 },
{ name: "神星镇", value: 1 },
],
}, },
], ],
}; };
......
src/views/resources/page/page/chartType1.vue
...@@ -65,9 +65,26 @@ import api from "@/api/resources/project"; ...@@ -65,9 +65,26 @@ import api from "@/api/resources/project";
export default { export default {
data() { data() {
return { return {
data_time: "", data_time: "2023-11-10",
chartBar: null, chartBar: null,
list: [], list: [
{
index: 0,
project_name: "生活用纸1",
industry: "生活用纸",
investor_district: "北京",
investment_volume: "88",
project_type: "生活用纸",
},
{
index: 1,
project_name: "生活用纸2",
industry: "生活用纸",
investor_district: "南京",
investment_volume: "18",
project_type: "生活用纸",
},
],
id_list: [], id_list: [],
page: 1, page: 1,
per_page: 9, per_page: 9,
...@@ -129,11 +146,11 @@ export default { ...@@ -129,11 +146,11 @@ export default {
industry_name: "", industry_name: "",
project_source: "", project_source: "",
}); });
this.chartBar.setOption({ // this.chartBar.setOption({
series: { // series: {
data: res, // data: res,
}, // },
}); // });
}, },
async getList() { async getList() {
let res = await api.ArealProject({ let res = await api.ArealProject({
...@@ -149,16 +166,16 @@ export default { ...@@ -149,16 +166,16 @@ export default {
}); });
if (res.success == 0) { if (res.success == 0) {
this.id_list = []; this.id_list = [];
this.data_time = ""; // this.data_time = "";
this.list = []; // this.list = [];
this.total = 0; this.total = 0;
} else { } else {
this.list = res.data.map((item, index) => { // this.list = res.data.map((item, index) => {
item.index = index + 1; // item.index = index + 1;
return item; // return item;
}); // });
this.id_list = res.id_list; this.id_list = res.id_list;
this.data_time = res.data_time; // this.data_time = res.data_time;
this.total = res.size; this.total = res.size;
} }
}, },
...@@ -262,7 +279,7 @@ export default { ...@@ -262,7 +279,7 @@ export default {
//柱形图圆角，初始化效果 //柱形图圆角，初始化效果
barBorderRadius: [19, 19, 0, 0], barBorderRadius: [19, 19, 0, 0],
}, },
// data: ["10", "24", "14", "13", "17", "16"], data: ["10", "24", "14", "13", "17", "16"],
}, },
], ],
}; };
......
src/views/resources/page/page/chartType2.vue
...@@ -64,9 +64,26 @@ import api from "@/api/resources/project"; ...@@ -64,9 +64,26 @@ import api from "@/api/resources/project";
export default { export default {
data() { data() {
return { return {
data_time: "", data_time: "2023-11-10",
chartPie: null, chartPie: null,
list: [], list: [
{
index: 0,
project_name: "生活用纸1",
industry: "生活用纸",
investor_district: "北京",
investment_volume: "88",
project_type: "生活用纸",
},
{
index: 1,
project_name: "生活用纸2",
industry: "生活用纸",
investor_district: "南京",
investment_volume: "18",
project_type: "生活用纸",
},
],
id_list: [], id_list: [],
page: 1, page: 1,
per_page: 9, per_page: 9,
...@@ -126,11 +143,11 @@ export default { ...@@ -126,11 +143,11 @@ export default {
industry_name: "", industry_name: "",
project_source: "", project_source: "",
}); });
this.chartPie.setOption({ // this.chartPie.setOption({
series: { // series: {
data: res, // data: res,
}, // },
}); // });
}, },
async getList() { async getList() {
let res = await api.ArealProject({ let res = await api.ArealProject({
...@@ -148,16 +165,16 @@ export default { ...@@ -148,16 +165,16 @@ export default {
if (res.success == 0) { if (res.success == 0) {
this.id_list = []; this.id_list = [];
this.data_time = ""; // this.data_time = "";
this.list = []; // this.list = [];
this.total = 0; this.total = 0;
} else { } else {
this.list = res.data.map((item, index) => { // this.list = res.data.map((item, index) => {
item.index = index + 1; // item.index = index + 1;
return item; // return item;
}); // });
this.id_list = res.id_list; this.id_list = res.id_list;
this.data_time = res.data_time; // this.data_time = res.data_time;
this.total = res.size; this.total = res.size;
} }
}, },
......
src/views/resources/page/page/chartType3.vue
...@@ -65,10 +65,27 @@ import api from "@/api/resources/project"; ...@@ -65,10 +65,27 @@ import api from "@/api/resources/project";
export default { export default {
data() { data() {
return { return {
data_time: "", data_time: "2023-11-10",
chartPie: null, chartPie: null,
chartBar: null, chartBar: null,
list: [], list: [
{
index: 0,
project_name: "生活用纸1",
industry: "生活用纸",
investor_district: "北京",
investment_volume: "88",
project_type: "生活用纸",
},
{
index: 1,
project_name: "生活用纸2",
industry: "生活用纸",
investor_district: "南京",
investment_volume: "18",
project_type: "生活用纸",
},
],
id_list: [], id_list: [],
flag: 4, flag: 4,
page: 1, page: 1,
...@@ -82,20 +99,20 @@ export default { ...@@ -82,20 +99,20 @@ export default {
watch: { watch: {
district(newV, oldV) { district(newV, oldV) {
console.log(newV); console.log(newV);
this.getData(); // this.getData();
this.getList(); // this.getList();
}, },
time1(newV, oldV) { time1(newV, oldV) {
console.log(newV); console.log(newV);
if (newV && this.time2 != "") { if (newV && this.time2 != "") {
this.getData(); // this.getData();
this.getList(); // this.getList();
} }
}, },
time2(newV, oldV) { time2(newV, oldV) {
if (newV && this.time1 != "") { if (newV && this.time1 != "") {
this.getData(); // this.getData();
this.getList(); // this.getList();
} }
}, },
}, },
...@@ -103,8 +120,8 @@ export default { ...@@ -103,8 +120,8 @@ export default {
console.log(this.cycle); console.log(this.cycle);
this.$nextTick(() => { this.$nextTick(() => {
this.initChartBar(); this.initChartBar();
this.getData(); // this.getData();
this.getList(); // this.getList();
}); });
}, },
methods: { methods: {
...@@ -379,6 +396,7 @@ export default { ...@@ -379,6 +396,7 @@ export default {
//柱形图圆角，初始化效果 //柱形图圆角，初始化效果
barBorderRadius: [0, 10, 10, 0], barBorderRadius: [0, 10, 10, 0],
}, },
data: [1, 2, 3, 4, 5],
}, },
], ],
}; };
......
src/views/resources/page/page/type0.vue
...@@ -55,10 +55,7 @@ export default { ...@@ -55,10 +55,7 @@ export default {
async getData() { async getData() {
let res = await api.StatisticShanxiData({ let res = await api.StatisticShanxiData({
flag: 1, flag: 1,
data_time: data_time: this.time1 != "" && this.time2 != "" ? this.time1 + "年" + this.time2 + "月" : "",
this.time1 != "" && this.time2 != ""
? this.time1 + "年" + this.time2 + "月"
: "",
}); });
if (res.success) { if (res.success) {
} else { } else {
...@@ -85,7 +82,19 @@ export default { ...@@ -85,7 +82,19 @@ export default {
console.log(data2); console.log(data2);
this.chartBar1.setOption({ this.chartBar1.setOption({
xAxis: { xAxis: {
data: xData, data: [
"满城镇",
"南韩村镇",
"大册营镇",
"神星镇",
"方顺桥镇",
"于家庄乡",
"要庄乡",
"石井乡",
"坨南乡",
"刘家台乡",
"白龙乡",
],
}, },
series: { series: {
data: data, data: data,
...@@ -93,7 +102,19 @@ export default { ...@@ -93,7 +102,19 @@ export default {
}); });
this.chartBar2.setOption({ this.chartBar2.setOption({
xAxis: { xAxis: {
data: xData2, data: [
"满城镇",
"南韩村镇",
"大册营镇",
"神星镇",
"方顺桥镇",
"于家庄乡",
"要庄乡",
"石井乡",
"坨南乡",
"刘家台乡",
"白龙乡",
],
}, },
series: { series: {
data: data2, data: data2,
...@@ -132,14 +153,7 @@ export default { ...@@ -132,14 +153,7 @@ export default {
trigger: "axis", trigger: "axis",
formatter: function(param) { formatter: function(param) {
console.log(param); console.log(param);
return ( return param[0].marker + param[0].name + "<br />" + "签约金额：" + param[0].value + "亿元";
param[0].marker +
param[0].name +
"<br />" +
"签约金额：" +
param[0].value +
"亿元"
);
}, },
}, },
xAxis: { xAxis: {
......
src/views/resources/page/page/type1.vue
...@@ -54,10 +54,7 @@ export default { ...@@ -54,10 +54,7 @@ export default {
async getData() { async getData() {
let res = await api.StatisticShanxiData({ let res = await api.StatisticShanxiData({
flag: 2, flag: 2,
data_time: data_time: this.time1 != "" && this.time2 != "" ? this.time1 + "年" + this.time2 + "月" : "",
this.time1 != "" && this.time2 != ""
? this.time1 + "年" + this.time2 + "月"
: "",
}); });
if (res.success) { if (res.success) {
} else { } else {
...@@ -82,7 +79,19 @@ export default { ...@@ -82,7 +79,19 @@ export default {
console.log(data2); console.log(data2);
this.chartBar1.setOption({ this.chartBar1.setOption({
xAxis: { xAxis: {
data: xData, data: [
"满城镇",
"南韩村镇",
"大册营镇",
"神星镇",
"方顺桥镇",
"于家庄乡",
"要庄乡",
"石井乡",
"坨南乡",
"刘家台乡",
"白龙乡",
],
}, },
series: { series: {
data: data, data: data,
...@@ -90,7 +99,19 @@ export default { ...@@ -90,7 +99,19 @@ export default {
}); });
this.chartBar2.setOption({ this.chartBar2.setOption({
xAxis: { xAxis: {
data: xData2, data: [
"满城镇",
"南韩村镇",
"大册营镇",
"神星镇",
"方顺桥镇",
"于家庄乡",
"要庄乡",
"石井乡",
"坨南乡",
"刘家台乡",
"白龙乡",
],
}, },
series: { series: {
data: data2, data: data2,
...@@ -129,14 +150,7 @@ export default { ...@@ -129,14 +150,7 @@ export default {
trigger: "axis", trigger: "axis",
formatter: function(param) { formatter: function(param) {
console.log(param); console.log(param);
return ( return param[0].marker + param[0].name + "<br />" + "计划投资额：" + param[0].value + "亿元";
param[0].marker +
param[0].name +
"<br />" +
"计划投资额：" +
param[0].value +
"亿元"
);
}, },
}, },
xAxis: { xAxis: {
......
src/views/resources/page/page/type2.vue
...@@ -54,10 +54,7 @@ export default { ...@@ -54,10 +54,7 @@ export default {
async getData() { async getData() {
let res = await api.StatisticShanxiData({ let res = await api.StatisticShanxiData({
flag: 3, flag: 3,
data_time: data_time: this.time1 != "" && this.time2 != "" ? this.time1 + "年" + this.time2 + "月" : "",
this.time1 != "" && this.time2 != ""
? this.time1 + "年" + this.time2 + "月"
: "",
}); });
if (res.success) { if (res.success) {
} else { } else {
...@@ -85,7 +82,19 @@ export default { ...@@ -85,7 +82,19 @@ export default {
console.log(data2); console.log(data2);
this.chartBar1.setOption({ this.chartBar1.setOption({
xAxis: { xAxis: {
data: xData, data: [
"满城镇",
"南韩村镇",
"大册营镇",
"神星镇",
"方顺桥镇",
"于家庄乡",
"要庄乡",
"石井乡",
"坨南乡",
"刘家台乡",
"白龙乡",
],
}, },
series: { series: {
data: data, data: data,
...@@ -93,7 +102,19 @@ export default { ...@@ -93,7 +102,19 @@ export default {
}); });
this.chartBar2.setOption({ this.chartBar2.setOption({
xAxis: { xAxis: {
data: xData2, data: [
"满城镇",
"南韩村镇",
"大册营镇",
"神星镇",
"方顺桥镇",
"于家庄乡",
"要庄乡",
"石井乡",
"坨南乡",
"刘家台乡",
"白龙乡",
],
}, },
series: { series: {
data: data2, data: data2,
...@@ -132,14 +153,7 @@ export default { ...@@ -132,14 +153,7 @@ export default {
trigger: "axis", trigger: "axis",
formatter: function(param) { formatter: function(param) {
console.log(param); console.log(param);
return ( return param[0].marker + param[0].name + "<br />" + "固投资金到位：" + param[0].value + "亿元";
param[0].marker +
param[0].name +
"<br />" +
"固投资金到位：" +
param[0].value +
"亿元"
);
}, },
}, },
xAxis: { xAxis: {
......
src/views/resources/page/page/type3.vue
...@@ -83,10 +83,7 @@ export default { ...@@ -83,10 +83,7 @@ export default {
methods: { methods: {
async getData() { async getData() {
let res = await api.StatisticJcData({ let res = await api.StatisticJcData({
data_time: data_time: this.time1 == "" || this.time2 == "" ? "" : [String(this.time1), ...this.time2.split("-"), ""],
this.time1 == "" || this.time2 == ""
? ""
: [String(this.time1), ...this.time2.split("-"), ""],
}); });
if (res.success) { if (res.success) {
} else { } else {
...@@ -761,14 +758,7 @@ export default { ...@@ -761,14 +758,7 @@ export default {
show: "true", show: "true",
trigger: "axis", trigger: "axis",
formatter: function(param) { formatter: function(param) {
return ( return param[0].marker + " " + param[0].data.name + "<br />综合得分：" + param[0].data.value + "分";
param[0].marker +
" " +
param[0].data.name +
"<br />综合得分：" +
param[0].data.value +
"分"
);
}, },
}, },
xAxis: { xAxis: {
......
src/views/resources/page/project.vue
...@@ -454,14 +454,14 @@ ...@@ -454,14 +454,14 @@
{{ per_page * (page - 1) + scope.row.index }} {{ per_page * (page - 1) + scope.row.index }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="distribute_condition" prop="distribute_condition"
label="分发情况" label="分发情况"
v-if="activeName == 'plan'" v-if="activeName == 'plan'"
fixed fixed
> >
</el-table-column> </el-table-column> -->
<el-table-column :show-overflow-tooltip="true" prop="project_name" label="项目名称" fixed> <el-table-column :show-overflow-tooltip="true" prop="project_name" label="项目名称" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <div @click="goArchives(scope.row)" style="cursor:pointer"> --> <!-- <div @click="goArchives(scope.row)" style="cursor:pointer"> -->
...@@ -582,13 +582,13 @@ ...@@ -582,13 +582,13 @@
width="140" width="140"
> >
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="project_to_area" prop="project_to_area"
class-name="long-text" class-name="long-text"
:label="'拟落地' + '\r\n' + '区域'" :label="'拟落地' + '\r\n' + '区域'"
> >
</el-table-column> </el-table-column> -->
<el-table-column :show-overflow-tooltip="true" prop="development_area" label="开发区"> </el-table-column> <el-table-column :show-overflow-tooltip="true" prop="development_area" label="开发区"> </el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="project_year" label="项目年份"> </el-table-column> <el-table-column :show-overflow-tooltip="true" prop="project_year" label="项目年份"> </el-table-column>
<el-table-column <el-table-column
......
src/views/resources/page/projectinfo.vue
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
<div class="archives" ref="archives"> <div class="archives" ref="archives">
<div class="title-weight">基本信息</div> <div class="title-weight">基本信息</div>
<div class="flex-box flex-box-3"> <div class="flex-box flex-box-3">
<p> <!-- <p>
<span class="label">上传部门：{{ editInfo.upload_unity }}</span> <span class="label">上传部门：{{ editInfo.upload_unity }}</span>
</p> </p> -->
<p> <p>
<span class="label">上传人：{{ editInfo.upload_people }}</span> <span class="label">上传人：{{ editInfo.upload_people }}</span>
</p> </p>
......
src/views/resources/page/track.vue
...@@ -281,19 +281,35 @@ export default { ...@@ -281,19 +281,35 @@ export default {
return { return {
activeName: "track", activeName: "track",
stalker: { stalker: {
end_num: 0, end_num: 2,
job_num: 0, job_num: 3,
new_value_num: 0, new_value_num: 3,
revenue_num: 0, revenue_num: 3,
sign_num: 0, sign_num: 1,
stalker_num1: 0, stalker_num1: 2,
stalker_num2: 0, stalker_num2: 3,
stalker_num3: 0, stalker_num3: 1,
start_num: 0, start_num: 2,
}, },
selectListId: [], selectListId: [],
showExport: false, showExport: false,
list: [], list: [
{
project_name: "造纸项目",
district: "满城镇",
development_area: "满城镇",
attract_name: "商务局",
investor_name: "XXX有限公司",
investor_district: "北京",
industry: "生活用纸",
investment_volume: "100",
construction_content: "XXXX",
project_address: "满城镇",
project_progress: "对接中",
project_problem: "无",
project_year: "XXXX",
},
],
page: 1, page: 1,
per_page: 8, per_page: 8,
total: 0, total: 0,
...@@ -313,8 +329,8 @@ export default { ...@@ -313,8 +329,8 @@ export default {
this.permission = localStorage.getItem("jc_funcList").split(","); this.permission = localStorage.getItem("jc_funcList").split(",");
this.$bus.$emit("setActive", "resources"); this.$bus.$emit("setActive", "resources");
this.district = this.$route.query.district; this.district = this.$route.query.district;
this.getProjectStalker(); // this.getProjectStalker();
this.getList(); // this.getList();
}); });
}, },
mounted() {}, mounted() {},
...@@ -346,17 +362,17 @@ export default { ...@@ -346,17 +362,17 @@ export default {
per_page: this.per_page, per_page: this.per_page,
}); });
console.log(res); console.log(res);
if (res.success == 0) { // if (res.success == 0) {
this.list = []; // this.list = [];
this.total = 0; // this.total = 0;
this.page = 1; // this.page = 1;
} else { // } else {
this.list = res.data.map((item, index) => { // this.list = res.data.map((item, index) => {
item.index = index + 1; // item.index = index + 1;
return item; // return item;
}); // });
this.total = res.size; // this.total = res.size;
} // }
}, },
async getProjectStalker() { async getProjectStalker() {
let res = await api.ProjectStalker({ district: this.district }); let res = await api.ProjectStalker({ district: this.district });
......
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