Jelajahi Sumber

update---hk

lsc 1 tahun lalu
induk
melakukan
e661bda2bd

File diff ditekan karena terlalu besar
+ 0 - 0
dist/192f4d53f95f0bee4cd8.worker.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/192f4d53f95f0bee4cd8.worker.js.map


+ 1 - 5
dist/index.html

@@ -18,11 +18,7 @@
       border-radius: 10px;
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       background-color: rgba(0, 0, 0, 0.1);
-<<<<<<< HEAD
-    }</style><link href=./static/css/app.f76a570cf5ca2e9be3b6eed087db839a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b7d92c364d571dacc1fa.js></script><script type=text/javascript src=./static/js/app.cab800a8006482e9ad7b.js></script></body></html><script>function stopSafari() {
-=======
-    }</style><link href=./static/css/app.6c01620354d13a3a5f234b501b64b416.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9620f608e27ed45c9681.js></script><script type=text/javascript src=./static/js/app.98b41f3a40ae68a9bf47.js></script></body></html><script>function stopSafari() {
->>>>>>> beta
+    }</style><link href=./static/css/app.83d104f2ca00ed6b3342a6445b3122fe.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.bff2d2510dce71ef7550.js></script><script type=text/javascript src=./static/js/app.6dea7685ed7a249f011d.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.83d104f2ca00ed6b3342a6445b3122fe.css


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.83d104f2ca00ed6b3342a6445b3122fe.css.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.f76a570cf5ca2e9be3b6eed087db839a.css


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/css/app.f76a570cf5ca2e9be3b6eed087db839a.css.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.6dea7685ed7a249f011d.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.6dea7685ed7a249f011d.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.98b41f3a40ae68a9bf47.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.cab800a8006482e9ad7b.js


File diff ditekan karena terlalu besar
+ 0 - 1
dist/static/js/app.cab800a8006482e9ad7b.js.map


File diff ditekan karena terlalu besar
+ 0 - 1
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


File diff ditekan karena terlalu besar
+ 0 - 1
dist/static/js/vendor.9620f608e27ed45c9681.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/vendor.b7d92c364d571dacc1fa.js


File diff ditekan karena terlalu besar
+ 0 - 1
dist/static/js/vendor.b7d92c364d571dacc1fa.js.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/vendor.bff2d2510dce71ef7550.js


File diff ditekan karena terlalu besar
+ 0 - 1
dist/static/js/vendor.bff2d2510dce71ef7550.js.map


File diff ditekan karena terlalu besar
+ 7129 - 7331
package-lock.json


+ 1 - 93
package.json

@@ -5,98 +5,6 @@
   "author": "lsc <1249685148@qq.com>",
   "private": true,
   "scripts": {
-<<<<<<< HEAD
-      "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 0.0.0.0",
-      "start": "npm run dev",
-      "e2e": "node test/e2e/runner.js",
-      "test": "npm run e2e",
-      "build": "node build/build.js"
-  },
-  "dependencies": {
-      "axios": "^0.21.3",
-      "big.js": "^6.2.1",
-      "dayjs": "^1.11.7",
-      "echarts": "^5.2.2",
-      "element-ui": "^2.15.6",
-      "file-saver": "^2.0.5",
-      "gantt-elastic": "^1.0.12",
-      "hevue-img-preview": "^5.0.3",
-      "html-docx-js": "^0.3.1",
-      "html2canvas": "^1.4.1",
-      "image-conversion": "^2.1.1",
-      "js-audio-recorder": "^1.0.7",
-      "jsmind": "^0.4.8",
-      "lamejs": "^1.2.1",
-      "pdfjs-dist": "^2.5.207",
-      "pdfvuer": "^1.7.5",
-      "qrcodejs2": "^0.0.2",
-      "recordrtc": "^5.6.2",
-      "relation-graph": "^2.0.26",
-      "vue": "^2.5.2",
-      "vue-cookies": "^1.7.4",
-      "vue-jsmind": "^1.5.0",
-      "vue-pdf": "^4.2.0",
-      "vue-router": "^3.0.1",
-      "vue-video-player": "^5.0.2",
-      "vuex": "^3.6.2",
-      "wangeditor": "^4.7.15",
-      "worker-loader": "^2.0.0"
-  },
-  "devDependencies": {
-      "@babel/core": "^7.19.6",
-      "@babel/preset-env": "^7.19.4",
-      "autoprefixer": "^7.1.2",
-      "babel-core": "^6.22.1",
-      "babel-helper-vue-jsx-merge-props": "^2.0.3",
-      "babel-loader": "^7.1.5",
-      "babel-plugin-syntax-jsx": "^6.18.0",
-      "babel-plugin-transform-runtime": "^6.23.0",
-      "babel-plugin-transform-vue-jsx": "^3.5.0",
-      "babel-preset-env": "^1.3.2",
-      "babel-preset-stage-2": "^6.22.0",
-      "babel-register": "^6.22.0",
-      "chalk": "^2.4.2",
-      "chromedriver": "^2.27.2",
-      "copy-webpack-plugin": "^4.0.1",
-      "cross-spawn": "^5.0.1",
-      "css-loader": "^0.28.0",
-      "extract-text-webpack-plugin": "^3.0.0",
-      "file-loader": "^1.1.4",
-      "friendly-errors-webpack-plugin": "^1.6.1",
-      "html-webpack-plugin": "^2.30.1",
-      "nightwatch": "^0.9.12",
-      "node-notifier": "^5.1.2",
-      "optimize-css-assets-webpack-plugin": "^3.2.0",
-      "ora": "^1.2.0",
-      "portfinder": "^1.0.13",
-      "postcss-import": "^11.0.0",
-      "postcss-loader": "^2.0.8",
-      "postcss-url": "^7.2.1",
-      "rimraf": "^2.6.0",
-      "selenium-server": "^3.0.1",
-      "semver": "^5.3.0",
-      "shelljs": "^0.7.6",
-      "uglifyjs-webpack-plugin": "^1.1.1",
-      "url-loader": "^0.5.8",
-      "vue-loader": "^13.3.0",
-      "vue-style-loader": "^3.0.1",
-      "vue-template-compiler": "^2.5.2",
-      "webpack": "^3.6.0",
-      "webpack-bundle-analyzer": "^2.9.0",
-      "webpack-dev-server": "^2.9.1",
-      "webpack-merge": "^4.1.0"
-  },
-  "engines": {
-      "node": ">= 6.0.0",
-      "npm": ">= 3.0.0"
-  },
-  "browserslist": [
-      "> 1%",
-      "last 2 versions",
-      "not ie <= 8"
-  ]
-}
-=======
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js --host 0.0.0.0",
     "start": "npm run dev",
     "e2e": "node test/e2e/runner.js",
@@ -119,6 +27,7 @@
     "jsmind": "^0.4.8",
     "jszip": "^3.10.1",
     "lamejs": "^1.2.1",
+    "language-hk-loader": "^1.0.1",
     "pdfjs-dist": "^2.5.207",
     "pdfvuer": "^1.7.5",
     "qrcodejs2": "^0.0.2",
@@ -188,4 +97,3 @@
     "not ie <= 8"
   ]
 }
->>>>>>> beta

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini