Commit d9bab84c by gao_yingdong

西藏问题反馈修改

parent 735f180e
......@@ -3250,9 +3250,9 @@ export default {
}
}
);
this.$nextTick(() => {
this.$refs.itsmDataTable.doLayout();
});
// this.$nextTick(() => {
// this.$refs.itsmDataTable.doLayout();
// });
} else if (self.pageBs == "bjzycx") {
jsonStr.push(self.formData);
let form = new FormData();
......@@ -3280,9 +3280,9 @@ export default {
self.closeLoading();
}
});
this.$nextTick(() => {
this.$refs.itsmDataTable.doLayout();
});
// this.$nextTick(() => {
// this.$refs.itsmDataTable.doLayout();
// });
} else {
debugger;
self.doQueryRequest(json).then((response) => {
......@@ -3546,9 +3546,9 @@ export default {
self.closeLoading();
}
});
this.$nextTick(() => {
this.$refs.itsmDataTable.doLayout();
});
// this.$nextTick(() => {
// this.$refs.itsmDataTable.doLayout();
// });
}
}
}
......
......@@ -175,7 +175,7 @@ export default {
// this.$store.commit("user/SET_Header", this.header);
},
mounted() {
this.hqzd();
// this.hqzd();
},
methods: {
hqzd() {
......
......@@ -164,7 +164,7 @@ export default {
this.$store.commit("user/SET_Menu", this.Menu);
},
mounted() {
this.hqzd();
// this.hqzd();
},
methods: {
hqzd() {
......
......@@ -45,7 +45,7 @@
v-loading="loading"
style="height: "
></div>
<div id="table" v-show="type == 'table'">
<!-- <div id="table" v-show="type == 'table'">
<rightContent
@returnBtn="type = 'map'"
:pageBs="pageBs"
......@@ -56,7 +56,7 @@
:cxQueryField="cxQueryField"
ref="rightContent"
></rightContent>
</div>
</div> -->
</div>
</template>
<script>
......@@ -70,7 +70,7 @@ export default {
return {
pageBs: "jycstj",
header: "阵地风险程度统计",
cxUrl: "/zdxx/selectZdxxglNew",
// cxUrl: "/zdxx/selectZdxxglNew",
historyArr: [],
formData: {
djsjStart: this.$moment(
......
......@@ -45,7 +45,7 @@
v-loading="loading"
style="height: "
></div>
<div id="table" v-show="type == 'table'">
<!-- <div id="table" v-show="type == 'table'">
<rightContent
@returnBtn="type = 'map'"
:pageBs="pageBs"
......@@ -56,7 +56,7 @@
:cxQueryField="cxQueryField"
ref="rightContent"
></rightContent>
</div>
</div> -->
</div>
</template>
<script>
......
......@@ -45,7 +45,7 @@
v-loading="loading"
style="height: "
></div>
<div id="table" v-show="type == 'table'">
<!-- <div id="table" v-show="type == 'table'">
<rightContent
@returnBtn="type = 'map'"
:pageBs="pageBs"
......@@ -56,7 +56,7 @@
:cxQueryField="cxQueryField"
ref="rightContent"
></rightContent>
</div>
</div> -->
</div>
</template>
<script>
......@@ -70,7 +70,7 @@ export default {
return {
pageBs: "jycstj",
header: "阵地规模统计",
cxUrl: "/zdxx/selectZdxxglNew",
// cxUrl: "/zdxx/selectZdxxglNew",
historyArr: [],
formData: {
djsjStart: this.$moment(
......
......@@ -45,7 +45,7 @@
v-loading="loading"
style="height: "
></div>
<div id="table" v-show="type == 'table'">
<!-- <div id="table" v-show="type == 'table'">
<rightContent
@returnBtn="type = 'map'"
:pageBs="pageBs"
......@@ -56,7 +56,7 @@
:cxQueryField="cxQueryField"
ref="rightContent"
></rightContent>
</div>
</div> -->
</div>
</template>
<script>
......
......@@ -45,7 +45,7 @@
v-loading="loading"
style="height: "
></div>
<div id="table" v-show="type == 'table'">
<!-- <div id="table" v-show="type == 'table'">
<rightContent
@returnBtn="type = 'map'"
:pageBs="pageBs"
......@@ -56,7 +56,7 @@
:cxQueryField="cxQueryField"
ref="rightContent"
></rightContent>
</div>
</div> -->
</div>
</template>
<script>
......@@ -70,7 +70,7 @@ export default {
return {
pageBs: "jycstj",
header: "婚姻状态统计",
cxUrl: "/zdryxx/selectZdyrxx",
// cxUrl: "/zdryxx/selectZdyrxx",
historyArr: [],
formData: {
djsjStart: this.$moment(
......@@ -313,12 +313,12 @@ export default {
},
],
});
myChart.on("click", pieConsole);
function pieConsole(val) {
console.log(val);
console.log(val.data);
self.getTableData()
}
// myChart.on("click", pieConsole);
// function pieConsole(val) {
// console.log(val);
// console.log(val.data);
// self.getTableData()
// }
},
//表格内容接口
getTableData(dm) {
......
......@@ -45,7 +45,7 @@
v-loading="loading"
style="height: "
></div>
<div id="table" v-show="type == 'table'">
<!-- <div id="table" v-show="type == 'table'">
<rightContent
@returnBtn="type = 'map'"
:pageBs="pageBs"
......@@ -56,7 +56,7 @@
:cxQueryField="cxQueryField"
ref="rightContent"
></rightContent>
</div>
</div> -->
</div>
</template>
<script>
......@@ -68,13 +68,23 @@ export default {
},
data() {
return {
// Menu: [
// {
// id: "zdjycstj",
// label: "阵地场所统计",
// index: "zdjycstj",
// auth: "M0101",
// className: "iconfont iconrizhi",
// disabled: false,
// },
// ],
pageBs: "jycstj",
header: "阵地交易活动场所统计",
cxUrl: "/zdxx/selectZdxxglNew",
// cxUrl: "/zdxx/selectZdxxglNew",
historyArr: [],
formData: {
djsjStart:'',
djsjEnd:''
djsjStart: "",
djsjEnd: "",
},
cxFormData: {
limit: 10,
......@@ -331,8 +341,8 @@ export default {
// params.append("djsjStart", this.formData.djsjStart);
// params.append("djsjEnd", this.formData.djsjEnd);
getZdcsResult({
djsjStart:this.formData.djsjStart,
djsjEnd:this.formData.djsjEnd
djsjStart: this.formData.djsjStart,
djsjEnd: this.formData.djsjEnd,
}).then((res) => {
obj = res.data.result;
for (let key in obj) {
......@@ -355,11 +365,11 @@ export default {
},
watch: {
"formData.djsjStart"(val) {
this.$echarts.init(document.getElementById('charts')).dispose();
this.$echarts.init(document.getElementById("charts")).dispose();
this.getCode();
},
"formData.djsjEnd"(val) {
this.$echarts.init(document.getElementById('charts')).dispose();
this.$echarts.init(document.getElementById("charts")).dispose();
this.getCode();
},
},
......@@ -369,10 +379,15 @@ export default {
this.getCode();
},
created() {
this.$set(this.formData,'djsjStart',this.$moment(
new Date().getTime() - 3600 * 1000 * 24 * 30
).format("YYYY-MM-DD"))
this.$set(this.formData,'djsjEnd',this.$moment().format("YYYY-MM-DD"))
// this.$store.commit("user/SET_Menu", this.Menu);
this.$set(
this.formData,
"djsjStart",
this.$moment(new Date().getTime() - 3600 * 1000 * 24 * 30).format(
"YYYY-MM-DD"
)
);
this.$set(this.formData, "djsjEnd", this.$moment().format("YYYY-MM-DD"));
// this.$store.commit("user/SET_Menu", this.Menu);
},
};
......
......@@ -45,7 +45,7 @@
v-loading="loading"
style="height: "
></div>
<div id="table" v-show="type == 'table'">
<!-- <div id="table" v-show="type == 'table'">
<rightContent
@returnBtn="type = 'map'"
:pageBs="pageBs"
......@@ -56,7 +56,7 @@
:cxQueryField="cxQueryField"
ref="rightContent"
></rightContent>
</div>
</div> -->
</div>
</template>
<script>
......
......@@ -45,7 +45,7 @@
v-loading="loading"
style="height: "
></div>
<div id="table" v-show="type == 'table'">
<!-- <div id="table" v-show="type == 'table'">
<rightContent
@returnBtn="type = 'map'"
:pageBs="pageBs"
......@@ -56,7 +56,7 @@
:cxQueryField="cxQueryField"
ref="rightContent"
></rightContent>
</div>
</div> -->
</div>
</template>
<script>
......@@ -68,13 +68,23 @@ export default {
},
data() {
return {
Menu: [
{
id: "zdryxlyj",
label: "人员学历统计",
index: "zdryxlyj",
auth: "M0101",
className: "iconfont iconrizhi",
disabled: false,
},
],
pageBs: "jycstj",
header: "人员学历统计",
cxUrl: "/zdryxx/selectZdyrxx",
// cxUrl: "/zdryxx/selectZdyrxx",
historyArr: [],
formData: {
djsjStart: '',
djsjEnd: '',
djsjStart: "",
djsjEnd: "",
},
cxFormData: {
limit: 10,
......@@ -311,12 +321,12 @@ export default {
},
],
});
myChart.on("click", pieConsole);
function pieConsole(val) {
console.log(val);
console.log(val.data);
self.getTableData()
}
// myChart.on("click", pieConsole);
// function pieConsole(val) {
// console.log(val);
// console.log(val.data);
// self.getTableData()
// }
},
//表格内容接口
getTableData(dm) {
......@@ -328,20 +338,20 @@ export default {
let arr = [];
console.log(this.formData.djsjStart);
getBtxlResult({
djsjStart:this.formData.djsjStart,
djsjEnd:this.formData.djsjEnd
djsjStart: this.formData.djsjStart,
djsjEnd: this.formData.djsjEnd,
}).then((res) => {
console.log(res.data.result);
arr = res.data.result;
this.pieEchartsDate = []
this.pieEchartsDate = [];
arr.map((i) => {
if(i.count != 0) {
if (i.count != 0) {
this.pieEchartsDate.push({
name: i.name,
value: i.count,
})
name: i.name,
value: i.count,
});
}
})
});
console.log(this.pieEchartsDate);
this.startMyEcharts(this.pieEchartsDate);
});
......@@ -354,20 +364,25 @@ export default {
},
created() {
// this.$store.commit("user/SET_Menu", this.Menu);
this.$set(this.formData,'djsjStart',this.$moment(
new Date().getTime() - 3600 * 1000 * 24 * 30
).format("YYYY-MM-DD"))
this.$set(this.formData,'djsjEnd',this.$moment().format("YYYY-MM-DD"))
this.$set(
this.formData,
"djsjStart",
this.$moment(new Date().getTime() - 3600 * 1000 * 24 * 30).format(
"YYYY-MM-DD"
)
);
this.$set(this.formData, "djsjEnd", this.$moment().format("YYYY-MM-DD"));
},
watch: {
"formData.djsjStart"(val) {
this.$echarts.init(document.getElementById('charts')).dispose();
"formData.djsjStart"(val) {
this.$echarts.init(document.getElementById("charts")).dispose();
this.getCode();
},
"formData.djsjEnd"(val) {
this.$echarts.init(document.getElementById('charts')).dispose();
this.$echarts.init(document.getElementById("charts")).dispose();
this.getCode();
},},
},
},
};
</script>
<style lang="scss" scoped>
......
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