From e381544add9bb8c55a8cd0495a1ea449efd96ff6 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Tue, 06 Feb 2024 09:54:50 +0800
Subject: [PATCH] 隐患统计导出自定义多级表头

---
 package-lock.json                                                   |  287 +++++++++++++++++-
 package.json                                                        |    4 
 src/util/Export2Excel.js                                            |  254 ++++++++++++++++
 src/views/publicSecurity/ninePlaceManage/hiddenDangerStatistics.vue |  181 ++++++++++++
 src/util/timeStamp.js                                               |  174 +++++++++++
 5 files changed, 873 insertions(+), 27 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e736bfe..3f20471 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,6 +16,7 @@
         "crypto-js": "^4.0.0",
         "echarts": "^5.4.3",
         "element-ui": "^2.15.6",
+        "file-saver": "^2.0.5",
         "js-base64": "^2.5.1",
         "js-cookie": "^2.2.0",
         "js-md5": "^0.7.3",
@@ -29,7 +30,8 @@
         "vue-cron": "^1.0.9",
         "vue-i18n": "^8.7.0",
         "vue-router": "^3.0.1",
-        "vuex": "^3.1.1"
+        "vuex": "^3.1.1",
+        "xlsx": "^0.16.9"
       },
       "devDependencies": {
         "@vue/cli-plugin-babel": "^3.1.1",
@@ -2163,6 +2165,21 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/adler-32": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/adler-32/-/adler-32-1.2.0.tgz",
+      "integrity": "sha512-/vUqU/UY4MVeFsg+SsK6c+/05RZXIHZMGJA+PX5JyWI0ZRcBpupnRuPLU/NXXoFwMYCPCoxIfElM2eS+DUXCqQ==",
+      "dependencies": {
+        "exit-on-epipe": "~1.0.1",
+        "printj": "~1.1.0"
+      },
+      "bin": {
+        "adler32": "bin/adler32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/ajv": {
       "version": "5.5.2",
       "resolved": "https://registry.npmmirror.com/ajv/-/ajv-5.5.2.tgz",
@@ -3510,6 +3527,26 @@
       "resolved": "https://registry.npmmirror.com/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
     },
+    "node_modules/cfb": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz",
+      "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "crc-32": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/cfb/node_modules/adler-32": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz",
+      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/chai": {
       "version": "4.3.10",
       "resolved": "https://registry.npmmirror.com/chai/-/chai-4.3.10.tgz",
@@ -4036,6 +4073,26 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/codepage": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.14.0.tgz",
+      "integrity": "sha512-iz3zJLhlrg37/gYRWgEPkaFTtzmnEv1h+r7NgZum2lFElYQPi0/5bnmuDfODHxfp0INEfnRqyfyeIJDbb7ahRw==",
+      "dependencies": {
+        "commander": "~2.14.1",
+        "exit-on-epipe": "~1.0.1"
+      },
+      "bin": {
+        "codepage": "bin/codepage.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/codepage/node_modules/commander": {
+      "version": "2.14.1",
+      "resolved": "https://registry.npmmirror.com/commander/-/commander-2.14.1.tgz",
+      "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
+    },
     "node_modules/collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -4485,6 +4542,17 @@
       },
       "engines": {
         "node": ">=4"
+      }
+    },
+    "node_modules/crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "bin": {
+        "crc32": "bin/crc32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
       }
     },
     "node_modules/create-ecdh": {
@@ -5484,11 +5552,7 @@
     },
     "node_modules/echarts": {
       "version": "5.4.3",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.3.tgz",
->>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
       "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
       "dependencies": {
         "tslib": "2.3.0",
@@ -6131,6 +6195,14 @@
         "semver": "bin/semver"
       }
     },
+    "node_modules/exit-on-epipe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
+      "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmmirror.com/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -6493,6 +6565,11 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/fflate": {
+      "version": "0.3.11",
+      "resolved": "https://registry.npmmirror.com/fflate/-/fflate-0.3.11.tgz",
+      "integrity": "sha512-Rr5QlUeGN1mbOHlaqcSYMKVpPbgLy0AWT/W0EHxA6NGI12yO1jpoui2zBBvU2G824ltM6Ut8BFgfHSBGfkmS0A=="
+    },
     "node_modules/figgy-pudding": {
       "version": "3.5.2",
       "resolved": "https://registry.npmmirror.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
@@ -6612,6 +6689,11 @@
       "engines": {
         "node": ">= 4"
       }
+    },
+    "node_modules/file-saver": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
+      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
     },
     "node_modules/file-uri-to-path": {
       "version": "1.0.0",
@@ -6863,6 +6945,14 @@
       "dev": true,
       "engines": {
         "node": ">= 0.6"
+      }
+    },
+    "node_modules/frac": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz",
+      "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
+      "engines": {
+        "node": ">=0.8"
       }
     },
     "node_modules/fragment-cache": {
@@ -11883,6 +11973,17 @@
         "renderkid": "^2.0.4"
       }
     },
+    "node_modules/printj": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/printj/-/printj-1.1.2.tgz",
+      "integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==",
+      "bin": {
+        "printj": "bin/printj.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmmirror.com/process/-/process-0.11.10.tgz",
@@ -13859,6 +13960,17 @@
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
+    "node_modules/ssf": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz",
+      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
+      "dependencies": {
+        "frac": "~1.1.2"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/sshpk": {
       "version": "1.18.0",
       "resolved": "https://registry.npmmirror.com/sshpk/-/sshpk-1.18.0.tgz",
@@ -14961,11 +15073,7 @@
     },
     "node_modules/tslib": {
       "version": "2.3.0",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
->>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
       "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
     },
     "node_modules/tty-browserify": {
@@ -16637,6 +16745,22 @@
         "string-width": "^1.0.2 || 2 || 3 || 4"
       }
     },
+    "node_modules/wmf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz",
+      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/word": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmmirror.com/word/-/word-0.3.0.tgz",
+      "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/word-wrap": {
       "version": "1.2.5",
       "resolved": "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.5.tgz",
@@ -16743,6 +16867,29 @@
       "dev": true,
       "dependencies": {
         "async-limiter": "~1.0.0"
+      }
+    },
+    "node_modules/xlsx": {
+      "version": "0.16.9",
+      "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.16.9.tgz",
+      "integrity": "sha512-gxi1I3EasYvgCX1vN9pGyq920Ron4NO8PNfhuoA3Hpq6Y8f0ECXiy4OLrK4QZBnj1jx3QD+8Fq5YZ/3mPZ5iXw==",
+      "dependencies": {
+        "adler-32": "~1.2.0",
+        "cfb": "^1.1.4",
+        "codepage": "~1.14.0",
+        "commander": "~2.17.1",
+        "crc-32": "~1.2.0",
+        "exit-on-epipe": "~1.0.1",
+        "fflate": "^0.3.8",
+        "ssf": "~0.11.2",
+        "wmf": "~1.0.1",
+        "word": "~0.3.0"
+      },
+      "bin": {
+        "xlsx": "bin/xlsx.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
       }
     },
     "node_modules/xtend": {
@@ -16919,11 +17066,7 @@
     },
     "node_modules/zrender": {
       "version": "5.4.4",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.4.tgz",
->>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
       "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
       "dependencies": {
         "tslib": "2.3.0"
@@ -18564,6 +18707,15 @@
       "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==",
       "dev": true
     },
+    "adler-32": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/adler-32/-/adler-32-1.2.0.tgz",
+      "integrity": "sha512-/vUqU/UY4MVeFsg+SsK6c+/05RZXIHZMGJA+PX5JyWI0ZRcBpupnRuPLU/NXXoFwMYCPCoxIfElM2eS+DUXCqQ==",
+      "requires": {
+        "exit-on-epipe": "~1.0.1",
+        "printj": "~1.1.0"
+      }
+    },
     "ajv": {
       "version": "5.5.2",
       "resolved": "https://registry.npmmirror.com/ajv/-/ajv-5.5.2.tgz",
@@ -19730,6 +19882,22 @@
       "resolved": "https://registry.npmmirror.com/caseless/-/caseless-0.12.0.tgz",
       "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
     },
+    "cfb": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz",
+      "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
+      "requires": {
+        "adler-32": "~1.3.0",
+        "crc-32": "~1.2.0"
+      },
+      "dependencies": {
+        "adler-32": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz",
+          "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A=="
+        }
+      }
+    },
     "chai": {
       "version": "4.3.10",
       "resolved": "https://registry.npmmirror.com/chai/-/chai-4.3.10.tgz",
@@ -20152,6 +20320,22 @@
       "resolved": "https://registry.npmmirror.com/code-point-at/-/code-point-at-1.1.0.tgz",
       "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA=="
     },
+    "codepage": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.14.0.tgz",
+      "integrity": "sha512-iz3zJLhlrg37/gYRWgEPkaFTtzmnEv1h+r7NgZum2lFElYQPi0/5bnmuDfODHxfp0INEfnRqyfyeIJDbb7ahRw==",
+      "requires": {
+        "commander": "~2.14.1",
+        "exit-on-epipe": "~1.0.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.14.1",
+          "resolved": "https://registry.npmmirror.com/commander/-/commander-2.14.1.tgz",
+          "integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw=="
+        }
+      }
+    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -20530,6 +20714,11 @@
         "js-yaml": "^3.13.1",
         "parse-json": "^4.0.0"
       }
+    },
+    "crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ=="
     },
     "create-ecdh": {
       "version": "4.0.4",
@@ -21365,11 +21554,7 @@
     },
     "echarts": {
       "version": "5.4.3",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.3.tgz",
->>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
       "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
       "requires": {
         "tslib": "2.3.0",
@@ -21895,6 +22080,11 @@
         }
       }
     },
+    "exit-on-epipe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz",
+      "integrity": "sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw=="
+    },
     "expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npmmirror.com/expand-brackets/-/expand-brackets-2.1.4.tgz",
@@ -22204,6 +22394,11 @@
         "websocket-driver": ">=0.5.1"
       }
     },
+    "fflate": {
+      "version": "0.3.11",
+      "resolved": "https://registry.npmmirror.com/fflate/-/fflate-0.3.11.tgz",
+      "integrity": "sha512-Rr5QlUeGN1mbOHlaqcSYMKVpPbgLy0AWT/W0EHxA6NGI12yO1jpoui2zBBvU2G824ltM6Ut8BFgfHSBGfkmS0A=="
+    },
     "figgy-pudding": {
       "version": "3.5.2",
       "resolved": "https://registry.npmmirror.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
@@ -22302,6 +22497,11 @@
           }
         }
       }
+    },
+    "file-saver": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
+      "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
     },
     "file-uri-to-path": {
       "version": "1.0.0",
@@ -22515,6 +22715,11 @@
       "resolved": "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz",
       "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true
+    },
+    "frac": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz",
+      "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA=="
     },
     "fragment-cache": {
       "version": "0.2.1",
@@ -26667,6 +26872,11 @@
         "renderkid": "^2.0.4"
       }
     },
+    "printj": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/printj/-/printj-1.1.2.tgz",
+      "integrity": "sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ=="
+    },
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npmmirror.com/process/-/process-0.11.10.tgz",
@@ -28338,6 +28548,14 @@
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true
     },
+    "ssf": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz",
+      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
+      "requires": {
+        "frac": "~1.1.2"
+      }
+    },
     "sshpk": {
       "version": "1.18.0",
       "resolved": "https://registry.npmmirror.com/sshpk/-/sshpk-1.18.0.tgz",
@@ -29257,11 +29475,7 @@
     },
     "tslib": {
       "version": "2.3.0",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
->>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
       "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
     },
     "tty-browserify": {
@@ -30651,6 +30865,16 @@
         "string-width": "^1.0.2 || 2 || 3 || 4"
       }
     },
+    "wmf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz",
+      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw=="
+    },
+    "word": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmmirror.com/word/-/word-0.3.0.tgz",
+      "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA=="
+    },
     "word-wrap": {
       "version": "1.2.5",
       "resolved": "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.5.tgz",
@@ -30738,6 +30962,23 @@
       "dev": true,
       "requires": {
         "async-limiter": "~1.0.0"
+      }
+    },
+    "xlsx": {
+      "version": "0.16.9",
+      "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.16.9.tgz",
+      "integrity": "sha512-gxi1I3EasYvgCX1vN9pGyq920Ron4NO8PNfhuoA3Hpq6Y8f0ECXiy4OLrK4QZBnj1jx3QD+8Fq5YZ/3mPZ5iXw==",
+      "requires": {
+        "adler-32": "~1.2.0",
+        "cfb": "^1.1.4",
+        "codepage": "~1.14.0",
+        "commander": "~2.17.1",
+        "crc-32": "~1.2.0",
+        "exit-on-epipe": "~1.0.1",
+        "fflate": "^0.3.8",
+        "ssf": "~0.11.2",
+        "wmf": "~1.0.1",
+        "word": "~0.3.0"
       }
     },
     "xtend": {
@@ -30881,11 +31122,7 @@
     },
     "zrender": {
       "version": "5.4.4",
-<<<<<<< HEAD
       "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz",
-=======
-      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.4.tgz",
->>>>>>> 7777a40af5210dce0abe07360a48042b1bc8d264
       "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
       "requires": {
         "tslib": "2.3.0"
diff --git a/package.json b/package.json
index de130c1..11f3d20 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "crypto-js": "^4.0.0",
     "echarts": "^5.4.3",
     "element-ui": "^2.15.6",
+    "file-saver": "^2.0.5",
     "js-base64": "^2.5.1",
     "js-cookie": "^2.2.0",
     "js-md5": "^0.7.3",
@@ -32,7 +33,8 @@
     "vue-cron": "^1.0.9",
     "vue-i18n": "^8.7.0",
     "vue-router": "^3.0.1",
-    "vuex": "^3.1.1"
+    "vuex": "^3.1.1",
+    "xlsx": "^0.16.9"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.1.1",
diff --git a/src/util/Export2Excel.js b/src/util/Export2Excel.js
new file mode 100644
index 0000000..3c37637
--- /dev/null
+++ b/src/util/Export2Excel.js
@@ -0,0 +1,254 @@
+/* eslint-disable */
+require('script-loader')
+require('file-saver')
+import XLSX from 'xlsx'
+
+function generateArray (table) {
+    var out = []
+    var rows = table.querySelectorAll('tr')
+    var ranges = []
+    for (var R = 0; R < rows.length; ++R) {
+        var outRow = []
+        var row = rows[R]
+        var columns = row.querySelectorAll('td')
+        for (var C = 0; C < columns.length; ++C) {
+            var cell = columns[C]
+            var colspan = cell.getAttribute('colspan')
+            var rowspan = cell.getAttribute('rowspan')
+            var cellValue = cell.innerText
+            if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue
+
+            //Skip ranges
+            ranges.forEach(function (range) {
+                if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
+                    for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null)
+                }
+            })
+
+            //Handle Row Span
+            if (rowspan || colspan) {
+                rowspan = rowspan || 1
+                colspan = colspan || 1
+                ranges.push({
+                    s: {
+                        r: R,
+                        c: outRow.length
+                    },
+                    e: {
+                        r: R + rowspan - 1,
+                        c: outRow.length + colspan - 1
+                    }
+                })
+            };
+
+            //Handle Value
+            outRow.push(cellValue !== "" ? cellValue : null)
+
+            //Handle Colspan
+            if (colspan)
+                for (var k = 0; k < colspan - 1; ++k) outRow.push(null)
+        }
+        out.push(outRow)
+    }
+    return [out, ranges]
+};
+
+function datenum (v, date1904) {
+    if (date1904) v += 1462
+    var epoch = Date.parse(v)
+    return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000)
+}
+
+function sheet_from_array_of_arrays (data, opts) {
+    var ws = {}
+    var range = {
+        s: {
+            c: 10000000,
+            r: 10000000
+        },
+        e: {
+            c: 0,
+            r: 0
+        }
+    }
+    for (var R = 0; R != data.length; ++R) {
+        for (var C = 0; C != data[R].length; ++C) {
+            if (range.s.r > R) range.s.r = R
+            if (range.s.c > C) range.s.c = C
+            if (range.e.r < R) range.e.r = R
+            if (range.e.c < C) range.e.c = C
+            var cell = {
+                v: data[R][C]
+            }
+            if (cell.v == null) continue
+            var cell_ref = XLSX.utils.encode_cell({
+                c: C,
+                r: R
+            })
+
+            if (typeof cell.v === 'number') cell.t = 'n'
+            else if (typeof cell.v === 'boolean') cell.t = 'b'
+            else if (cell.v instanceof Date) {
+                cell.t = 'n'
+                cell.z = XLSX.SSF._table[14]
+                cell.v = datenum(cell.v)
+            } else cell.t = 's'
+
+            ws[cell_ref] = cell
+        }
+    }
+    if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range)
+    return ws
+}
+
+function Workbook () {
+    if (!(this instanceof Workbook)) return new Workbook()
+    this.SheetNames = []
+    this.Sheets = {}
+}
+
+function s2ab (s) {
+    var buf = new ArrayBuffer(s.length)
+    var view = new Uint8Array(buf)
+    for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF
+    return buf
+}
+
+export function export_table_to_excel (id) {
+    var theTable = document.getElementById(id)
+    var oo = generateArray(theTable)
+    var ranges = oo[1]
+
+    /* original data */
+    var data = oo[0]
+    var ws_name = "SheetJS"
+
+    var wb = new Workbook(),
+        ws = sheet_from_array_of_arrays(data)
+
+    /* add ranges to worksheet */
+    // ws['!cols'] = ['apple', 'banan'];
+    ws['!merges'] = ranges
+
+    /* add worksheet to workbook */
+    wb.SheetNames.push(ws_name)
+    wb.Sheets[ws_name] = ws
+
+    var wbout = XLSX.write(wb, {
+        bookType: 'xlsx',
+        bookSST: false,
+        type: 'binary'
+    })
+
+    saveAs(new Blob([s2ab(wbout)], {
+        type: "application/octet-stream"
+    }), "test.xlsx")
+}
+
+export function export_json_to_excel ({
+    header,
+    data,
+    filename,
+    autoWidth = true,
+    bookType = 'xlsx'
+} = {}) {
+    /* original data */
+    filename = filename || 'excel-list'
+    data = [...data]
+    data.unshift(header)
+    var ws_name = "SheetJS"
+    var wb = new Workbook(),
+        ws = sheet_from_array_of_arrays(data)
+
+    if (autoWidth) {
+        /*设置worksheet每列的最大宽度*/
+        const colWidth = data.map(row => row.map(val => {
+            /*先判断是否为null/undefined*/
+            if (val == null) {
+                return {
+                    'wch': 10
+                }
+            }
+            /*再判断是否为中文*/
+            else if (val.toString().charCodeAt(0) > 255) {
+                return {
+                    'wch': val.toString().length * 2
+                }
+            } else {
+                return {
+                    'wch': val.toString().length
+                }
+            }
+        }))
+        /*以第一行为初始值*/
+        let result = colWidth[0]
+        for (let i = 1; i < colWidth.length; i++) {
+            for (let j = 0; j < colWidth[i].length; j++) {
+                if (result[j]['wch'] < colWidth[i][j]['wch']) {
+                    result[j]['wch'] = colWidth[i][j]['wch']
+                }
+            }
+        }
+        ws['!cols'] = result
+    }
+
+    /* add worksheet to workbook */
+    wb.SheetNames.push(ws_name)
+    wb.Sheets[ws_name] = ws
+
+    var wbout = XLSX.write(wb, {
+        bookType: bookType,
+        bookSST: false,
+        type: 'binary'
+    })
+    saveAs(new Blob([s2ab(wbout)], {
+        type: "application/octet-stream"
+    }), `${filename}.${bookType}`)
+}
+
+export function export_json_to_excels ({
+    headerOne = {},
+    headerTwo = {},
+    headerThree = {},
+    headerFour = {},
+    headerFive = {},
+    data,
+    filename,
+    bookType = 'xlsx',
+    merges
+} = {}) {
+    filename = filename || 'excel-list'
+    data = [...data]
+
+    // 第五行表头
+    JSON.stringify(headerFive) != '{}' && data.unshift(headerFive)
+    // 第四行表头
+    JSON.stringify(headerFour) != '{}' && data.unshift(headerFour)
+    // 第三行表头
+    JSON.stringify(headerThree) != '{}' && data.unshift(headerThree)
+    // 第二行表头
+    JSON.stringify(headerTwo) != '{}' && data.unshift(headerTwo)
+    // 第一行表头
+    JSON.stringify(headerOne) != '{}' && data.unshift(headerOne)
+
+    var ws_name = "SheetJS"
+    var wb = new Workbook(),
+        ws = sheet_from_array_of_arrays(data)
+
+    /* add worksheet to workbook */
+    wb.SheetNames.push(ws_name)
+    wb.Sheets[ws_name] = ws
+
+    ws['!merges'] = merges
+
+
+    var wbout = XLSX.write(wb, {
+        bookType: bookType,
+        bookSST: false,
+        type: 'binary'
+    })
+
+    saveAs(new Blob([s2ab(wbout)], {
+        type: "application/octet-stream"
+    }), `${filename}.${bookType}`)
+}
\ No newline at end of file
diff --git a/src/util/timeStamp.js b/src/util/timeStamp.js
new file mode 100644
index 0000000..92bfecb
--- /dev/null
+++ b/src/util/timeStamp.js
@@ -0,0 +1,174 @@
+
+// 返回年月日
+export const timestampToTime = (timestamp) => {
+    if (!timestamp) return
+    // 时间戳为10位需*1000,时间戳为13位不需乘1000
+    var date = new Date(timestamp)
+    var Y = date.getFullYear() + "-"
+    var M =
+        (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-"
+    var D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate())
+    return Y + M + D
+}
+
+//返回年月日 时分
+export const timestampToMinute = (timestamp) => {
+    if (!timestamp) return
+    // 时间戳为10位需*1000,时间戳为13位不需乘1000
+    var date = new Date(timestamp)
+    var Y = date.getFullYear() + "-"
+    var M =
+        (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-"
+    var D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " "
+    var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ":"
+    var m = (date.getMinutes() < 10
+        ? "0" + (date.getMinutes())
+        : date.getMinutes())
+    var s = (date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds())
+    return Y + M + D + h + m
+}
+
+//返回年月日 时分秒
+export const timestampToHour = (timestamp) => {
+    if (!timestamp) return
+    // 时间戳为10位需*1000,时间戳为13位不需乘1000
+    var date = new Date(timestamp)
+    var Y = date.getFullYear() + "-"
+    var M =
+        (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-"
+    var D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " "
+    var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ":"
+    var m = (date.getMinutes() < 10
+        ? "0" + (date.getMinutes())
+        : date.getMinutes()) + ':'
+    var s = (date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds())
+    return Y + M + D + h + m + s
+}
+//返回年月日时分秒
+export const timeStampTosecond = (timestamp) => {
+    if (!timestamp) return
+    // 时间戳为10位需*1000,时间戳为13位不需乘1000
+    var date = new Date(timestamp)
+    var Y = date.getFullYear() + "-"
+    var M =
+        (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-"
+    var D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " "
+    var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ":"
+    var m = (date.getMinutes() < 10
+        ? "0" + (date.getMinutes())
+        : date.getMinutes()) + ':'
+    var s = (date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds())
+    return Y + M + D + h + "00:00"
+}
+
+export const getTimeBefore = (n = 8) => {
+    const nowStamp = new Date().getTime()
+    const beforeStamp = nowStamp - (n * 60 * 60 * 1000)
+    const nowTime = timeStampTosecond(nowStamp + 60 * 1000 * 60)
+    const beforeTime = timeStampTosecond(beforeStamp)
+    return [beforeTime, nowTime]
+}
+export const Timesecend = (timestamp) => {
+    if (!timestamp) return
+    // 时间戳为10位需*1000,时间戳为13位不需乘1000
+    var date = new Date(timestamp)
+    var Y = date.getFullYear() + "-"
+    var M =
+        (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-"
+    var D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " "
+    var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ":"
+    var m = (date.getMinutes() < 10
+        ? "0" + (date.getMinutes())
+        : date.getMinutes()) + ':'
+    var s = (date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds())
+    return M + D + h + m + s
+}
+
+export const TimeMinute = (timestamp) => {
+    if (!timestamp) return
+    // 时间戳为10位需*1000,时间戳为13位不需乘1000
+    var date = new Date(timestamp)
+    var Y = date.getFullYear() + "-"
+    var M =
+        (date.getMonth() + 1 < 10
+            ? "0" + (date.getMonth() + 1)
+            : date.getMonth() + 1) + "-"
+    var D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " "
+    var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ":"
+    var m = (date.getMinutes() < 10
+        ? "0" + (date.getMinutes())
+        : date.getMinutes())
+    var s = (date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds())
+    return M + D + h + m
+}
+// export const
+
+function timeData (time) {
+    var date
+    if (time) {
+        date = new Date(time)
+    } else {
+        date = new Date()
+    }
+    const Y = date.getFullYear()
+    const M = date.getMonth() + 1
+    const MM = (date.getMonth() + 1 < 10) ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+    const D = date.getDate()
+    const DD = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate())
+    const h = date.getHours()
+    const hh = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours())
+    const m = date.getMinutes()
+    const mm = (date.getMinutes() < 10
+        ? "0" + (date.getMinutes())
+        : date.getMinutes())
+    const s = date.getSeconds()
+    const ss = (date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds())
+    return {
+        Y, M, MM, D, DD, h, hh, m, mm, s, ss
+    }
+}
+
+export const getEightHourTime = (time) => {
+    const { Y, M, MM, DD, D, hh, h, mm, m, ss, s } = timeData(time)
+    const now = `${Y}-${MM}-${DD} ${hh}:00:00`
+    if (h > 8) {
+        const before = `${Y}-${MM}-${DD} 08:00:00`
+        return [before, now]
+    } else {
+        if (D - 1 > 0) {
+            const yesD = (DD - 1 < 10) ? ('0' + DD - 1) : DD - 1
+            const yesterday = `${Y}-${MM}-${yesD} 09:00:00`
+            return [yesterday, now]
+        } else {
+            if (MM - 1 > 0) {
+                const yesMM = (MM - 1 < 10) ? ('0' + MM - 1) : MM - 1
+                const yesDay = new Date(Y, yesMM, 0).getDate()
+                const lastMonDay = `${Y}-${yesMM}-${yesDay} 09:00:00`
+                return [lastMonDay, now]
+            } else {
+                const lastY = Y - 1
+                const lastYDay = `${lastY}-12-31 09:00:00`
+                return [lastYDay, now]
+            }
+        }
+    }
+}
+
+export const get24BeforeTime = (time) => {
+    const { Y, M, MM, DD, D, hh, h, mm, m, ss, s } = timeData(time)
+    const nowHour = `${Y}-${MM}-${DD} ${hh - 0 + 1}:00:00`
+    const date = new Date(nowHour)
+    const { Y: yY, MM: yM, DD: yD, hh: yH, mm: ymm, ss: yss } = timeData(date.setDate(date.getDate() - 1))
+    const yesterDay = `${yY}-${yM}-${yD} ${yH}:00:00`
+    return [yesterDay, nowHour]
+}
diff --git a/src/views/publicSecurity/ninePlaceManage/hiddenDangerStatistics.vue b/src/views/publicSecurity/ninePlaceManage/hiddenDangerStatistics.vue
index d8479eb..bb6261e 100644
--- a/src/views/publicSecurity/ninePlaceManage/hiddenDangerStatistics.vue
+++ b/src/views/publicSecurity/ninePlaceManage/hiddenDangerStatistics.vue
@@ -34,6 +34,8 @@
 import {
     getYHTJList
 } from "@/api/publicSecurity/ninePlaceManage"
+import { export_json_to_excels } from "@/util/Export2Excel"
+import { timestampToTime } from "@/util/timeStamp"
 
 export default {
     data () {
@@ -202,7 +204,184 @@
 
     methods: {
         exportAvue () {
-            this.$refs.crud.rowExcel()
+            this.$confirm("是否导出隐患统计数据?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                // this.$refs.crud.rowExcel() 
+                this.exportBtn()
+            })
+        },
+
+        //json格式化
+        formatJson (filterVal, tableData) {
+            return tableData.map((v) => {
+                return filterVal.map((j) => {
+                    return v[j]
+                })
+            })
+        },
+
+        // 导出
+        exportBtn () {
+            const multiHeader = ["序号", "地区", "小商店", "小旅馆", "小学校(幼儿园、校外培训机构)", "", "", "小医院(诊所、养老院)", "", "", "小网吧", "小餐饮场所", "小歌舞娱乐场所", "小美容洗浴场所", "小生产加工企业", "总数"]//第一行表头
+            const tHeader = ["", "", "", "", "学校", "幼儿园", "校外培训机构", "医院", "诊所", "养老院", "", "", "", "", "", "",]//最后一行的表头
+            const filterVal = [
+                "index",
+                "name",
+                "xsd",
+                "xlg",
+                "xxx",
+                "yey",
+                "xwpxjg",
+                "yy",
+                "zs",
+                "yly",
+                "xwb",
+                "xcycs",
+                "xgwylcs",
+                "xmrxycs",
+                "xscjgqy",
+                "count"
+            ]
+
+            var time = timestampToTime((new Date()).getTime())
+            var filename = '隐患统计' + time
+
+            this.data.forEach((item, index) => {
+                item.index = index + 1
+            })
+            var data = this.formatJson(filterVal, this.data)
+            const merges = [//合并单元格
+                {
+                    s: {//开始单元格
+                        r: 0,//纵轴坐标(1=0,以此类推)
+                        c: 0//横轴坐标(A=0,以此类推)
+                    },
+                    e: {//结束单元格
+                        r: 1,
+                        c: 0
+                    }
+                },
+                {
+                    s: {
+                        r: 0,
+                        c: 1
+                    },
+                    e: {
+                        r: 1,
+                        c: 1
+                    }
+                },
+                {
+                    s: {
+                        r: 0,
+                        c: 2
+                    },
+                    e: {
+                        r: 1,
+                        c: 2
+                    }
+                },
+                {
+                    s: {
+                        r: 0,
+                        c: 3
+                    },
+                    e: {
+                        r: 1,
+                        c: 3
+                    }
+                },
+                {
+                    s: {
+                        r: 0,
+                        c: 4
+                    },
+                    e: {
+                        r: 0,
+                        c: 6
+                    }
+                },
+                {
+                    s: {
+                        r: 0,
+                        c: 7
+                    },
+                    e: {
+                        r: 0,
+                        c: 9
+                    }
+                },
+                {
+                    s: {
+                        r: 0,
+                        c: 10
+                    },
+                    e: {
+                        r: 1,
+                        c: 10
+                    }
+                },
+                {
+                    s: {
+                        r: 0,
+                        c: 11
+                    },
+                    e: {
+                        r: 1,
+                        c: 11
+                    }
+                },
+                {
+                    s: {
+                        r: 0,
+                        c: 12
+                    },
+                    e: {
+                        r: 1,
+                        c: 12
+                    }
+                },
+                {
+                    s: {
+                        r: 0,
+                        c: 13
+                    },
+                    e: {
+                        r: 1,
+                        c: 13
+                    }
+                },
+                {
+                    s: {
+                        r: 0,
+                        c: 14
+                    },
+                    e: {
+                        r: 1,
+                        c: 14
+                    }
+                },
+                {
+                    s: {
+                        r: 0,
+                        c: 15
+                    },
+                    e: {
+                        r: 1,
+                        c: 15
+                    }
+                }
+            ]
+            export_json_to_excels({
+                headerOne: multiHeader,
+                headerTwo: tHeader,
+                merges,
+                data,
+                filename
+            })
         },
 
         getLastMouth (str = '-') {

--
Gitblit v1.9.3