首页 发现 帮助
注册 登录
zzl
/
kuangshan-project
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

疫情防控

张值绫 3 年之前
父节点
8c0abf4238
当前提交
dc51b8f611
共有 40 个文件被更改，包括 402 次插入 和 249 次删除
分列视图 显示文件统计
  1. 1 0
      dist/css/chunk-1f0b136e.c84ff5a5.css
  2. 1 0
      dist/css/chunk-405e56a1.856e2b3d.css
  3. 0 1
      dist/css/chunk-75dff630.ff8077c7.css
  4. 1 0
      dist/css/chunk-7690ba38.55b99b54.css
  5. 1 0
      dist/css/chunk-ad68507c.b664523b.css
  6. 0 1
      dist/css/chunk-bd5871a8.26373c63.css
  7. 1 0
      dist/css/chunk-d02382bc.5a9fd459.css
  8. 0 1
      dist/css/chunk-dff85cba.cf5d5e54.css
  9. 0 1
      dist/css/chunk-e7119308.7ff2ed6c.css
  10. 0 1
      dist/css/chunk-fa62119e.c6f9e172.css
  11. 1 1
      dist/index.html
  12. 2 0
      dist/js/app.247c722c.js
  13. 1 1
      dist/js/app.b8665c28.js.map
  14. 0 2
      dist/js/app.b8665c28.js
  15. 2 0
      dist/js/chunk-1f0b136e.0f9caff7.js
  16. 1 0
      dist/js/chunk-1f0b136e.0f9caff7.js.map
  17. 2 0
      dist/js/chunk-405e56a1.d289bdfa.js
  18. 1 0
      dist/js/chunk-405e56a1.d289bdfa.js.map
  19. 0 2
      dist/js/chunk-75dff630.8254f6b8.js
  20. 0 1
      dist/js/chunk-75dff630.8254f6b8.js.map
  21. 2 0
      dist/js/chunk-7690ba38.7aa385fc.js
  22. 1 0
      dist/js/chunk-7690ba38.7aa385fc.js.map
  23. 2 0
      dist/js/chunk-ad68507c.0e8170ae.js
  24. 1 0
      dist/js/chunk-ad68507c.0e8170ae.js.map
  25. 0 2
      dist/js/chunk-bd5871a8.c484de0b.js
  26. 0 1
      dist/js/chunk-bd5871a8.c484de0b.js.map
  27. 2 0
      dist/js/chunk-d02382bc.dc8d84b7.js
  28. 1 0
      dist/js/chunk-d02382bc.dc8d84b7.js.map
  29. 0 2
      dist/js/chunk-dff85cba.f08c1098.js
  30. 0 1
      dist/js/chunk-dff85cba.f08c1098.js.map
  31. 0 2
      dist/js/chunk-e7119308.ef7e7862.js
  32. 0 1
      dist/js/chunk-e7119308.ef7e7862.js.map
  33. 0 2
      dist/js/chunk-fa62119e.ffd73137.js
  34. 0 1
      dist/js/chunk-fa62119e.ffd73137.js.map
  35. 113 0
      src/views/zaoquan/yiqing/index.html
  36. 130 86
      src/views/zaoquan/yiqing/yiqing-hesuanjiance.vue
  37. 5 5
      src/views/zaoquan/yiqing/yiqing-tianbao.vue
  38. 18 12
      src/views/zaoquan/yiqing/yiqing-tiwen.vue
  39. 5 3
      src/views/zaoquan/yiqing/yiqing-weijiezhong.vue
  40. 107 119
      src/views/zaoquan/yiqing/yiqing-yimiaojiezhong.vue

文件差异内容过多而无法显示
+ 1 - 0
dist/css/chunk-1f0b136e.c84ff5a5.css


文件差异内容过多而无法显示
+ 1 - 0
dist/css/chunk-405e56a1.856e2b3d.css


文件差异内容过多而无法显示
+ 0 - 1
dist/css/chunk-75dff630.ff8077c7.css


+ 1 - 0
dist/css/chunk-7690ba38.55b99b54.css
查看文件 

@@ -0,0 +1 @@
 
+[data-v-03c77c44] .van-nav-bar{background:#39f}[data-v-03c77c44] .van-nav-bar .van-icon,[data-v-03c77c44] .van-nav-bar__text,[data-v-03c77c44] .van-nav-bar__title{color:#fff}[class*=van-hairline][data-v-03c77c44]:after{border:none}[data-v-03c77c44] canvas{border-radius:20px!important}

+ 1 - 0
dist/css/chunk-ad68507c.b664523b.css
查看文件 

@@ -0,0 +1 @@
 
+[data-v-8078f2b0] .van-nav-bar{background:#39f}[data-v-8078f2b0] .van-nav-bar .van-icon,[data-v-8078f2b0] .van-nav-bar__text,[data-v-8078f2b0] .van-nav-bar__title{color:#fff}[class*=van-hairline][data-v-8078f2b0]:after{border:none}[data-v-8078f2b0] #zr_0,element.style[data-v-8078f2b0]{border-radius:20px}[data-v-8078f2b0] canvas{border-radius:20px!important}

文件差异内容过多而无法显示
+ 0 - 1
dist/css/chunk-bd5871a8.26373c63.css


文件差异内容过多而无法显示
+ 1 - 0
dist/css/chunk-d02382bc.5a9fd459.css


+ 0 - 1
dist/css/chunk-dff85cba.cf5d5e54.css
查看文件 

@@ -1 +0,0 @@
 
-[data-v-20fb59e0] .van-nav-bar{background:#39f}[data-v-20fb59e0] .van-nav-bar .van-icon,[data-v-20fb59e0] .van-nav-bar__text,[data-v-20fb59e0] .van-nav-bar__title{color:#fff}[class*=van-hairline][data-v-20fb59e0]:after{border:none}#main[data-v-20fb59e0]{border-radius:20px}

+ 0 - 1
dist/css/chunk-e7119308.7ff2ed6c.css
查看文件 

@@ -1 +0,0 @@
 
-[data-v-2d11492c] .van-nav-bar{background:#39f}[data-v-2d11492c] .van-nav-bar .van-icon,[data-v-2d11492c] .van-nav-bar__text,[data-v-2d11492c] .van-nav-bar__title{color:#fff}[class*=van-hairline][data-v-2d11492c]:after{border:none}[data-v-2d11492c] #zr_0,element.style[data-v-2d11492c]{border-radius:20px}

文件差异内容过多而无法显示
+ 0 - 1
dist/css/chunk-fa62119e.c6f9e172.css


文件差异内容过多而无法显示
+ 1 - 1
dist/index.html


文件差异内容过多而无法显示
+ 2 - 0
dist/js/app.247c722c.js


文件差异内容过多而无法显示
+ 1 - 1
dist/js/app.b8665c28.js.map


文件差异内容过多而无法显示
+ 0 - 2
dist/js/app.b8665c28.js


文件差异内容过多而无法显示
+ 2 - 0
dist/js/chunk-1f0b136e.0f9caff7.js


文件差异内容过多而无法显示
+ 1 - 0
dist/js/chunk-1f0b136e.0f9caff7.js.map


文件差异内容过多而无法显示
+ 2 - 0
dist/js/chunk-405e56a1.d289bdfa.js


文件差异内容过多而无法显示
+ 1 - 0
dist/js/chunk-405e56a1.d289bdfa.js.map


文件差异内容过多而无法显示
+ 0 - 2
dist/js/chunk-75dff630.8254f6b8.js


文件差异内容过多而无法显示
+ 0 - 1
dist/js/chunk-75dff630.8254f6b8.js.map


文件差异内容过多而无法显示
+ 2 - 0
dist/js/chunk-7690ba38.7aa385fc.js


文件差异内容过多而无法显示
+ 1 - 0
dist/js/chunk-7690ba38.7aa385fc.js.map


文件差异内容过多而无法显示
+ 2 - 0
dist/js/chunk-ad68507c.0e8170ae.js


文件差异内容过多而无法显示
+ 1 - 0
dist/js/chunk-ad68507c.0e8170ae.js.map


文件差异内容过多而无法显示
+ 0 - 2
dist/js/chunk-bd5871a8.c484de0b.js


文件差异内容过多而无法显示
+ 0 - 1
dist/js/chunk-bd5871a8.c484de0b.js.map


文件差异内容过多而无法显示
+ 2 - 0
dist/js/chunk-d02382bc.dc8d84b7.js


文件差异内容过多而无法显示
+ 1 - 0
dist/js/chunk-d02382bc.dc8d84b7.js.map


文件差异内容过多而无法显示
+ 0 - 2
dist/js/chunk-dff85cba.f08c1098.js


文件差异内容过多而无法显示
+ 0 - 1
dist/js/chunk-dff85cba.f08c1098.js.map


文件差异内容过多而无法显示
+ 0 - 2
dist/js/chunk-e7119308.ef7e7862.js


文件差异内容过多而无法显示
+ 0 - 1
dist/js/chunk-e7119308.ef7e7862.js.map


文件差异内容过多而无法显示
+ 0 - 2
dist/js/chunk-fa62119e.ffd73137.js


文件差异内容过多而无法显示
+ 0 - 1
dist/js/chunk-fa62119e.ffd73137.js.map


+ 113 - 0
src/views/zaoquan/yiqing/index.html
查看文件 

@@ -0,0 +1,113 @@
 
+<!DOCTYPE html>
 
+<html>
 
+	<head>
 
+		<meta charset="utf-8" />
 
+		<meta name="viewport"
 
+			content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
 
+		<title>ECharts</title>
 
+		<!-- 引入 echarts.js -->
 
+		<script src="https://cdn.jsdelivr.net/npm/echarts@5.1.2/dist/echarts.min.js"></script>
 
+		<script>
 
+			(function() {
 
+				// 获取屏幕区域的宽度
 
+				var w = document.documentElement.clientWidth
 
+
 
+				// 获取html根元素
 
+				var htmlNode = document.querySelector('html')
 
+
 
+				// 设置字体大小
 
+				htmlNode.style.fontSize = w + 'px'
 
+			})()
 
+		</script>
 
+		<style type="text/css">
 
+			* {
 
+				margin: 0;
 
+				padding: 0;
 
+			}
 
+		</style>
 
+	</head>
 
+	<body>
 
+		<!-- 为ECharts准备一个具备大小（宽高）的Dom -->
 
+		<div id="main" style="width: 1rem;height:400px;"></div>
 
+
 
+
 
+		<script type="text/javascript">
 
+			// 基于准备好的dom，初始化echarts实例
 
+			var myChart = echarts.init(document.getElementById('main'));
 
+
 
+			// 指定图表的配置项和数据
 
+			var option = {
 
+				tooltip: {
 
+					trigger: 'item',
 
+					triggerOn: 'click',
 
+					formatter: (params) => {
 
+						// console.log(params.data)
 
+
 
+						click(params.data)
 
+
 
+						return `<div class=chartLabel>
 
+						              <div class=title>${params.name} ${params.value}</div>
 
+						            </div>`
 
+
 
+
 
+					}
 
+				},
 
+				legend: {
 
+					top: '5%',
 
+					left: 'center'
 
+				},
 
+				series: [{
 
+					name: '访问来源',
 
+					type: 'pie',
 
+					radius: ['40%', '70%'],
 
+					avoidLabelOverlap: false,
 
+					label: {
 
+						show: false,
 
+						position: 'center'
 
+					},
 
+					emphasis: {
 
+						label: {
 
+							show: true,
 
+							fontSize: '20',
 
+							fontWeight: 'bold'
 
+						}
 
+					},
 
+					labelLine: {
 
+						show: false
 
+					},
 
+					data: [{
 
+							value: 1048,
 
+							name: '搜索引擎'
 
+						},
 
+						{
 
+							value: 735,
 
+							name: '直接访问'
 
+						},
 
+						{
 
+							value: 580,
 
+							name: '邮件营销'
 
+						},
 
+						{
 
+							value: 484,
 
+							name: '联盟广告'
 
+						},
 
+						{
 
+							value: 300,
 
+							name: '视频广告'
 
+						}
 
+					]
 
+				}]
 
+			};
 
+
 
+			// 使用刚指定的配置项和数据显示图表。
 
+			myChart.setOption(option);
 
+		</script>
 
+		<script type="text/javascript">
 
+			function click(item) {
 
+				console.log(item)
 
+			}
 
+		</script>
 
+
 
+
 
+	</body>
 
+</html>

+ 130 - 86
src/views/zaoquan/yiqing/yiqing-hesuanjiance.vue
查看文件 

@@ -14,7 +14,8 @@
 
     ></div>
 
     <div
 
       id="main2"
 
-      style="width: 350px; height: 200px; margin: 20px auto"
 
+      style="width: 350px; height: 540px; margin: 20px auto"
 
+      v-show="shows1 != infos1"
 
     ></div>
 
   </div>
 
 </template>
 
@@ -28,6 +29,7 @@ export default {
 
       shows: true,
 
       infos: [],
 
       infos1: [],
 
+      shows1:""
 
     };
 
   },
 
   methods: {
 
@@ -41,7 +43,7 @@ export default {
 
           // 指定图表的配置项和数据
 
           // console.log(res);
 
           this.infos = res.data.data;
 
-          console.log(this.infos);
 
+          // console.log(this.infos);
 
           var option = {
 
             backgroundColor: "#fff",
 
             borderRadius: "20px",
 
@@ -51,8 +53,9 @@ export default {
 
               y: "15px",
 
             },
 
             tooltip: {
 
+              show: true,
 
               trigger: "item",
 
-              formatter: "{a} <br/>{b} : {c}",
 
+              // formatter: "{a} <br/>{b} : {c}",
 
             },
 
             legend: {
 
               //设置小块标记
 
@@ -62,9 +65,9 @@ export default {
 
             calculable: true,
 
             series: [
 
               {
 
-                name: "访问来源",
 
+                name: "",
 
                 type: "pie",
 
-                radius: ["50%", "80%"], //饼图的半径大小
 
+                radius: ["40%", "70%"], //饼图的半径大小
 
                 // center: ["60%", "60%"], //饼图的位置
 
                 label: {
 
                   //饼图图形上的文本颜色设置
 
@@ -107,6 +110,84 @@ export default {
 
           myChart.setOption(option);
 
         });
 
     },
 
+
 
+    // getanalysis1() {
 
+    //   let myChart1 = echarts.init(document.getElementById("main2"));
 
+    //   this.$http
 
+    //     .post(
 
+    //       "http://zaoquan.nxjiewei.com:8011/api/workbench/epidemic_situation/nucleic_acid_test_statistics"
 
+    //     )
 
+    //     .then((res) => {
 
+    //       // console.log(res);
 
+    //       // 指定图表的配置项和数据
 
+    //       this.infos1 = res.data.data.not_nat_section_list;
 
+    //       console.log(this.infos1);
 
+    //       let numArr = [];
 
+    //       let section_fullnameArr = [];
 
+    //       for (let i in this.infos1) {
 
+    //         // console.log(this.not_nat_section_list[i].section_fullname);
 
+    //         numArr.push(this.infos1[i].num);
 
+    //         section_fullnameArr.push(this.infos1[i].section_fullname);
 
+    //       }
 
+    //       let array = [];
 
+    //       for (let i = 0; i < numArr.length; i++) {
 
+    //         let obj = {};
 
+    //         for (let j = 0; j < section_fullnameArr.length; j++) {
 
+    //           if (i == j) {
 
+    //             obj.name = section_fullnameArr[j];
 
+    //             obj.value = numArr[i];
 
+    //             array.push(obj);
 
+    //           }
 
+    //         }
 
+    //       }
 
+    //       var option1 = {
 
+    //         backgroundColor: "#fff",
 
+    //         borderRadius: 9,
 
+    //         title: {
 
+    //           text: "核酸未检测人员部门分布",
 
+    //           // left: "left",
 
+    //           x: "25px",
 
+    //           y: "15px",
 
+    //         },
 
+    //         tooltip: {
 
+    //           trigger: "item",
 
+    //           formatter: "{a} <br/>{b} : {c}",
 
+    //         },
 
+    //         textStyle: {
 
+    //           fontSize: 10,
 
+    //           color: "#fff",
 
+    //         },
 
+    //         legend: {
 
+    //           //设置小块标记
 
+    //           y: "bottom",
 
+    //           x: "center",
 
+    //         },
 
+    //         calculable: true,
 
+    //         series: [
 
+    //           {
 
+    //             name: "",
 
+    //             type: "pie",
 
+    //             radius: ["50%", "80%"], //饼图的半径大小
 
+    //             // center: ["60%", "60%"], //饼图的位置
 
+    //             label: {
 
+    //               //饼图图形上的文本颜色设置
 
+    //               normal: {
 
+    //                 show: true,
 
+    //                 position: "inner", //标签的位置
 
+    //                 textStyle: {
 
+    //                   fontWeight: 300,
 
+    //                   fontSize: 16, //文字的字体大小
 
+    //                 },
 
+    //                 formatter: "{d}%", //设置百分比
 
+    //               },
 
+    //             },
 
+    //             data: array,
 
+    //           },
 
+    //         ],
 
+    //       };
 
+    //       myChart1.setOption(option1);
 
+    //     });
 
+    // },
 
     getanalysis1() {
 
       let myChart1 = echarts.init(document.getElementById("main2"));
 
       this.$http
 
@@ -114,40 +195,60 @@ export default {
 
           "http://zaoquan.nxjiewei.com:8011/api/workbench/epidemic_situation/nucleic_acid_test_statistics"
 
         )
 
         .then((res) => {
 
-          // console.log(res);
 
+          console.log(res.data.data.not_nat_section_list);
 
           // 指定图表的配置项和数据
 
           this.infos1 = res.data.data.not_nat_section_list;
 
-          console.log(this.infos1);
 
+          // console.log(this.infos1);
 
           let numArr = [];
 
           let section_fullnameArr = [];
 
+          let section_idArr = [];
 
           for (let i in this.infos1) {
 
             // console.log(this.not_nat_section_list[i].section_fullname);
 
             numArr.push(this.infos1[i].num);
 
             section_fullnameArr.push(this.infos1[i].section_fullname);
 
+            section_idArr.push(this.infos1[i].section_id);
 
           }
 
           let array = [];
 
           for (let i = 0; i < numArr.length; i++) {
 
-            let obj = {};
 
             for (let j = 0; j < section_fullnameArr.length; j++) {
 
-              if (i == j) {
 
-                obj.name = section_fullnameArr[j];
 
-                obj.value = numArr[i];
 
-                array.push(obj);
 
+              let obj = {};
 
+              for (let k = 0; k < section_idArr.length; k++) {
 
+                if (i == j && i == k && j == k) {
 
+                  obj.name = section_fullnameArr[j];
 
+                  obj.value = numArr[i];
 
+                  obj.Id = section_idArr[k];
 
+                  array.push(obj);
 
+                }
 
               }
 
             }
 
           }
 
+          // console.log(array);
 
+          // for (let i = 0; i < numArr.length; i++) {
 
+          //   let obj = {};
 
+          //   for (let j = 0; j < section_fullnameArr.length; j++) {
 
+          //     for (let k = 0; k < section_id.length; k++) {
 
+          //       if (i== j == k) {
 
+          //         obj.name = section_fullnameArr[j];
 
+          //         obj.value = numArr[i];
 
+          //         obj.id = section_id[k];
 
+          //         array.push(obj);
 
+          //       }
 
+          //     }
 
+          //   }
 
+          // }
 
           var option1 = {
 
             backgroundColor: "#fff",
 
             borderRadius: 9,
 
             title: {
 
-              text: "核酸未检测人员部门分布",
 
+              text: "未接种疫苗部门分布",
 
               // left: "left",
 
               x: "25px",
 
               y: "15px",
 
             },
 
             tooltip: {
 
+              show: true,
 
               trigger: "item",
 
-              formatter: "{a} <br/>{b} : {c}",
 
+              // formatter: "{a} <br/>{b} : {c}",
 
             },
 
             textStyle: {
 
               fontSize: 10,
 
@@ -155,24 +256,25 @@ export default {
 
             },
 
             legend: {
 
               //设置小块标记
 
-              y: "bottom",
 
+              y: "70%",
 
               x: "center",
 
             },
 
             calculable: true,
 
             series: [
 
               {
 
-                name: "访问来源",
 
+                name: "",
 
                 type: "pie",
 
                 radius: ["50%", "80%"], //饼图的半径大小
 
-                // center: ["60%", "60%"], //饼图的位置
 
+                center: ["50%", "200px"], //饼图的位置
 
                 label: {
 
                   //饼图图形上的文本颜色设置
 
                   normal: {
 
                     show: true,
 
                     position: "inner", //标签的位置
 
                     textStyle: {
 
-                      fontWeight: 300,
 
-                      fontSize: 16, //文字的字体大小
 
+                      fontWeight: 100,
 
+                      fontSize: 14, //文字的字体大小
 
+                      color: "#fff",
 
                     },
 
                     formatter: "{d}%", //设置百分比
 
                   },
 
@@ -182,73 +284,15 @@ export default {
 
             ],
 
           };
 
           myChart1.setOption(option1);
 
+          // myChart1.on("click", function (param) {
 
+          //   // console.log("111");
 
+          //   // console.log(param.data.Id);
 
+          //   let its = param.data.Id;
 
+          //   // console.log(its);
 
+          //   window.location.href = `#/zaoquan/yiqing/yiqing-weijiezhong?its=${its}`;
 
+          // });
 
         });
 
     },
 
-    // getanalysis1(){
 
-    //   let myChart1 = echarts.init(document.getElementById("main2"));
 
-    //   this.$http.post(
 
-    //       "http://zaoquan.nxjiewei.com:8011/api/workbench/epidemic_situation/nucleic_acid_test_statistics"
 
-    //     ).then(res=>{
 
-    //       console.log(res);
 
-    //       this.infos1 = res.data.data.not_nat_section_list;
 
-    //       console.log(this.infos1);
 
-    //       var option1 = {
 
-    //         backgroundColor: "#fff",
 
-    //         title: {
 
-    //           text: "核酸未检测人员部门分布",
 
-    //           left: "left",
 
-    //         },
 
-    //         tooltip: {
 
-    //           trigger: "item",
 
-    //           formatter: "{a} <br/>{b} : {c}",
 
-    //         },
 
-    //         legend: {
 
-    //           //设置小块标记
 
-    //           y: "bottom",
 
-    //           x: "center",
 
-    //           // orient: "vertical",
 
-    //           // x: "left",
 
-    //           // top: 40,
 
-    //           // itemWidth: 70,
 
-    //           // itemHeight: 30,
 
-    //           // formatter: "{name}",
 
-    //           // textStyle: {
 
-    //           //   color: "#FFFFFF",
 
-    //           // },
 
-    //           // data: [
 
-    //           //   { name: "高速50KM", icon: "rect" },
 
-    //           //   { name: "一级150KM", icon: "rect" },
 
-    //           //   { name: "二级150KM", icon: "rect" },
 
-    //           //   { name: "三级100KM", icon: "rect" },
 
-    //           //   { name: "四级50KM", icon: "rect" },
 
-    //           // ],
 
-    //         },
 
-    //         calculable: true,
 
-    //         series: [
 
-    //           {
 
-    //             name: "访问来源",
 
-    //             type: "pie",
 
-    //             radius: ["50%","70%"], //饼图的半径大小
 
-    //             // center: ["60%", "60%"], //饼图的位置
 
-    //             label: {
 
-    //               //饼图图形上的文本颜色设置
 
-    //               normal: {
 
-    //                 show: true,
 
-    //                 position: "inner", //标签的位置
 
-    //                 textStyle: {
 
-    //                   fontWeight: 300,
 
-    //                   fontSize: 16, //文字的字体大小
 
-    //                 },
 
-    //                 formatter: "{d}%", //设置百分比
 
-    //               },
 
-    //             },
 
-    //             data: this.infos1
 
-    //           },
 
-    //         ],
 
-    //       };
 
-    //       myChart1.setOption(option1)
 
-    //     })
 
-    // },
 
     onClickLeft() {
 
       window.history.back();
 
     },
 
@@ -279,7 +323,7 @@ export default {
 
 [class*="van-hairline"]:after {
 
   border: none;
 
 }
 
-#main{
 
-  border-radius: 20px;
 
+>>>canvas{
 
+border-radius: 20px!important;
 
 }
 
 </style>

+ 5 - 5
src/views/zaoquan/yiqing/yiqing-tianbao.vue
查看文件 

@@ -20,11 +20,11 @@
 
       <div class="contents_two">
 
         <div class="contents_three">
 
           <div class="contents_four">
 
-            <span>姓名</span>
 
+            <span class="contents_six">姓名</span>
 
             <span class="contents_four_span">{{item.name}}</span>
 
           </div>
 
           <div class="contents_five">
 
-            <span>是否接种疫苗</span>
 
+            <span class="contents_six">是否接种疫苗</span>
 
             <span class="contents_five_span">{{item.vaccination}}</span>
 
           </div>
 
         </div>
 
@@ -70,7 +70,7 @@ export default {
 
       this.$http.post("http://zaoquan.nxjiewei.com:8011/api/workbench/epidemic_situation/clock_in_list",{
 
         staff_num:this.mobile
 
       }).then(res=>{
 
-        // console.log(res);
 
+        console.log(res);
 
         this.xinxi=res.data.data.data
 
       })
 
     },
 
@@ -165,10 +165,10 @@ export default {
 
   flex-wrap: wrap;
 
 }
 
 .contents_four {
 
-  width: 50%;
 
+  width: 45%;
 
 }
 
 .contents_five {
 
-  width: 50%;
 
+  width: 55%;
 
 }
 
 .contents_four_span {
 
   margin-left: 8px;

+ 18 - 12
src/views/zaoquan/yiqing/yiqing-tiwen.vue
查看文件 

@@ -114,8 +114,9 @@
 
           <label for="yimiao">是否接种疫苗</label>
 
           <div>
 
             <el-radio-group v-model="radio1" @change="reasons">
 
-              <el-radio-button label="是"></el-radio-button>
 
-              <el-radio-button label="否"></el-radio-button>
 
+              <el-radio-button label="第一剂"></el-radio-button>
 
+              <el-radio-button label="未接种"></el-radio-button>
 
+              <el-radio-button label="第二剂"></el-radio-button>
 
             </el-radio-group>
 
           </div>
 
         </div>
 
@@ -187,7 +188,7 @@ export default {
 
       showPicker1: false,
 
       columns2: ["私家车", "步行", "客运车", "出租车"],
 
       showPicker2: false,
 
-      radio1: "是",
 
+      radio1: "第一剂",
 
       radio2: "否",
 
       // token: sessionStorage.getItem("mytoken")
 
       //   ? sessionStorage.getItem("mytoken")
 
@@ -243,22 +244,24 @@ export default {
 
         // console.log(this.radio1);
 
         // console.log(this.radio2);
 
         //疫苗情况
 
-        if (this.radio1 == "是") {
 
+        if (this.radio1 == "第一剂") {
 
           this.yimiao = 1;
 
-        } else {
 
+        }else if(this.radio1=="未接种"){
 
+          this.yimiao = 3;
 
+        }else {
 
           this.yimiao = 2;
 
         }
 
         //是否做过核酸
 
         if (this.radio2 == "是") {
 
-          this.hesuan = 1;
 
-        } else {
 
           this.hesuan = 2;
 
+        } else {
 
+          this.hesuan = 1;
 
         }
 
         //身体状况
 
         if (this.value == "正常") {
 
-          this.values = 1;
 
-        } else {
 
           this.values = 2;
 
+        } else {
 
+          this.values = 1;
 
         }
 
         //来自地点
 
         if (this.value1 == "住矿(宿舍)") {
 
@@ -284,7 +287,7 @@ export default {
 
         } else {
 
           this.values2 = 4;
 
         }
 
-        // console.log(this.yimiao);
 
+        console.log(this.yimiao);
 
         // console.log(this.hesuan);
 
         // console.log(this.values);
 
         // console.log(this.values1);
 
@@ -519,7 +522,7 @@ input::-webkit-input-placeholder {
 
   text-align: right;
 
 }
 
 >>> .el-radio-button {
 
-  margin-left: 13px;
 
+  margin-left: 4px;
 
 }
 
 >>> .el-radio-button:last-child .el-radio-button__inner {
 
   border-radius: 14px;
 
@@ -539,9 +542,12 @@ input::-webkit-input-placeholder {
 
   position: relative;
 
   cursor: pointer;
 
   transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
 
-  padding: 6px 16px;
 
+  padding: 6px 12px;
 
   font-size: 11px;
 
 }
 
+>>>.el-radio-button__inner{
 
+  border-radius: 14px;
 
+}
 
 >>> .el-radio-button:first-child .el-radio-button__inner {
 
   border-radius: 14px;
 
 }

+ 5 - 3
src/views/zaoquan/yiqing/yiqing-weijiezhong.vue
查看文件 

@@ -34,6 +34,8 @@ export default {
 
   mounted() {
 
     document.body.style.backgroundColor = "#fff"; //背景色
 
     this.token = getAllUrlParams(window.location.href).token;
 
+    this.id = getAllUrlParams(window.location.href).its;
 
+    console.log(this.id);
 
     this.getxinxi()
 
   },
 
   methods: {
 
@@ -41,7 +43,9 @@ export default {
 
       window.history.back();
 
     },
 
     getxinxi(){
 
-        this.$http.post("http://zaoquan.nxjiewei.com:8011/api/workbench/epidemic_situation/get_not_vaccination_list").then(res=>{
 
+        this.$http.post("http://zaoquan.nxjiewei.com:8011/api/workbench/epidemic_situation/get_not_vaccination_list",{
 
+            section_id:this.id
 
+        }).then(res=>{
 
             console.log(res.data.data.not_nat_section_list);
 
             this.xinxi=res.data.data.not_nat_section_list
 
         })
 
@@ -81,12 +85,10 @@ export default {
 
 }
 
 .contents2 {
 
   width: 30%;
 
-  text-align: center;
 
   color: #39f;
 
 }
 
 .contents3 {
 
   width: 50%;
 
-  text-align: center;
 
   color: #39f;
 
 }
 
 .contents_one {

+ 107 - 119
src/views/zaoquan/yiqing/yiqing-yimiaojiezhong.vue
查看文件 

@@ -8,13 +8,17 @@
 
         @click-left="onClickLeft"
 
       />
 
     </div>
 
-    <div
 
-      id="main"
 
-      style="width: 350px; height: 300px; margin: 0 auto; border-radius: 10px"
 
-    ></div>
 
+    <div class="contents">
 
+      <div
 
+        id="main"
 
+        style="width: 350px; height: 300px; margin: 0 auto; border-radius: 10px"
 
+      ></div>
 
+    </div>
 
+
 
     <div
 
       id="main2"
 
-      style="width: 350px; height: 680px; margin: 20px auto"
 
+      style="width: 350px; height: 540px; margin: 20px auto"
 
+      v-show="shows1 != infos1"
 
     ></div>
 
   </div>
 
 </template>
 
@@ -28,6 +32,7 @@ export default {
 
       shows: true,
 
       infos: [],
 
       infos1: [],
 
+      shows1: "",
 
     };
 
   },
 
   methods: {
 
@@ -38,13 +43,13 @@ export default {
 
           "http://zaoquan.nxjiewei.com:8011/api/workbench/epidemic_situation/vaccination_statistics"
 
         )
 
         .then((res) => {
 
-          // console.log(res);
 
+          console.log(res);
 
           // 指定图表的配置项和数据
 
           this.infos = res.data.data;
 
           // console.log(this.infos);
 
           var option = {
 
             backgroundColor: "#fff",
 
-            borderRadius: 9,
 
+            borderRadius: [20,20,20,20],
 
             title: {
 
               text: "疫苗接种统计",
 
               // left: "left",
 
@@ -52,42 +57,72 @@ export default {
 
               y: "15px",
 
             },
 
             tooltip: {
 
+              show: true,
 
               trigger: "item",
 
-              formatter: "{a} <br/>{b} : {c}",
 
-               textStyle: {
 
-                fontSize: 10,
 
-                color:"#fff"
 
-              },
 
+              // formatter: "{a} <br/>{b} : {c}",
 
+              // textStyle: {
 
+              //   fontSize: 10,
 
+              //   color: "#fff",
 
+              // },
 
             },
 
-           
+
 
             legend: {
 
               //设置小块标记
 
               y: "bottom",
 
               x: "center",
 
+              formatter: {},
 
             },
 
             calculable: true,
 
             series: [
 
               {
 
-                name: "访问来源",
 
+                // name: "",
 
+                // type: "pie",
 
+                // radius: ["50%", "80%"], //饼图的半径大小
 
+                // // center: ["60%", "60%"], //饼图的位置
 
+                // label: {
 
+                //   //饼图图形上的文本颜色设置
 
+                //   normal: {
 
+                //     show: true,
 
+                //     position: "inner", //标签的位置
 
+                //     textStyle: {
 
+                //       fontWeight: 300,
 
+                //       fontSize: 16, //文字的字体大小
 
+                //     },
 
+                //     formatter: "{d}%", //设置百分比
 
+                //   },
 
+                // },
 
+                name: "",
 
                 type: "pie",
 
-                radius: ["50%", "80%"], //饼图的半径大小
 
-                // center: ["60%", "60%"], //饼图的位置
 
+                radius: ["40%", "70%"],
 
+                avoidLabelOverlap: false,
 
                 label: {
 
-                  //饼图图形上的文本颜色设置
 
+                  show: false,
 
+                  position: "center",
 
                   normal: {
 
                     show: true,
 
                     position: "inner", //标签的位置
 
                     textStyle: {
 
-                      fontWeight: 300,
 
-                      fontSize: 16, //文字的字体大小
 
+                      fontWeight: 100,
 
+                      fontSize: 14, //文字的字体大小
 
+                      color: "#fff",
 
                     },
 
                     formatter: "{d}%", //设置百分比
 
                   },
 
                 },
 
+                emphasis: {
 
+                  label: {
 
+                    show: true,
 
+                    fontSize: "20",
 
+                    fontWeight: "bold",
 
+                  },
 
+                },
 
+                labelLine: {
 
+                  show: false,
 
+                },
 
                 data: [
 
                   {
 
-                    value: this.infos.vaccination,
 
-                    name: "已接种疫苗",
 
+                    value: this.infos.vaccination_first,
 
+                    name: "接种第一剂",
 
                     // 配置映射图显示颜色
 
                     itemStyle: {
 
                       // 设置扇形的颜色
 
@@ -97,8 +132,20 @@ export default {
 
                     },
 
                   }, //饼图图形颜色
 
                   {
 
+                    value: this.infos.vaccination_second,
 
+                    name: "接种第二剂",
 
+                    // 配置映射图显示颜色
 
+                    itemStyle: {
 
+                      // 设置扇形的颜色
 
+                      color: "#9ad12e",
 
+                      shadowBlur: 200,
 
+                      shadowColor: "rgba(0, 0, 0, 0)",
 
+                    },
 
+                  }, //饼图图形颜色
 
+                  {
 
                     value: this.infos.not_vaccination,
 
                     name: "未接种疫苗",
 
+                    Id:"2",
 
                     itemStyle: {
 
                       // 设置扇形的颜色
 
                       color: "red",
 
@@ -111,9 +158,11 @@ export default {
 
             ],
 
           };
 
           myChart.setOption(option);
 
-          myChart.on("click", function () {
 
+          myChart.on("click", function (param) {
 
             // console.log("111");
 
-            window.location.href = "#/zaoquan/yiqing/yiqing-weijiezhong";
 
+            // console.log(param.data);
 
+            // let id=param.data.Id
 
+            window.location.href = `#/zaoquan/yiqing/yiqing-weijiezhong`;
 
           });
 
         });
 
     },
 
@@ -127,25 +176,31 @@ export default {
 
           // console.log(res);
 
           // 指定图表的配置项和数据
 
           this.infos1 = res.data.data.not_nat_section_list;
 
-          console.log(this.infos1);
 
+          // console.log(this.infos1);
 
           let numArr = [];
 
           let section_fullnameArr = [];
 
+          let section_idArr = [];
 
           for (let i in this.infos1) {
 
             // console.log(this.not_nat_section_list[i].section_fullname);
 
             numArr.push(this.infos1[i].num);
 
             section_fullnameArr.push(this.infos1[i].section_fullname);
 
+            section_idArr.push(this.infos1[i].section_id);
 
           }
 
           let array = [];
 
           for (let i = 0; i < numArr.length; i++) {
 
-            let obj = {};
 
             for (let j = 0; j < section_fullnameArr.length; j++) {
 
-              if (i == j) {
 
-                obj.name = section_fullnameArr[j];
 
-                obj.value = numArr[i];
 
-                array.push(obj);
 
+              let obj = {};
 
+              for (let k = 0; k < section_idArr.length; k++) {
 
+                if (i == j && i == k && j == k) {
 
+                  obj.name = section_fullnameArr[j];
 
+                  obj.value = numArr[i];
 
+                  obj.Id = section_idArr[k];
 
+                  array.push(obj);
 
+                }
 
               }
 
             }
 
           }
 
+          // console.log(array);
 
           var option1 = {
 
             backgroundColor: "#fff",
 
             borderRadius: 9,
 
@@ -156,34 +211,35 @@ export default {
 
               y: "15px",
 
             },
 
             tooltip: {
 
+              show: true,
 
               trigger: "item",
 
-              formatter: "{a} <br/>{b} : {c}",
 
-              
+              // formatter: "{a} <br/>{b} : {c}",
 
             },
 
             textStyle: {
 
-                fontSize: 10,
 
-                color:"#fff"
 
-              },
 
+              fontSize: 10,
 
+              color: "#fff",
 
+            },
 
             legend: {
 
               //设置小块标记
 
-              y: "bottom",
 
+              y: "70%",
 
               x: "center",
 
             },
 
             calculable: true,
 
             series: [
 
               {
 
-                name: "访问来源",
 
+                name: "",
 
                 type: "pie",
 
                 radius: ["50%", "80%"], //饼图的半径大小
 
-                // center: ["60%", "60%"], //饼图的位置
 
+                center: ["50%", "200px"], //饼图的位置
 
                 label: {
 
                   //饼图图形上的文本颜色设置
 
                   normal: {
 
                     show: true,
 
                     position: "inner", //标签的位置
 
                     textStyle: {
 
-                      fontWeight: 300,
 
-                      fontSize: 16, //文字的字体大小
 
+                      fontWeight: 100,
 
+                      fontSize: 14, //文字的字体大小
 
+                      color: "#fff",
 
                     },
 
                     formatter: "{d}%", //设置百分比
 
                   },
 
@@ -193,94 +249,23 @@ export default {
 
             ],
 
           };
 
           myChart1.setOption(option1);
 
+          myChart1.on("click", function (param) {
 
+            // console.log("111");
 
+            // console.log(param.data.Id);
 
+            let its = param.data.Id;
 
+            // console.log(its);
 
+            window.location.href = `#/zaoquan/yiqing/yiqing-weijiezhong?its=${its}`;
 
+          });
 
         });
 
     },
 
-    // getanalysis1(){
 
-    //   let myChart1 = echarts.init(document.getElementById("main2"));
 
-    //   this.$http.post(
 
-    //       "http://zaoquan.nxjiewei.com:8011/api/workbench/epidemic_situation/vaccination_statistics"
 
-    //     ).then(res=>{
 
-    //       console.log(res);
 
-    //       this.infos1 = res.data.data.not_nat_section_list;
 
-    //       console.log(this.infos1);
 
-    //       // function f(s){
 
-    //       //   for(let i in s){
 
-    //       //     if(typeof s[i]=="object"){
 
-    //       //       f(s[i])
 
-    //       //     }else{
 
-    //       //       console.log(s[i]);
 
-    //       //     }
 
-    //       //   }
 
-    //       // }
 
-    //       // f(this.infos1)
 
-    //       let section_fullname=[];
 
-    //       for(let items of this.infos1){
 
-    //         section_fullname.push(items.section_fullname)
 
-    //       }
 
-    //       console.log(section_fullname);
 
-    //       var option1 = {
 
-    //         backgroundColor: "#fff",
 
-    //         title: {
 
-    //           text: "核酸未检测人员部门分布",
 
-    //           left: "left",
 
-    //         },
 
-    //         tooltip: {
 
-    //           trigger: "item",
 
-    //           formatter: "{a} <br/>{b} : {c}",
 
-    //         },
 
-    //         legend: {
 
-    //           //设置小块标记
 
-    //           y: "bottom",
 
-    //           x: "center",
 
-    //           // orient: "vertical",
 
-    //           // x: "left",
 
-    //           // top: 40,
 
-    //           // itemWidth: 70,
 
-    //           // itemHeight: 30,
 
-    //           // formatter: "{name}",
 
-    //           // textStyle: {
 
-    //           //   color: "#FFFFFF",
 
-    //           // },
 
-    //           // data: [
 
-    //           //   { name: "高速50KM", icon: "rect" },
 
-    //           //   { name: "一级150KM", icon: "rect" },
 
-    //           //   { name: "二级150KM", icon: "rect" },
 
-    //           //   { name: "三级100KM", icon: "rect" },
 
-    //           //   { name: "四级50KM", icon: "rect" },
 
-    //           // ],
 
-    //         },
 
-    //         calculable: true,
 
-    //         series: [
 
-    //           {
 
-    //             name: "访问来源",
 
-    //             type: "pie",
 
-    //             radius: ["50%","70%"], //饼图的半径大小
 
-    //             // center: ["60%", "60%"], //饼图的位置
 
-    //             label: {
 
-    //               //饼图图形上的文本颜色设置
 
-    //               normal: {
 
-    //                 show: true,
 
-    //                 position: "inner", //标签的位置
 
-    //                 textStyle: {
 
-    //                   fontWeight: 300,
 
-    //                   fontSize: 16, //文字的字体大小
 
-    //                 },
 
-    //                 formatter: "{d}%", //设置百分比
 
-    //               },
 
-    //             },
 
-    //             data: this.infos1
 
-    //           },
 
-    //         ],
 
-    //       };
 
-    //       myChart1.setOption(option1)
 
-    //     })
 
-    // },
 
+
 
     onClickLeft() {
 
       window.history.back();
 
     },
 
   },
 
   mounted() {
 
     document.body.style.backgroundColor = "#39f"; //背景色
 
+    document.body.style.borderRadius="20px"
 
     this.token = getAllUrlParams(window.location.href).token;
 
     // console.log(this.token);
 
     this.getanalysis();
 
@@ -311,4 +296,7 @@ element.style {
 
 >>> #zr_0 {
 
   border-radius: 20px;
 
 }
 
+>>>canvas{
 
+border-radius: 20px!important;
 
+}
 
 </style>