提交

src/router/index.js

@@ -121,13 +121,13 @@ export const allRoutes = [
             name: "cjxt_tjdj_njck",
             hidden: true,
             component: () => import("@/views/cjxt/tjdj/njck/index.vue"),
-            meta: { title: "年级查看" },
+            meta: { title: "年级查看" , back: true},
         }, {
             path: "/cjxt/bjck/:grade_id/:class_id",
             name: "cjxt_tjdj_bjck",
             hidden: true,
             component: () => import("@/views/cjxt/tjdj/bjck/index.vue"),
-            meta: { title: "班级查看" },
+            meta: { title: "班级查看" , back: true},
         }]
     },
     {
@@ -146,7 +146,7 @@ export const allRoutes = [
             name: "xshjgl_jlgl_rygl",
             hidden: true,
             component: () => import("@/views/xshjgl/jlgl/rygl/index.vue"),
-            meta: { title: "荣誉管理" },
+            meta: { title: "荣誉管理" , back: true},
         }, {
             path: "/xshjgl/jlcx",
             name: "xshjgl_jlcx",
@@ -199,7 +199,7 @@ export const allRoutes = [
                     name: "xsxjk_bbgl_bbxq",
                     hidden: true,
                     component: MainDefaultLayout,
-                    meta: { title: "报表详情" },
+                    meta: { title: "报表详情",back: true, },
                     children: [
                         {
                             path: "bbxq/:id",
@@ -213,7 +213,7 @@ export const allRoutes = [
                             name: "xsxjk_bbgl_bbxq_xqlb",
                             hidden: true,
                             component: () => import("@/views/xsxjk/bbgl/bbxq/xqlb/index.vue"),
-                            meta: { title: "详情列表" },
+                            meta: { title: "详情列表",back: true, },
                             props: true,
 
                         },
@@ -238,7 +238,7 @@ export const allRoutes = [
                 {
                     path: "xsrstjlbxq/:team_id/:grade_id/:dept_id",
                     hidden: true,
-                    meta: { title: "学生人数统计列表详情" },
+                    meta: { title: "学生人数统计列表详情" ,back: true,},
                     name: "xsxjk_xsrstjlb_xsrstjlbxq",
                     component: () => import("@/views/xsxjk/xsrstjlb/xsrstjlbxq/index.vue"),
                     props: true,
@@ -272,7 +272,7 @@ export const allRoutes = [
                         }, {
                             path: "wspfx/:id",
                             hidden: true,
-                            meta: { title: "评分项" },
+                            meta: { title: "评分项", back: true },
                             name: "bjzzpb_sz_wspb_wspfx",
                             component: () => import("@/views/bjzzpb/sz/wspb/wspfx/index.vue"),
                             props: true,
@@ -295,7 +295,7 @@ export const allRoutes = [
                         {
                             path: "cgpfx/:id",
                             hidden: true,
-                            meta: { title: "评分项" },
+                            meta: { title: "评分项", back: true },
                             name: "bjzzpb_sz_cgpb_cgpfx",
                             component: () => import("@/views/bjzzpb/sz/cgpb/cgpfx/index.vue"),
                             props: true,
@@ -367,7 +367,7 @@ export const allRoutes = [
                         {
                             path: "/xsczda/xslb/:id",
                             hidden: true,
-                            meta: { title: "班级列表" },
+                            meta: { title: "班级列表" , back: true},
                             name: "xsczda_xslb_bjlb",
                             component: () => import("@/views/xsczda/xslb/bjlb/index.vue"),
                         }, {
@@ -375,7 +375,7 @@ export const allRoutes = [
                             hidden: true,
                             name: "xsczda_xslb_bjlb_xslbxq",
                             component: MainDefaultLayout,
-                            meta: { title: "学生列表详情" },
+                            meta: { title: "学生列表详情",back: true, },
                             props: true,
                             children: [
                                 {

src/views/xsxjk/bbgl/bbxq/index.vue

@@ -44,9 +44,8 @@
           </h3>
         </template>
       </el-table-column>
-
-      <el-table-column label="时间" prop="xdxb_cjsj"> </el-table-column>
-
+      <el-table-column label="日期范围" prop="xdxb_qdzdysj"> </el-table-column>
+      <el-table-column label="创建时间" prop="xdxb_cjsj"> </el-table-column>
       <el-table-column label="操作" width="300">
         <template slot-scope="scope">
           <el-button type="text" @click="exportOne(scope.row.xdxb_id)"
@@ -81,7 +80,7 @@
         :rules="rules"
         label-width="100px"
       >
-        <el-form-item class="mr75" label="报表名" prop="jcxm">
+        <el-form-item class="mr75" label="报表名" prop="bbm">
           <el-input
             placeholder="请输入报表名"
             v-model="dialogForm.bbm"
@@ -113,6 +112,7 @@
             filterable
           >
             <el-option
+              v-show="!item.isShow"
               v-for="item in showList"
               :label="item.col_name"
               :value="item.col_id"
@@ -135,12 +135,15 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间" prop="sj">
+        <el-form-item label="日期范围" prop="sj">
           <el-date-picker
             v-model="dialogForm.sj"
-            type="date"
-            placeholder="选择日期"
+            @change="handleDateChange"
+            type="daterange"
             value-format="yyyy-MM-dd"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
           >
           </el-date-picker>
         </el-form-item>
@@ -184,6 +187,9 @@ export default {
         time: [],
       },
       rules: {
+        col_ids: [
+          { required: true, message: "请选择要显示的列", trigger: "blur" },
+        ],
         bbm: [{ required: true, message: "请输入报表", trigger: "blur" }],
         sj: [{ required: true, message: "请选择时间", trigger: "blur" }],
       },
@@ -191,6 +197,11 @@ export default {
       multipleSelection: [],
       showList: [
         {
+          col_name: "全部",
+          col_id: "",
+          isShow: true,
+        },
+        {
           col_name: "学生姓名",
           col_id: "xdx_xsxm",
         },
@@ -199,17 +210,109 @@ export default {
           col_id: "xdx_xsxh",
         },
         {
+          col_name: "出生日期",
+          col_id: "xdx_csrq",
+        },
+        {
+          col_name: "证件类型",
+          col_id: "xdx_zjlx",
+        },
+        {
+          col_name: "曾用名",
+          col_id: "xdx_zym",
+        },
+        {
+          col_name: "证件号码",
+          col_id: "xdx_zjhm",
+        },
+        {
+          col_name: "籍贯",
+          col_id: "xdx_jg",
+        },
+        {
           col_name: "性别",
           col_id: "xdx_xb",
         },
         {
-          col_name: "年龄",
-          col_id: "xdx_nl",
+          col_name: "民族",
+          col_id: "xdx_mz",
+        },
+        {
+          col_name: "政治面貌",
+          col_id: "xdx_zzmm",
+        },
+        {
+          col_name: "文化程度",
+          col_id: "xdx_whcd",
+        },
+        {
+          col_name: "入党时间",
+          col_id: "xdx_rdsj",
+        },
+        {
+          col_name: "所在支部",
+          col_id: "xdx_szzb",
+        },
+        {
+          col_name: "所在党小组",
+          col_id: "xdx_szdxz",
+        },
+        {
+          col_name: "家庭住址",
+          col_id: "xdx_jtzz",
+        },
+        {
+          col_name: "详细地址",
+          col_id: "xdx_xxdz",
+        },
+        {
+          col_name: "上传照片",
+          col_id: "xdx_sczp",
         },
         {
           col_name: "联系方式",
           col_id: "xdx_lxfs",
         },
+        {
+          col_name: "爱好特长",
+          col_id: "xdx_ahtc",
+        },
+        {
+          col_name: "异动备注",
+          col_id: "xdx_ydbz",
+        },
+        {
+          col_name: "异动当前状态",
+          col_id: "xdx_yddqzt",
+        },
+        {
+          col_name: "年级名称",
+          col_id: "grade_name",
+        },
+        {
+          col_name: "班级名称",
+          col_id: "class_name",
+        },
+        {
+          col_name: "备注",
+          col_id: "xdx_bz",
+        },
+        {
+          col_name: "家庭成员",
+          col_id: "xdx_jtcy",
+        },
+        {
+          col_name: "获奖荣誉",
+          col_id: "xdx_hjry",
+        },
+        {
+          col_name: "年龄",
+          col_id: "xdx_nl",
+        },
+        {
+          col_name: "血型",
+          col_id: "xdx_xx",
+        },
       ],
       rankList: [
         {
@@ -274,9 +377,15 @@ export default {
               type: "error",
             });
           }
+          this.dialogForm.col_ids.map((item) => {
+            if (!item.col_id) {
+              this.dialogForm.col_ids = [];
+            }
+          });
+
           let data = {
             xdxb_title: this.dialogForm.bbm,
-            xdxb_cjsj: this.dialogForm.sj,
+            xdxb_qdzdysj: this.dialogForm.sj[0] + "-" + this.dialogForm.sj[1],
             xdxb_blx: this.id,
             xdxb_custom_json: JSON.stringify([
               {
@@ -286,7 +395,7 @@ export default {
               },
             ]),
           };
-          console.log(data, 'data');
+          console.log(data, "data");
           bbgl_add(data).then((res) => {
             if (res.code == 1) {
               this.$message({
@@ -323,7 +432,13 @@ export default {
       this.cur_page = 1;
       this.getListData();
     },
-    //批
+    handleDateChange(val) {
+      // if (val) {
+      //   this.dialogForm.sj = val[0] + " - " + val[1];
+      // }
+      // console.log(this.dialogForm.sj, " this.dialogForm.sj ");
+      // this.getListData();
+    },
     handleSelectionChange(val) {
       this.multipleSelection = [];
       for (let i in val) {
@@ -333,11 +448,12 @@ export default {
     exportOne(xdxb_id) {
       let link =
         window.globalVariables.api +
-        "/xddy/dygl_xsxjk_bbgl/index?api=xls&page=1&limit=10000&token=" +
+        "/xddy/dygl_xsxjk/index?api=xls&page=1&limit=1&token=" +
         token +
         "&xdxb_id=" +
         xdxb_id;
       window.open(link, "_blank");
+      console.log(link, "_blank");
     },
     exportAll() {
       let time = "";
@@ -352,7 +468,6 @@ export default {
         token +
         "&xdxb_id=" +
         this.multipleSelection.join(",");
-      window.open(link, "_blank");
     },
     toDetail(id) {
       this.$router.push({

yarn.lock

@@ -761,6 +761,11 @@ color-name@~1.1.4:
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+commander@7:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
 consolidate@^0.15.1:
   version "0.15.1"
   resolved "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz"
@@ -804,6 +809,250 @@ cssesc@^3.0.0:
   resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
+"d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3, d3-array@^3.2.0:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.2.4.tgz#15fec33b237f97ac5d7c986dc77da273a8ed0bb5"
+  integrity sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==
+  dependencies:
+    internmap "1 - 2"
+
+d3-axis@3:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-3.0.0.tgz#c42a4a13e8131d637b745fc2973824cfeaf93322"
+  integrity sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==
+
+d3-brush@3:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-3.0.0.tgz#6f767c4ed8dcb79de7ede3e1c0f89e63ef64d31c"
+  integrity sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==
+  dependencies:
+    d3-dispatch "1 - 3"
+    d3-drag "2 - 3"
+    d3-interpolate "1 - 3"
+    d3-selection "3"
+    d3-transition "3"
+
+d3-chord@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-3.0.1.tgz#d156d61f485fce8327e6abf339cb41d8cbba6966"
+  integrity sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==
+  dependencies:
+    d3-path "1 - 3"
+
+"d3-color@1 - 3", d3-color@3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2"
+  integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==
+
+d3-contour@4:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-4.0.2.tgz#bb92063bc8c5663acb2422f99c73cbb6c6ae3bcc"
+  integrity sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA==
+  dependencies:
+    d3-array "^3.2.0"
+
+d3-delaunay@6:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/d3-delaunay/-/d3-delaunay-6.0.4.tgz#98169038733a0a5babbeda55054f795bb9e4a58b"
+  integrity sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A==
+  dependencies:
+    delaunator "5"
+
+"d3-dispatch@1 - 3", d3-dispatch@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz#5fc75284e9c2375c36c839411a0cf550cbfc4d5e"
+  integrity sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==
+
+"d3-drag@2 - 3", d3-drag@3:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-3.0.0.tgz#994aae9cd23c719f53b5e10e3a0a6108c69607ba"
+  integrity sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==
+  dependencies:
+    d3-dispatch "1 - 3"
+    d3-selection "3"
+
+"d3-dsv@1 - 3", d3-dsv@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-3.0.1.tgz#c63af978f4d6a0d084a52a673922be2160789b73"
+  integrity sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==
+  dependencies:
+    commander "7"
+    iconv-lite "0.6"
+    rw "1"
+
+"d3-ease@1 - 3", d3-ease@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-3.0.1.tgz#9658ac38a2140d59d346160f1f6c30fda0bd12f4"
+  integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==
+
+d3-fetch@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-3.0.1.tgz#83141bff9856a0edb5e38de89cdcfe63d0a60a22"
+  integrity sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==
+  dependencies:
+    d3-dsv "1 - 3"
+
+d3-force@3:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-3.0.0.tgz#3e2ba1a61e70888fe3d9194e30d6d14eece155c4"
+  integrity sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==
+  dependencies:
+    d3-dispatch "1 - 3"
+    d3-quadtree "1 - 3"
+    d3-timer "1 - 3"
+
+"d3-format@1 - 3", d3-format@3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-3.1.0.tgz#9260e23a28ea5cb109e93b21a06e24e2ebd55641"
+  integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==
+
+d3-geo@3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-3.1.0.tgz#74fd54e1f4cebd5185ac2039217a98d39b0a4c0e"
+  integrity sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==
+  dependencies:
+    d3-array "2.5.0 - 3"
+
+d3-hierarchy@3:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz#b01cd42c1eed3d46db77a5966cf726f8c09160c6"
+  integrity sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==
+
+"d3-interpolate@1 - 3", "d3-interpolate@1.2.0 - 3", d3-interpolate@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d"
+  integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==
+  dependencies:
+    d3-color "1 - 3"
+
+"d3-path@1 - 3", d3-path@3, d3-path@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-3.1.0.tgz#22df939032fb5a71ae8b1800d61ddb7851c42526"
+  integrity sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==
+
+d3-polygon@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-3.0.1.tgz#0b45d3dd1c48a29c8e057e6135693ec80bf16398"
+  integrity sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==
+
+"d3-quadtree@1 - 3", d3-quadtree@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-3.0.1.tgz#6dca3e8be2b393c9a9d514dabbd80a92deef1a4f"
+  integrity sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==
+
+d3-random@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-3.0.1.tgz#d4926378d333d9c0bfd1e6fa0194d30aebaa20f4"
+  integrity sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==
+
+d3-scale-chromatic@3:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz#15b4ceb8ca2bb0dcb6d1a641ee03d59c3b62376a"
+  integrity sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==
+  dependencies:
+    d3-color "1 - 3"
+    d3-interpolate "1 - 3"
+
+d3-scale@4:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-4.0.2.tgz#82b38e8e8ff7080764f8dcec77bd4be393689396"
+  integrity sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==
+  dependencies:
+    d3-array "2.10.0 - 3"
+    d3-format "1 - 3"
+    d3-interpolate "1.2.0 - 3"
+    d3-time "2.1.1 - 3"
+    d3-time-format "2 - 4"
+
+"d3-selection@2 - 3", d3-selection@3:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-3.0.0.tgz#c25338207efa72cc5b9bd1458a1a41901f1e1b31"
+  integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==
+
+d3-shape@3:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-3.2.0.tgz#a1a839cbd9ba45f28674c69d7f855bcf91dfc6a5"
+  integrity sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==
+  dependencies:
+    d3-path "^3.1.0"
+
+"d3-time-format@2 - 4", d3-time-format@4:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-4.1.0.tgz#7ab5257a5041d11ecb4fe70a5c7d16a195bb408a"
+  integrity sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==
+  dependencies:
+    d3-time "1 - 3"
+
+"d3-time@1 - 3", "d3-time@2.1.1 - 3", d3-time@3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-3.1.0.tgz#9310db56e992e3c0175e1ef385e545e48a9bb5c7"
+  integrity sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==
+  dependencies:
+    d3-array "2 - 3"
+
+"d3-timer@1 - 3", d3-timer@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-3.0.1.tgz#6284d2a2708285b1abb7e201eda4380af35e63b0"
+  integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==
+
+"d3-transition@2 - 3", d3-transition@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-3.0.1.tgz#6869fdde1448868077fdd5989200cb61b2a1645f"
+  integrity sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==
+  dependencies:
+    d3-color "1 - 3"
+    d3-dispatch "1 - 3"
+    d3-ease "1 - 3"
+    d3-interpolate "1 - 3"
+    d3-timer "1 - 3"
+
+d3-zoom@3:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-3.0.0.tgz#d13f4165c73217ffeaa54295cd6969b3e7aee8f3"
+  integrity sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==
+  dependencies:
+    d3-dispatch "1 - 3"
+    d3-drag "2 - 3"
+    d3-interpolate "1 - 3"
+    d3-selection "2 - 3"
+    d3-transition "2 - 3"
+
+d3@^7.8.5:
+  version "7.8.5"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-7.8.5.tgz#fde4b760d4486cdb6f0cc8e2cbff318af844635c"
+  integrity sha512-JgoahDG51ncUfJu6wX/1vWQEqOflgXyl4MaHqlcSruTez7yhaRKR9i8VjjcQGeS2en/jnFivXuaIMnseMMt0XA==
+  dependencies:
+    d3-array "3"
+    d3-axis "3"
+    d3-brush "3"
+    d3-chord "3"
+    d3-color "3"
+    d3-contour "4"
+    d3-delaunay "6"
+    d3-dispatch "3"
+    d3-drag "3"
+    d3-dsv "3"
+    d3-ease "3"
+    d3-fetch "3"
+    d3-force "3"
+    d3-format "3"
+    d3-geo "3"
+    d3-hierarchy "3"
+    d3-interpolate "3"
+    d3-path "3"
+    d3-polygon "3"
+    d3-quadtree "3"
+    d3-random "3"
+    d3-scale "4"
+    d3-scale-chromatic "3"
+    d3-selection "3"
+    d3-shape "3"
+    d3-time "3"
+    d3-time-format "4"
+    d3-timer "3"
+    d3-transition "3"
+    d3-zoom "3"
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"
@@ -838,6 +1087,13 @@ default-passive-events@^2.0.0:
   resolved "https://registry.npmjs.org/default-passive-events/-/default-passive-events-2.0.0.tgz"
   integrity sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ==
 
+delaunator@5:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-5.0.0.tgz#60f052b28bd91c9b4566850ebf7756efe821d81b"
+  integrity sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==
+  dependencies:
+    robust-predicates "^3.0.0"
+
 delegate@^3.1.2:
   version "3.2.0"
   resolved "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz"
@@ -1243,6 +1499,13 @@ html2canvas@^1.4.1:
     css-line-break "^2.1.0"
     text-segmentation "^1.0.3"
 
+iconv-lite@0.6:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 immutable@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz"
@@ -1261,6 +1524,11 @@ inherits@2:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
+"internmap@1 - 2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/internmap/-/internmap-2.0.3.tgz#6685f23755e43c524e251d29cbc97248e3061009"
+  integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==
+
 is-binary-path@~2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"
@@ -1844,6 +2112,11 @@ reusify@^1.0.4:
   resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
+robust-predicates@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-3.0.2.tgz#d5b28528c4824d20fc48df1928d41d9efa1ad771"
+  integrity sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==
+
 rollup@^2.58.0, rollup@^2.59.0:
   version "2.70.1"
   resolved "https://registry.npmjs.org/rollup/-/rollup-2.70.1.tgz"
@@ -1858,11 +2131,21 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
+rw@1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
+  integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==
+
 safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
+"safer-buffer@>= 2.1.2 < 3.0.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
 sass@^1.49.9:
   version "1.49.9"
   resolved "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz"