diff --git a/dist.zip b/dist.zip deleted file mode 100644 index 7777ac3..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/view/echarts_sy/zwfw1.vue b/src/view/echarts_sy/zwfw1.vue index 1275edd..b9f4525 100644 --- a/src/view/echarts_sy/zwfw1.vue +++ b/src/view/echarts_sy/zwfw1.vue @@ -3,25 +3,37 @@ \ No newline at end of file diff --git a/src/view/sy.vue b/src/view/sy.vue index bdfe539..d18863f 100644 --- a/src/view/sy.vue +++ b/src/view/sy.vue @@ -372,7 +372,7 @@
一网通办事
- +
@@ -658,6 +658,7 @@ import qyfw2 from "../assets/images/sy/rzbms.png"; import qyfw3 from "../assets/images/sy/shqys.png"; import qyfw4 from "../assets/images/sy/dxje.png"; import { useRouter, useRoute } from "vue-router"; +import tools from "@/utils/tools"; const router = useRouter(); const routers = useRoute(); // 路由跳转 @@ -851,6 +852,7 @@ const close = () => { pagination.currentPage = 1; pagination.total = 100; }; + //医疗卫生 const showDialog2 = (title, url) => { if (title == "医院卫生院") { @@ -980,6 +982,16 @@ const data = reactive({ // monthlyVisits1: "3565", // }, ], + //政务服务 + zwfw: { + list1: { + finish: "", + total: "", + percent: "", + }, + list2: {}, + list3: {}, + }, jysyList: [ { title: "县镇", @@ -1341,8 +1353,8 @@ const getData = async () => { }); }; // 公共服务&企业服务&政府服务 -const getfw = async() => { - http.get("/api/ggfwyth/getLytAppData").then((res) => { +const getfw = async () => { + await http.get("/api/ggfwyth/getLytAppData").then((res) => { if (res.code == 200) { data.lytAppDayActive = res.data.lytAppDayActive; data.tableData = res.data.lytApp.reduce((acc, _, i, arr) => { @@ -1356,13 +1368,18 @@ const getfw = async() => { } return acc; }, []); + console.log(data.tableData); + } }); - // http.get("/api/ggfwyth/getDataSharing").then((res) => { - // if (res.code == 200) { - - // } - // }); + await http.get("/api/ggfwyth/getDataSharing").then((res) => { + if (res.code == 200) { + data.zwfw.list1.finish = Number(res.data.apply); + data.zwfw.list1.total = Number(res.data.applyNum); + data.zwfw.list1.percent = (Number(res.data.netRate) * 100).toFixed(2); + } + }); + console.log(data.zwfw.list1); }; //获取表格数据 const getTable = (url, currentPage) => { @@ -1814,6 +1831,7 @@ const autoScroll = () => { } }; onBeforeMount(async () => { + // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); getData(); getfw(); setTimeout(() => { diff --git a/vite.config.js b/vite.config.js index 7708875..99753df 100644 --- a/vite.config.js +++ b/vite.config.js @@ -15,8 +15,8 @@ export default defineConfig({ // 第一个代理 "/api": { // 匹配到啥来进行方向代理 - target: "http://10.0.0.65:8095/", //刘进 - // target: "http://220.191.238.50:996/", //线上 + // target: "http://10.0.0.65:8095/", //刘进 + target: "http://220.191.238.50:996/", //线上 changeOrigin: true, //是否支持跨域 //rewrite: (path) => path.replace(/^\/api/, '') // 如果不需要api 直接把路径上的api 替换成空,这个 },