Skip to content

M
muChangApp
Commit b6d31174 authored by aymen.du's avatar aymen.du
Browse files
Options

去掉time临时时间戳

parent e214a495
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 68 deletions
package-lock.json
View file @ b6d31174
...@@ -1549,7 +1549,7 @@ ...@@ -1549,7 +1549,7 @@
}, },
"array-find-index": { "array-find-index": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", "resolved": "http://registry.npm.taobao.org/array-find-index/download/array-find-index-1.0.2.tgz",
"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
"dev": true "dev": true
}, },
...@@ -1680,7 +1680,7 @@ ...@@ -1680,7 +1680,7 @@
}, },
"async-foreach": { "async-foreach": {
"version": "0.1.3", "version": "0.1.3",
"resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", "resolved": "http://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz",
"integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
"dev": true "dev": true
}, },
...@@ -1993,7 +1993,7 @@ ...@@ -1993,7 +1993,7 @@
}, },
"block-stream": { "block-stream": {
"version": "0.0.9", "version": "0.0.9",
"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", "resolved": "http://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz",
"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -2317,13 +2317,13 @@ ...@@ -2317,13 +2317,13 @@
}, },
"camelcase": { "camelcase": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz",
"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
"dev": true "dev": true
}, },
"camelcase-keys": { "camelcase-keys": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "resolved": "http://registry.npm.taobao.org/camelcase-keys/download/camelcase-keys-2.1.0.tgz",
"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -2756,7 +2756,7 @@ ...@@ -2756,7 +2756,7 @@
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "resolved": "http://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz",
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
"dev": true "dev": true
}, },
...@@ -3473,7 +3473,7 @@ ...@@ -3473,7 +3473,7 @@
}, },
"cross-spawn": { "cross-spawn": {
"version": "3.0.1", "version": "3.0.1",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", "resolved": "http://registry.npm.taobao.org/cross-spawn/download/cross-spawn-3.0.1.tgz",
"integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -3534,7 +3534,7 @@ ...@@ -3534,7 +3534,7 @@
}, },
"currently-unhandled": { "currently-unhandled": {
"version": "0.4.1", "version": "0.4.1",
"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", "resolved": "http://registry.npm.taobao.org/currently-unhandled/download/currently-unhandled-0.4.1.tgz",
"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -3722,7 +3722,7 @@ ...@@ -3722,7 +3722,7 @@
}, },
"delegates": { "delegates": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "resolved": "http://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz",
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
"dev": true "dev": true
}, },
...@@ -5323,7 +5323,7 @@ ...@@ -5323,7 +5323,7 @@
}, },
"gauge": { "gauge": {
"version": "2.7.4", "version": "2.7.4",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", "resolved": "http://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz",
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -5360,7 +5360,7 @@ ...@@ -5360,7 +5360,7 @@
}, },
"get-stdin": { "get-stdin": {
"version": "4.0.1", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", "resolved": "http://registry.npm.taobao.org/get-stdin/download/get-stdin-4.0.1.tgz",
"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
"dev": true "dev": true
}, },
...@@ -5543,7 +5543,7 @@ ...@@ -5543,7 +5543,7 @@
}, },
"has-unicode": { "has-unicode": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "resolved": "http://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz",
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
"dev": true "dev": true
}, },
...@@ -5922,13 +5922,13 @@ ...@@ -5922,13 +5922,13 @@
}, },
"in-publish": { "in-publish": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", "resolved": "http://registry.npm.taobao.org/in-publish/download/in-publish-2.0.0.tgz",
"integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=", "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
"dev": true "dev": true
}, },
"indent-string": { "indent-string": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", "resolved": "http://registry.npm.taobao.org/indent-string/download/indent-string-2.1.0.tgz",
"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -6314,7 +6314,7 @@ ...@@ -6314,7 +6314,7 @@
}, },
"is-utf8": { "is-utf8": {
"version": "0.2.1", "version": "0.2.1",
"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", "resolved": "http://registry.npm.taobao.org/is-utf8/download/is-utf8-0.2.1.tgz",
"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
"dev": true "dev": true
}, },
...@@ -6940,7 +6940,7 @@ ...@@ -6940,7 +6940,7 @@
}, },
"load-json-file": { "load-json-file": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "resolved": "http://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz",
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -6953,7 +6953,7 @@ ...@@ -6953,7 +6953,7 @@
"dependencies": { "dependencies": {
"pify": { "pify": {
"version": "2.3.0", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true "dev": true
} }
...@@ -6999,7 +6999,7 @@ ...@@ -6999,7 +6999,7 @@
}, },
"lodash.assign": { "lodash.assign": {
"version": "4.2.0", "version": "4.2.0",
"resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", "resolved": "http://registry.npm.taobao.org/lodash.assign/download/lodash.assign-4.2.0.tgz",
"integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
"dev": true, "dev": true,
"optional": true "optional": true
...@@ -7076,7 +7076,7 @@ ...@@ -7076,7 +7076,7 @@
}, },
"loud-rejection": { "loud-rejection": {
"version": "1.6.0", "version": "1.6.0",
"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", "resolved": "http://registry.npm.taobao.org/loud-rejection/download/loud-rejection-1.6.0.tgz",
"integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -7222,7 +7222,7 @@ ...@@ -7222,7 +7222,7 @@
}, },
"map-obj": { "map-obj": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", "resolved": "http://registry.npm.taobao.org/map-obj/download/map-obj-1.0.1.tgz",
"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
"dev": true "dev": true
}, },
...@@ -7275,7 +7275,7 @@ ...@@ -7275,7 +7275,7 @@
}, },
"meow": { "meow": {
"version": "3.7.0", "version": "3.7.0",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "resolved": "http://registry.npm.taobao.org/meow/download/meow-3.7.0.tgz",
"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -7702,7 +7702,7 @@ ...@@ -7702,7 +7702,7 @@
"dependencies": { "dependencies": {
"semver": { "semver": {
"version": "5.3.0", "version": "5.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.3.0.tgz",
"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
"dev": true "dev": true
} }
...@@ -7783,13 +7783,13 @@ ...@@ -7783,13 +7783,13 @@
"dependencies": { "dependencies": {
"ansi-styles": { "ansi-styles": {
"version": "2.2.1", "version": "2.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", "resolved": "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
"dev": true "dev": true
}, },
"chalk": { "chalk": {
"version": "1.1.3", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -7802,7 +7802,7 @@ ...@@ -7802,7 +7802,7 @@
}, },
"supports-color": { "supports-color": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
"dev": true "dev": true
} }
...@@ -7810,7 +7810,7 @@ ...@@ -7810,7 +7810,7 @@
}, },
"nopt": { "nopt": {
"version": "3.0.6", "version": "3.0.6",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", "resolved": "http://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz",
"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -8116,7 +8116,7 @@ ...@@ -8116,7 +8116,7 @@
}, },
"os-locale": { "os-locale": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "resolved": "http://registry.npm.taobao.org/os-locale/download/os-locale-1.4.0.tgz",
"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -8926,7 +8926,7 @@ ...@@ -8926,7 +8926,7 @@
}, },
"read-pkg": { "read-pkg": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", "resolved": "http://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz",
"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -8937,7 +8937,7 @@ ...@@ -8937,7 +8937,7 @@
"dependencies": { "dependencies": {
"path-type": { "path-type": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", "resolved": "http://registry.npm.taobao.org/path-type/download/path-type-1.1.0.tgz",
"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -8948,7 +8948,7 @@ ...@@ -8948,7 +8948,7 @@
}, },
"pify": { "pify": {
"version": "2.3.0", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true "dev": true
} }
...@@ -8956,7 +8956,7 @@ ...@@ -8956,7 +8956,7 @@
}, },
"read-pkg-up": { "read-pkg-up": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", "resolved": "http://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-1.0.1.tgz",
"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -8966,7 +8966,7 @@ ...@@ -8966,7 +8966,7 @@
"dependencies": { "dependencies": {
"find-up": { "find-up": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", "resolved": "http://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz",
"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -8976,7 +8976,7 @@ ...@@ -8976,7 +8976,7 @@
}, },
"path-exists": { "path-exists": {
"version": "2.1.0", "version": "2.1.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", "resolved": "http://registry.npm.taobao.org/path-exists/download/path-exists-2.1.0.tgz",
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9021,7 +9021,7 @@ ...@@ -9021,7 +9021,7 @@
}, },
"redent": { "redent": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", "resolved": "http://registry.npm.taobao.org/redent/download/redent-1.0.0.tgz",
"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9299,7 +9299,7 @@ ...@@ -9299,7 +9299,7 @@
}, },
"sass-graph": { "sass-graph": {
"version": "2.2.4", "version": "2.2.4",
"resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", "resolved": "http://registry.npm.taobao.org/sass-graph/download/sass-graph-2.2.4.tgz",
"integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9351,7 +9351,7 @@ ...@@ -9351,7 +9351,7 @@
}, },
"scss-tokenizer": { "scss-tokenizer": {
"version": "0.2.3", "version": "0.2.3",
"resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", "resolved": "http://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz",
"integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9361,7 +9361,7 @@ ...@@ -9361,7 +9361,7 @@
"dependencies": { "dependencies": {
"source-map": { "source-map": {
"version": "0.4.4", "version": "0.4.4",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz?cache=0&other_urls=http%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map%2Fdownload%2Fsource-map-0.4.4.tgz",
"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -9520,7 +9520,7 @@ ...@@ -9520,7 +9520,7 @@
"dependencies": { "dependencies": {
"extend-shallow": { "extend-shallow": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "resolved": "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -10270,7 +10270,7 @@ ...@@ -10270,7 +10270,7 @@
}, },
"strip-bom": { "strip-bom": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", "resolved": "http://registry.npm.taobao.org/strip-bom/download/strip-bom-2.0.0.tgz",
"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -10285,7 +10285,7 @@ ...@@ -10285,7 +10285,7 @@
}, },
"strip-indent": { "strip-indent": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", "resolved": "http://registry.npm.taobao.org/strip-indent/download/strip-indent-1.0.1.tgz",
"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -10718,7 +10718,7 @@ ...@@ -10718,7 +10718,7 @@
}, },
"trim-newlines": { "trim-newlines": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", "resolved": "http://registry.npm.taobao.org/trim-newlines/download/trim-newlines-1.0.0.tgz",
"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
"dev": true "dev": true
}, },
...@@ -11612,7 +11612,7 @@ ...@@ -11612,7 +11612,7 @@
}, },
"which-module": { "which-module": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", "resolved": "http://registry.npm.taobao.org/which-module/download/which-module-1.0.0.tgz",
"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
"dev": true "dev": true
}, },
...@@ -11720,7 +11720,7 @@ ...@@ -11720,7 +11720,7 @@
}, },
"yargs": { "yargs": {
"version": "7.1.0", "version": "7.1.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", "resolved": "http://registry.npm.taobao.org/yargs/download/yargs-7.1.0.tgz",
"integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -11741,13 +11741,13 @@ ...@@ -11741,13 +11741,13 @@
"dependencies": { "dependencies": {
"camelcase": { "camelcase": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz",
"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
"dev": true "dev": true
}, },
"y18n": { "y18n": {
"version": "3.2.1", "version": "3.2.1",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", "resolved": "http://registry.npm.taobao.org/y18n/download/y18n-3.2.1.tgz",
"integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
"dev": true "dev": true
} }
...@@ -11755,7 +11755,7 @@ ...@@ -11755,7 +11755,7 @@
}, },
"yargs-parser": { "yargs-parser": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", "resolved": "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-5.0.0.tgz",
"integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
"dev": true, "dev": true,
"requires": { "requires": {
...@@ -11764,7 +11764,7 @@ ...@@ -11764,7 +11764,7 @@
"dependencies": { "dependencies": {
"camelcase": { "camelcase": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz",
"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
"dev": true "dev": true
} }
......
src/app/envCtrl/env-detail/env-detail.page.ts
View file @ b6d31174
...@@ -36,11 +36,11 @@ export class EnvDetailPage implements OnInit { ...@@ -36,11 +36,11 @@ export class EnvDetailPage implements OnInit {
}; };
ngOnInit() { ngOnInit() {
console.log('+ogOnInit'); // console.log('+ogOnInit');
this.comm.isLoading = false; this.comm.isLoading = false;
this.comm.remain = 0; this.comm.remain = 0;
this.ac.queryParams.subscribe((data) => { this.ac.queryParams.subscribe((data) => {
console.log(data); // console.log(data);
if(data.no) if(data.no)
{ {
this.fieldRegionNo = data.no; this.fieldRegionNo = data.no;
...@@ -48,7 +48,7 @@ export class EnvDetailPage implements OnInit { ...@@ -48,7 +48,7 @@ export class EnvDetailPage implements OnInit {
this.fieldRegionGroup = data.group; this.fieldRegionGroup = data.group;
} }
}); });
console.log('-ogOnInit'); // console.log('-ogOnInit');
} }
} }
src/app/envCtrl/env-home/env-home.page.html
View file @ b6d31174
...@@ -12,14 +12,12 @@ ...@@ -12,14 +12,12 @@
<ion-button slot="start" size ="small" color="light" (click)="goTo()">Home</ion-button> <ion-button slot="start" size ="small" color="light" (click)="goTo()">Home</ion-button>
<ion-searchbar></ion-searchbar> <ion-searchbar></ion-searchbar>
</ion-toolbar> </ion-toolbar>
<ion-slides mode="ios" style="width: 100%;height: 125px;" <!--<ion-slides mode="ios"-->
[options]="lunbo" (ionSlideTouchEnd)="slideDidChange()"> <!--[options]="lunbo" (ionSlideTouchEnd)="slideDidChange()">-->
<ion-slide class="slideCon" *ngFor="let one of imgs"> <!--<ion-slide class="slideCon" *ngFor="let one of imgs">-->
<div> <!--<img [src]="'../../../assets/lunbo/' + one">-->
<img [src]="'../../../assets/lunbo/' + one"> <!--</ion-slide>-->
</div> <!--</ion-slides>-->
</ion-slide>
</ion-slides>
</ion-header> </ion-header>
<ion-content color='light'> <ion-content color='light'>
...@@ -60,7 +58,7 @@ ...@@ -60,7 +58,7 @@
<!--<div class="block1" *ngIf="item.yewei || item.yewei === 0">池体液位: &nbsp;&nbsp;{{item.yewei}} m</div>--> <!--<div class="block1" *ngIf="item.yewei || item.yewei === 0">池体液位: &nbsp;&nbsp;{{item.yewei}} m</div>-->
<!--<div class="block2" *ngIf="item.temp || item.temp === 0">液体温度: &nbsp;&nbsp;{{item.temp}} ℃</div>--> <!--<div class="block2" *ngIf="item.temp || item.temp === 0">液体温度: &nbsp;&nbsp;{{item.temp}} ℃</div>-->
<!--<div class="block2">运行状态: &nbsp;&nbsp;{{item.state ? '工作中' : '未运行'}} </div>--> <!--<div class="block2">运行状态: &nbsp;&nbsp;{{item.state ? '工作中' : '未运行'}} </div>-->
<span class="right">{{item.time | date: 'yyyy-MM-dd HH:mm:ss'}}</span> <!--<span class="right">{{item.time | date: 'yyyy-MM-dd HH:mm:ss'}}</span>-->
</div> </div>
</div> </div>
</ion-item> </ion-item>
......
src/app/envCtrl/env-home/env-home.page.ts
View file @ b6d31174
...@@ -78,7 +78,7 @@ export class EnvHomePage implements OnInit { ...@@ -78,7 +78,7 @@ export class EnvHomePage implements OnInit {
temp : '23.5', temp : '23.5',
humi : '82', humi : '82',
thi: '轻', thi: '轻',
time : '2019-08-05 23:44', time : '1566378129',
online : true, online : true,
remoteMode: true, //true 平控 false 现控 remoteMode: true, //true 平控 false 现控
wokeMode: 1, //0 手控 1 自控 2 智控 wokeMode: 1, //0 手控 1 自控 2 智控
...@@ -90,7 +90,7 @@ export class EnvHomePage implements OnInit { ...@@ -90,7 +90,7 @@ export class EnvHomePage implements OnInit {
temp : '23.5', temp : '23.5',
humi : '82', humi : '82',
thi: '轻', thi: '轻',
time : '2019-08-05 23:44', time : '1566378129',
online : true, online : true,
remoteMode: true, //true 平控 false 现控 remoteMode: true, //true 平控 false 现控
wokeMode: 1, //0 手控 1 自控 2 智控 wokeMode: 1, //0 手控 1 自控 2 智控
...@@ -102,7 +102,7 @@ export class EnvHomePage implements OnInit { ...@@ -102,7 +102,7 @@ export class EnvHomePage implements OnInit {
temp : '23.5', temp : '23.5',
humi : '82', humi : '82',
thi: '轻', thi: '轻',
time : '2019-08-05 23:44', time : '2019-08-05 23:44:21',
online : true, online : true,
remoteMode: true, //true 平控 false 现控 remoteMode: true, //true 平控 false 现控
wokeMode: 1, //0 手控 1 自控 2 智控 wokeMode: 1, //0 手控 1 自控 2 智控
...@@ -114,7 +114,7 @@ export class EnvHomePage implements OnInit { ...@@ -114,7 +114,7 @@ export class EnvHomePage implements OnInit {
temp : '23.5', temp : '23.5',
humi : '82', humi : '82',
thi: '轻', thi: '轻',
time : '2019-08-05 23:44', time : '1566378129',
online : true, online : true,
remoteMode: true, //true 平控 false 现控 remoteMode: true, //true 平控 false 现控
wokeMode: 1, //0 手控 1 自控 2 智控 wokeMode: 1, //0 手控 1 自控 2 智控
...@@ -178,13 +178,14 @@ export class EnvHomePage implements OnInit { ...@@ -178,13 +178,14 @@ export class EnvHomePage implements OnInit {
// } // }
toControl(one) { toControl(one) {
const query = '/env-detail?name=' + one.name + '&no=' + one.no + '&group=' + one.group; // const query = '/env-detail?name=' + one.name + '&no=' + one.no + '&group=' + one.group;
// this.tf.transfer({ // this.tf.transfer({
// url: '/' + one.url, // url: '/' + one.url,
// query: query, // query: query,
// hash: '' // hash: ''
// }); // });
console.log(query); // console.log(query);
const query = '/env-detail?name=1213';
this.nav.navigateForward(query); this.nav.navigateForward(query);
//this.nav.navigateRoot(one.url + query); //this.nav.navigateRoot(one.url + query);
} }
...@@ -204,10 +205,10 @@ export class EnvHomePage implements OnInit { ...@@ -204,10 +205,10 @@ export class EnvHomePage implements OnInit {
} }
goTo(){ goTo(){
console.log('+goTo'); // console.log('+goTo');
const query = '/index'; const query = '/index';
this.nav.navigateRoot(query); this.nav.navigateRoot(query);
console.log('-goTo'); // console.log('-goTo');
} }
} }
src/app/envCtrl/tabs/tabs.page.ts
View file @ b6d31174
...@@ -16,7 +16,7 @@ export class TabsPage implements OnInit { ...@@ -16,7 +16,7 @@ export class TabsPage implements OnInit {
ngOnInit() { ngOnInit() {
this.router.events.subscribe(e => { this.router.events.subscribe(e => {
if (e instanceof ActivationStart && e.snapshot.outlet === "administration") if (e instanceof ActivationStart && e.snapshot.outlet === 'tabs')
console.log('DDEDEDEEEEEEEEEDDDDDDDDDDDDDDDDD'); console.log('DDEDEDEEEEEEEEEDDDDDDDDDDDDDDDDD');
this.outlet.deactivate(); this.outlet.deactivate();
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment