Skip to content

M
muChangApp
Commit dda81506 authored by frank's avatar frank 🏀
Browse files
Options

增加了三级路由 

修正了在线的点亮暗的bug
parent 00be34d3
Hide whitespace changes
Inline Side-by-side
Showing with 490 additions and 177 deletions
package-lock.json
View file @ dda81506
......@@ -101,6 +101,62 @@
"json-schema-traverse": "^0.4.1",
"uri-js": "^4.2.2"
}
},
"ansi-styles": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
"dev": true,
"optional": true
},
"chalk": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^2.2.1",
"escape-string-regexp": "^1.0.2",
"has-ansi": "^2.0.0",
"strip-ansi": "^3.0.0",
"supports-color": "^2.0.0"
}
},
"node-sass": {
"version": "4.11.0",
"resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
"integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
"dev": true,
"optional": true,
"requires": {
"async-foreach": "^0.1.3",
"chalk": "^1.1.1",
"cross-spawn": "^3.0.0",
"gaze": "^1.0.0",
"get-stdin": "^4.0.1",
"glob": "^7.0.3",
"in-publish": "^2.0.0",
"lodash.assign": "^4.2.0",
"lodash.clonedeep": "^4.3.2",
"lodash.mergewith": "^4.6.0",
"meow": "^3.7.0",
"mkdirp": "^0.5.1",
"nan": "^2.10.0",
"node-gyp": "^3.8.0",
"npmlog": "^4.0.0",
"request": "^2.88.0",
"sass-graph": "^2.2.4",
"stdout-stream": "^1.4.0",
"true-case-path": "^1.0.2"
}
},
"supports-color": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
"dev": true,
"optional": true
}
}
},
......@@ -830,11 +886,11 @@
}
},
"@ionic/angular": {
"version": "4.3.0",
"resolved": "http://registry.npm.taobao.org/@ionic/angular/download/@ionic/angular-4.3.0.tgz",
"integrity": "sha1-Z4QWyofOBXNg2DgubTk5w2VdXXU=",
"version": "4.7.1",
"resolved": "https://registry.npmjs.org/@ionic/angular/-/angular-4.7.1.tgz",
"integrity": "sha512-DNsRSTAYT3A8NQN2wLLN6+VNVqNRqPTTJ0UAysFK9W8oX2pD4SUJfpvVJKLAHPsHbnyxQWY0EG/QlNXdLzU6jg==",
"requires": {
"@ionic/core": "4.3.0",
"@ionic/core": "4.7.1",
"tslib": "^1.9.3"
}
},
......@@ -858,11 +914,19 @@
}
},
"@ionic/core": {
"version": "4.3.0",
"resolved": "http://registry.npm.taobao.org/@ionic/core/download/@ionic/core-4.3.0.tgz",
"integrity": "sha1-WXzfpBVwAo+6qn6VPHFnp7+4cuE=",
"version": "4.7.1",
"resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.7.1.tgz",
"integrity": "sha512-S7VP1Exh3kt2+GWgumY11HaPv7Wr6Z+lr13AKTcznOd8L6xsvzbxgxCMLEtJ/Kjno1q3a4usK9voojwEcbhigQ==",
"requires": {
"ionicons": "4.5.6"
"ionicons": "^4.6.2",
"tslib": "^1.10.0"
},
"dependencies": {
"tslib": {
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
"integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
}
}
},
"@ngtools/webpack": {
......@@ -1277,10 +1341,9 @@
},
"abbrev": {
"version": "1.1.1",
"resolved": "http://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz",
"integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=",
"dev": true,
"optional": true
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
"dev": true
},
"accepts": {
"version": "1.3.5",
......@@ -1438,8 +1501,8 @@
},
"are-we-there-yet": {
"version": "1.1.5",
"resolved": "http://registry.npm.taobao.org/are-we-there-yet/download/are-we-there-yet-1.1.5.tgz",
"integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
"dev": true,
"requires": {
"delegates": "^1.0.0",
......@@ -1481,10 +1544,9 @@
},
"array-find-index": {
"version": "1.0.2",
"resolved": "http://registry.npm.taobao.org/array-find-index/download/array-find-index-1.0.2.tgz",
"resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
"dev": true,
"optional": true
"dev": true
},
"array-flatten": {
"version": "2.1.2",
......@@ -1613,10 +1675,9 @@
},
"async-foreach": {
"version": "0.1.3",
"resolved": "http://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz",
"resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
"integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
"dev": true,
"optional": true
"dev": true
},
"async-limiter": {
"version": "1.0.0",
......@@ -1927,10 +1988,9 @@
},
"block-stream": {
"version": "0.0.9",
"resolved": "http://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz",
"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
"dev": true,
"optional": true,
"requires": {
"inherits": "~2.0.0"
}
......@@ -2252,17 +2312,15 @@
},
"camelcase": {
"version": "2.1.1",
"resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
"integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
"dev": true,
"optional": true
"dev": true
},
"camelcase-keys": {
"version": "2.1.0",
"resolved": "http://registry.npm.taobao.org/camelcase-keys/download/camelcase-keys-2.1.0.tgz",
"resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
"dev": true,
"optional": true,
"requires": {
"camelcase": "^2.0.0",
"map-obj": "^1.0.0"
......@@ -2693,7 +2751,7 @@
},
"console-control-strings": {
"version": "1.1.0",
"resolved": "http://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz",
"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
"dev": true
},
......@@ -3410,10 +3468,9 @@
},
"cross-spawn": {
"version": "3.0.1",
"resolved": "http://registry.npm.taobao.org/cross-spawn/download/cross-spawn-3.0.1.tgz",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
"integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
"dev": true,
"optional": true,
"requires": {
"lru-cache": "^4.0.1",
"which": "^1.2.9"
......@@ -3472,10 +3529,9 @@
},
"currently-unhandled": {
"version": "0.4.1",
"resolved": "http://registry.npm.taobao.org/currently-unhandled/download/currently-unhandled-0.4.1.tgz",
"resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
"dev": true,
"optional": true,
"requires": {
"array-find-index": "^1.0.1"
}
......@@ -3661,7 +3717,7 @@
},
"delegates": {
"version": "1.0.0",
"resolved": "http://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz",
"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
"dev": true
},
......@@ -4712,7 +4768,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"aproba": {
"version": "1.2.0",
......@@ -4733,12 +4790,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -4753,17 +4812,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -4880,7 +4942,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
......@@ -4892,6 +4955,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -4906,6 +4970,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -4913,12 +4978,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -4937,6 +5004,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -5017,7 +5085,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
......@@ -5029,6 +5098,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -5114,7 +5184,8 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"safer-buffer": {
"version": "2.1.2",
......@@ -5150,6 +5221,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......@@ -5169,6 +5241,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
......@@ -5212,19 +5285,21 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
}
}
},
"fstream": {
"version": "1.0.11",
"resolved": "http://registry.npm.taobao.org/fstream/download/fstream-1.0.11.tgz",
"integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
"version": "1.0.12",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
"integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
"dev": true,
"requires": {
"graceful-fs": "^4.1.2",
......@@ -5235,7 +5310,7 @@
},
"gauge": {
"version": "2.7.4",
"resolved": "http://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
"dev": true,
"requires": {
......@@ -5251,10 +5326,9 @@
},
"gaze": {
"version": "1.1.3",
"resolved": "http://registry.npm.taobao.org/gaze/download/gaze-1.1.3.tgz",
"integrity": "sha1-xEFzPhO5J6yMD/C0w7Az8ogSkko=",
"resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
"dev": true,
"optional": true,
"requires": {
"globule": "^1.0.0"
}
......@@ -5273,7 +5347,7 @@
},
"get-stdin": {
"version": "4.0.1",
"resolved": "http://registry.npm.taobao.org/get-stdin/download/get-stdin-4.0.1.tgz",
"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
"integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
"dev": true
},
......@@ -5359,10 +5433,9 @@
},
"globule": {
"version": "1.2.1",
"resolved": "http://registry.npm.taobao.org/globule/download/globule-1.2.1.tgz",
"integrity": "sha1-Xf+xsZHyLSB5epNptJ6rTpg5aW0=",
"resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
"integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
"dev": true,
"optional": true,
"requires": {
"glob": "~7.1.1",
"lodash": "~4.17.10",
......@@ -5457,7 +5530,7 @@
},
"has-unicode": {
"version": "2.0.1",
"resolved": "http://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz",
"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
"dev": true
},
......@@ -5836,17 +5909,15 @@
},
"in-publish": {
"version": "2.0.0",
"resolved": "http://registry.npm.taobao.org/in-publish/download/in-publish-2.0.0.tgz",
"resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
"integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
"dev": true,
"optional": true
"dev": true
},
"indent-string": {
"version": "2.1.0",
"resolved": "http://registry.npm.taobao.org/indent-string/download/indent-string-2.1.0.tgz",
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
"dev": true,
"optional": true,
"requires": {
"repeating": "^2.0.0"
}
......@@ -5982,9 +6053,9 @@
"dev": true
},
"ionicons": {
"version": "4.5.6",
"resolved": "http://registry.npm.taobao.org/ionicons/download/ionicons-4.5.6.tgz",
"integrity": "sha1-87XSRG5+GzDmfdzR/FYycazGDzw="
"version": "4.6.2",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-4.6.2.tgz",
"integrity": "sha512-OGQO/GCKFwHh5lX9wYzgfLjuj2rnQavixVgK3iv8nm7tcgYQVHw7MNNwNHY4H97ZlKiVx3qj4X5Txv9fx95oBw=="
},
"ip": {
"version": "1.1.5",
......@@ -6230,7 +6301,7 @@
},
"is-utf8": {
"version": "0.2.1",
"resolved": "http://registry.npm.taobao.org/is-utf8/download/is-utf8-0.2.1.tgz",
"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
"dev": true
},
......@@ -6572,10 +6643,9 @@
},
"js-base64": {
"version": "2.5.1",
"resolved": "http://registry.npm.taobao.org/js-base64/download/js-base64-2.5.1.tgz?cache=0&other_urls=http%3A%2F%2Fregistry.npm.taobao.org%2Fjs-base64%2Fdownload%2Fjs-base64-2.5.1.tgz",
"integrity": "sha1-Hvo57yxfeYC7F4St5KivLeMpESE=",
"dev": true,
"optional": true
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
"integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==",
"dev": true
},
"js-tokens": {
"version": "3.0.2",
......@@ -6857,7 +6927,7 @@
},
"load-json-file": {
"version": "1.1.0",
"resolved": "http://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"dev": true,
"requires": {
......@@ -6870,7 +6940,7 @@
"dependencies": {
"pify": {
"version": "2.3.0",
"resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true
}
......@@ -6916,7 +6986,7 @@
},
"lodash.assign": {
"version": "4.2.0",
"resolved": "http://registry.npm.taobao.org/lodash.assign/download/lodash.assign-4.2.0.tgz",
"resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
"integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
"dev": true,
"optional": true
......@@ -6934,9 +7004,9 @@
"dev": true
},
"lodash.mergewith": {
"version": "4.6.1",
"resolved": "http://registry.npm.taobao.org/lodash.mergewith/download/lodash.mergewith-4.6.1.tgz",
"integrity": "sha1-Y5BX5ybDr72z59QnQcqo1uQzWSc=",
"version": "4.6.2",
"resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
"integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
"dev": true,
"optional": true
},
......@@ -6993,10 +7063,9 @@
},
"loud-rejection": {
"version": "1.6.0",
"resolved": "http://registry.npm.taobao.org/loud-rejection/download/loud-rejection-1.6.0.tgz",
"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
"integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
"dev": true,
"optional": true,
"requires": {
"currently-unhandled": "^0.4.1",
"signal-exit": "^3.0.0"
......@@ -7140,7 +7209,7 @@
},
"map-obj": {
"version": "1.0.1",
"resolved": "http://registry.npm.taobao.org/map-obj/download/map-obj-1.0.1.tgz",
"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
"dev": true
},
......@@ -7193,10 +7262,9 @@
},
"meow": {
"version": "3.7.0",
"resolved": "http://registry.npm.taobao.org/meow/download/meow-3.7.0.tgz",
"resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
"dev": true,
"optional": true,
"requires": {
"camelcase-keys": "^2.0.0",
"decamelize": "^1.1.2",
......@@ -7508,8 +7576,7 @@
"version": "2.13.2",
"resolved": "http://registry.npm.taobao.org/nan/download/nan-2.13.2.tgz",
"integrity": "sha1-9R3Hrma6fV1V4ebU2AkugCya7+c=",
"dev": true,
"optional": true
"dev": true
},
"nanomatch": {
"version": "1.2.13",
......@@ -7594,10 +7661,9 @@
},
"node-gyp": {
"version": "3.8.0",
"resolved": "http://registry.npm.taobao.org/node-gyp/download/node-gyp-3.8.0.tgz",
"integrity": "sha1-VAMEJhwzDoDQ1e3OJTpoyzlkIYw=",
"resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
"integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
"dev": true,
"optional": true,
"requires": {
"fstream": "^1.0.0",
"glob": "^7.0.3",
......@@ -7615,10 +7681,9 @@
"dependencies": {
"semver": {
"version": "5.3.0",
"resolved": "http://registry.npm.taobao.org/semver/download/semver-5.3.0.tgz",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
"dev": true,
"optional": true
"dev": true
}
}
},
......@@ -7671,11 +7736,10 @@
}
},
"node-sass": {
"version": "4.11.0",
"resolved": "http://registry.npm.taobao.org/node-sass/download/node-sass-4.11.0.tgz",
"integrity": "sha1-GD+uw5jpy+k7pDNi4naMqYimNpo=",
"version": "4.12.0",
"resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
"integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
"dev": true,
"optional": true,
"requires": {
"async-foreach": "^0.1.3",
"chalk": "^1.1.1",
......@@ -7684,12 +7748,10 @@
"get-stdin": "^4.0.1",
"glob": "^7.0.3",
"in-publish": "^2.0.0",
"lodash.assign": "^4.2.0",
"lodash.clonedeep": "^4.3.2",
"lodash.mergewith": "^4.6.0",
"lodash": "^4.17.11",
"meow": "^3.7.0",
"mkdirp": "^0.5.1",
"nan": "^2.10.0",
"nan": "^2.13.2",
"node-gyp": "^3.8.0",
"npmlog": "^4.0.0",
"request": "^2.88.0",
......@@ -7700,17 +7762,15 @@
"dependencies": {
"ansi-styles": {
"version": "2.2.1",
"resolved": "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
"dev": true,
"optional": true
"dev": true
},
"chalk": {
"version": "1.1.3",
"resolved": "http://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^2.2.1",
"escape-string-regexp": "^1.0.2",
......@@ -7721,19 +7781,17 @@
},
"supports-color": {
"version": "2.0.0",
"resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
"dev": true,
"optional": true
"dev": true
}
}
},
"nopt": {
"version": "3.0.6",
"resolved": "http://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
"dev": true,
"optional": true,
"requires": {
"abbrev": "1"
}
......@@ -7829,8 +7887,8 @@
},
"npmlog": {
"version": "4.1.2",
"resolved": "http://registry.npm.taobao.org/npmlog/download/npmlog-4.1.2.tgz",
"integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
"dev": true,
"requires": {
"are-we-there-yet": "~1.1.2",
......@@ -8037,10 +8095,9 @@
},
"os-locale": {
"version": "1.4.0",
"resolved": "http://registry.npm.taobao.org/os-locale/download/os-locale-1.4.0.tgz",
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
"dev": true,
"optional": true,
"requires": {
"lcid": "^1.0.0"
}
......@@ -8848,7 +8905,7 @@
},
"read-pkg": {
"version": "1.1.0",
"resolved": "http://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
"dev": true,
"requires": {
......@@ -8859,7 +8916,7 @@
"dependencies": {
"path-type": {
"version": "1.1.0",
"resolved": "http://registry.npm.taobao.org/path-type/download/path-type-1.1.0.tgz",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
"dev": true,
"requires": {
......@@ -8870,7 +8927,7 @@
},
"pify": {
"version": "2.3.0",
"resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true
}
......@@ -8878,7 +8935,7 @@
},
"read-pkg-up": {
"version": "1.0.1",
"resolved": "http://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-1.0.1.tgz",
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
"dev": true,
"requires": {
......@@ -8888,7 +8945,7 @@
"dependencies": {
"find-up": {
"version": "1.1.2",
"resolved": "http://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
"dev": true,
"requires": {
......@@ -8898,7 +8955,7 @@
},
"path-exists": {
"version": "2.1.0",
"resolved": "http://registry.npm.taobao.org/path-exists/download/path-exists-2.1.0.tgz",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
"dev": true,
"requires": {
......@@ -8943,10 +9000,9 @@
},
"redent": {
"version": "1.0.0",
"resolved": "http://registry.npm.taobao.org/redent/download/redent-1.0.0.tgz",
"resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
"dev": true,
"optional": true,
"requires": {
"indent-string": "^2.1.0",
"strip-indent": "^1.0.1"
......@@ -9222,10 +9278,9 @@
},
"sass-graph": {
"version": "2.2.4",
"resolved": "http://registry.npm.taobao.org/sass-graph/download/sass-graph-2.2.4.tgz",
"resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
"integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
"dev": true,
"optional": true,
"requires": {
"glob": "^7.0.0",
"lodash": "^4.0.0",
......@@ -9275,10 +9330,9 @@
},
"scss-tokenizer": {
"version": "0.2.3",
"resolved": "http://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz",
"resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
"integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
"dev": true,
"optional": true,
"requires": {
"js-base64": "^2.1.8",
"source-map": "^0.4.2"
......@@ -9286,10 +9340,9 @@
"dependencies": {
"source-map": {
"version": "0.4.4",
"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",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
"dev": true,
"optional": true,
"requires": {
"amdefine": ">=0.0.4"
}
......@@ -9446,7 +9499,7 @@
"dependencies": {
"extend-shallow": {
"version": "2.0.1",
"resolved": "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
......@@ -10092,10 +10145,9 @@
},
"stdout-stream": {
"version": "1.4.1",
"resolved": "http://registry.npm.taobao.org/stdout-stream/download/stdout-stream-1.4.1.tgz",
"integrity": "sha1-WsF0zdXNcmEEqgwLK9g4FdjVNd4=",
"resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
"integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
"dev": true,
"optional": true,
"requires": {
"readable-stream": "^2.0.1"
}
......@@ -10197,7 +10249,7 @@
},
"strip-bom": {
"version": "2.0.0",
"resolved": "http://registry.npm.taobao.org/strip-bom/download/strip-bom-2.0.0.tgz",
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
"dev": true,
"requires": {
......@@ -10212,10 +10264,9 @@
},
"strip-indent": {
"version": "1.0.1",
"resolved": "http://registry.npm.taobao.org/strip-indent/download/strip-indent-1.0.1.tgz",
"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
"dev": true,
"optional": true,
"requires": {
"get-stdin": "^4.0.1"
}
......@@ -10302,14 +10353,13 @@
"dev": true
},
"tar": {
"version": "2.2.1",
"resolved": "http://registry.npm.taobao.org/tar/download/tar-2.2.1.tgz?cache=0&other_urls=http%3A%2F%2Fregistry.npm.taobao.org%2Ftar%2Fdownload%2Ftar-2.2.1.tgz",
"integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
"integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
"dev": true,
"optional": true,
"requires": {
"block-stream": "*",
"fstream": "^1.0.2",
"fstream": "^1.0.12",
"inherits": "2"
}
},
......@@ -10647,10 +10697,9 @@
},
"trim-newlines": {
"version": "1.0.0",
"resolved": "http://registry.npm.taobao.org/trim-newlines/download/trim-newlines-1.0.0.tgz",
"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
"dev": true,
"optional": true
"dev": true
},
"trim-right": {
"version": "1.0.1",
......@@ -10660,10 +10709,9 @@
},
"true-case-path": {
"version": "1.0.3",
"resolved": "http://registry.npm.taobao.org/true-case-path/download/true-case-path-1.0.3.tgz",
"integrity": "sha1-+BO1qMhrQNpZYGcisUTjIleZ9H0=",
"resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
"dev": true,
"optional": true,
"requires": {
"glob": "^7.1.2"
}
......@@ -11543,15 +11591,14 @@
},
"which-module": {
"version": "1.0.0",
"resolved": "http://registry.npm.taobao.org/which-module/download/which-module-1.0.0.tgz",
"resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
"integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
"dev": true,
"optional": true
"dev": true
},
"wide-align": {
"version": "1.1.3",
"resolved": "http://registry.npm.taobao.org/wide-align/download/wide-align-1.1.3.tgz",
"integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=",
"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
"dev": true,
"requires": {
"string-width": "^1.0.2 || 2"
......@@ -11652,10 +11699,9 @@
},
"yargs": {
"version": "7.1.0",
"resolved": "http://registry.npm.taobao.org/yargs/download/yargs-7.1.0.tgz",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
"integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
"dev": true,
"optional": true,
"requires": {
"camelcase": "^3.0.0",
"cliui": "^3.2.0",
......@@ -11674,36 +11720,32 @@
"dependencies": {
"camelcase": {
"version": "3.0.0",
"resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
"dev": true,
"optional": true
"dev": true
},
"y18n": {
"version": "3.2.1",
"resolved": "http://registry.npm.taobao.org/y18n/download/y18n-3.2.1.tgz",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
"integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
"dev": true,
"optional": true
"dev": true
}
}
},
"yargs-parser": {
"version": "5.0.0",
"resolved": "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-5.0.0.tgz",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
"integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
"dev": true,
"optional": true,
"requires": {
"camelcase": "^3.0.0"
},
"dependencies": {
"camelcase": {
"version": "3.0.0",
"resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
"dev": true,
"optional": true
"dev": true
}
}
},
......
package.json
View file @ dda81506
......@@ -27,7 +27,7 @@
"@ionic-native/local-notifications": "^5.8.0",
"@ionic-native/splash-screen": "^5.0.0",
"@ionic-native/status-bar": "^5.0.0",
"@ionic/angular": "^4.1.0",
"@ionic/angular": "^4.6.2",
"cordova-android": "7.1.4",
"cordova-ios": "~4.5.5",
"cordova-plugin-appminimize": "1.0.1",
......@@ -69,6 +69,7 @@
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
"node-sass": "^4.12.0",
"protractor": "~5.4.0",
"ts-node": "~8.0.0",
"tslint": "~5.12.0",
......
src/app/app-routing.module.ts
View file @ dda81506
......@@ -26,8 +26,8 @@ const routes: Routes = [
]
},
{path: 'login', component: LoginPage},
{path: 'tabs', loadChildren: './envCtrl/tabs/tabs.module#TabsPageModule'},
// { path: 'env-detail', loadChildren: './envCtrl/env-detail/env-detail.module#EnvDetailPageModule' },
// {path: 'tabs', loadChildren: './envCtrl/tabs/tabs.module#TabsPageModule'},
// { path: 'env-detail', loadChildren: './envCtrl/env-detail/env-detail.module#EnvDetailPageModule' },
// { path: 'env-cfg', loadChildren: './envCtrl/env-cfg/env-cfg.module#EnvCfgPageModule' },
// { path: 'env-alarm', loadChildren: './envCtrl/env-alarm/env-alarm.module#EnvAlarmPageModule' },
// { path: 'env-home', loadChildren: './envCtrl/env-home/env-home.module#EnvHomePageModule' },
......
src/app/envCtrl/env-detail/env-detail.module.ts
View file @ dda81506
......@@ -6,11 +6,19 @@ import { Routes, RouterModule } from '@angular/router';
import { IonicModule } from '@ionic/angular';
import { EnvDetailPage } from './env-detail.page';
import {WtModule} from '../../components/wt/wt.module';
import {EnvHomePage} from '../env-home/env-home.page';
const routes: Routes = [
{
path: '',
component: EnvDetailPage
component: EnvDetailPage,
children: [
{
path: 'tab-2-fan',
component: EnvHomePage
},
]
}
];
......@@ -19,8 +27,10 @@ const routes: Routes = [
CommonModule,
FormsModule,
IonicModule,
WtModule, // for test
RouterModule.forChild(routes)
],
declarations: [EnvDetailPage]
declarations: [EnvDetailPage,
EnvHomePage,]
})
export class EnvDetailPageModule {}
src/app/envCtrl/env-detail/env-detail.page.html
View file @ dda81506
......@@ -2,8 +2,39 @@
<ion-toolbar>
<ion-title>envDetail</ion-title>
</ion-toolbar>
<div>
<span style="font-size: 20px">{{item.online ? '在线' : '离线'}}</span>
<div class="right">{{item.time | date: 'yyyy-MM-dd HH:mm:ss'}}</div>
</div>
<v-kanban class="home-bar"></v-kanban>
<v-kanban class="home-bar"></v-kanban>
<v-kanban class="home-bar"></v-kanban>
<v-kanban class="home-bar"></v-kanban>
</ion-header>
<ion-content>
<ion-tabs>
<!-- Tab bar -->
<ion-tab-bar slot="top">
<ion-tab-button tab="tab-2-fan">
<ion-icon name="person"></ion-icon>
</ion-tab-button>
<ion-tab-button tab="喷淋">
<ion-icon name="call"></ion-icon>
</ion-tab-button>
<ion-tab-button tab="照明">
<ion-icon name="settings"></ion-icon>
</ion-tab-button>
<ion-tab-button tab="水槽">
<ion-icon name="settings"></ion-icon>
</ion-tab-button>
<!--<ion-tab-button tab="settings">-->
<!--<ion-icon name="settings"></ion-icon>-->
<!--</ion-tab-button>-->
<!--<ion-tab-button tab="settings">-->
<!--<ion-icon name="settings"></ion-icon>-->
<!--</ion-tab-button>-->
</ion-tab-bar>
</ion-tabs>
<ion-router-outlet></ion-router-outlet>
</ion-content>
src/app/envCtrl/env-detail/env-detail.page.scss
View file @ dda81506
.right {
float: right;
color: #ffd31a;
}
.home-bar{
display: inline-block;
margin-right: 3px;
width: 23%;
}
\ No newline at end of file
src/app/envCtrl/env-detail/env-detail.page.ts
View file @ dda81506
......@@ -9,6 +9,17 @@ export class EnvDetailPage implements OnInit {
constructor() { }
item = {
name : '1号牛舍',
temp : '23.5',
humi : '82',
thi: '轻',
time : '2019-08-05 23:44',
online : true,
ctrl: 0,
alarm: true,
};
ngOnInit() {
}
......
src/app/envCtrl/env-home/env-home.page.html
View file @ dda81506
......@@ -2,6 +2,14 @@
<div class="topIcon" (click)="toIndex()">
<i class="vo v-back"></i>
</div>
<ion-slides style="width: 100%;height: 125px;" mode="ios"
[options]="lunbo" #slide (ionSlideTouchEnd)="slideDidChange()">
<ion-slide class="slideCon" *ngFor="let one of imgs">
<div class="inBox">
<img [src]="'../../../assets/lunbo/' + one">
</div>
</ion-slide>
</ion-slides>
</ion-header>
<ion-content color='light'>
......@@ -23,4 +31,32 @@
border-left: 5px solid #28c9bd;
line-height: 25px;
margin-bottom: 5px;">牛舍列表</h1>
<ion-list mode="md" class="listview" insert = "false" line="none" style="width:96%;margin-left: 2%">
<ion-item *ngFor="let item of items" (click)="toControl(item)" class="ion-item" style="width: 100%; --padding-start: 0px">
<div class="item">
<div class="top">{{item.name}}
<!--<div class="right">{{item.time | date: 'yyyy-MM-dd HH:mm:ss'}}</div>-->
<ion-icon class="right" name="ios-heart"></ion-icon>
</div>
<div class="content">
<!--<div class="left">-->
<!--<img [src]="'../../assets/img/' + item.img">-->
<!--</div>-->
<!--<div class="rightCon">-->
<span style="font-size: 20px">{{item.online ? '在线' : '离线'}}</span>
<!--<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">运行状态: &nbsp;&nbsp;{{item.state ? '工作中' : '未运行'}} </div>-->
<div class="right">{{item.time | date: 'yyyy-MM-dd HH:mm:ss'}}</div>
<!--</div>-->
</div>
<div class="bottom">
<!--<div [ngClass]="{'sucCir': item.state, 'errCir': !item.state}"></div>&nbsp;-->
<!--<span style="font-size: 13px">{{item.online ? '在线' : '离线'}}</span>-->
<span class="block2" *ngIf="item.temp || item.temp === 0">温度: &nbsp;&nbsp;{{item.temp}} ℃</span>
<span class="block1" *ngIf="item.humi || item.humi === 0">湿度: &nbsp;&nbsp;{{item.humi}} %</span>
</div>
</div>
</ion-item>
</ion-list>
</ion-content>
src/app/envCtrl/env-home/env-home.page.scss
View file @ dda81506
......@@ -3,3 +3,45 @@
margin-right: 3px;
width: 32%;
}
.item {
margin-bottom: 10px;
padding: 0px 3px 0px;
background-color: #ffffff;
display:block;
width: calc(100%);
}
.top {
line-height: 20px;
//border-bottom: 1px solid #cccc;
padding-bottom: 5px;
font-size: 15px;
display: block;
width: 100%;
}
.rightCon {
width: calc(50%);
line-height: 25px;
vertical-align: top;
display: inline-block;
padding-left: 20px;
padding-top: 5px;
font-size: 12px;
}
.right {
float: right;
color: #ffd31a;
}
.bottom {
//border-top: 1px solid #ccc;
padding: 3px;
color: #aaa;
margin-top: 10px;
}
.content{
margin-top: 10px;
}
\ No newline at end of file
src/app/envCtrl/env-home/env-home.page.ts
View file @ dda81506
import { Component, OnInit } from '@angular/core';
import {Component, OnInit, ViewChild} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {Transfer} from '../../service/transfer';
import {Api} from '../../service/api';
......@@ -16,10 +16,127 @@ export class EnvHomePage implements OnInit {
private api: Api, private load: Load, public nav: NavController) { }
ifFocus = false;
lunbo = {
speed: 1000,
allowTouchMove: true,
effect: 'flip',
autoplay: {
delay: 2000,
},
loop: true,
spaceBetween: 0,
zoom: false
};
items = [
{
name : '1号牛舍',
temp : '23.5',
humi : '82',
thi: '轻',
time : '2019-08-05 23:44',
online : true,
ctrl: 0,
alarm: true,
},
{
name : '2号牛舍',
temp : '23.5',
humi : '82',
thi: '轻',
time : '2019-08-05 23:44',
online : true,
ctrl: 0,
alarm: true,
},
{
name : '2号牛舍',
temp : '23.5',
humi : '82',
thi: '轻',
time : '2019-08-05 23:44',
online : true,
ctrl: 0,
alarm: true,
},
{
name : '2号牛舍',
temp : '23.5',
humi : '82',
thi: '轻',
time : '2019-08-05 23:44',
online : true,
ctrl: 0,
alarm: true,
},
{
name : '2号牛舍',
temp : '23.5',
humi : '82',
thi: '轻',
time : '2019-08-05 23:44',
online : true,
ctrl: 0,
alarm: true,
},
{
name : '2号牛舍',
temp : '23.5',
humi : '82',
thi: '轻',
time : '2019-08-05 23:44',
online : true,
ctrl: 0,
alarm: true,
},
{
name : '2号牛舍',
temp : '23.5',
humi : '82',
thi: '轻',
time : '2019-08-05 23:44',
online : true,
ctrl: 0,
alarm: true,
},
];
imgs = ['1.jpg', '2.jpg', '3.jpg'];
itam = {
name : '',
temp : '',
humi : '',
thi: '',
time : '',
online : false,
ctrl: 0,
alarm: true,
};
dummyData = {
name : '1好',
temp : '',
humi : '',
thi: '',
time : '',
online : false,
ctrl: 0,
alarm: true,
};
@ViewChild('slide') slide;
ngOnInit() {
this.ionViewWillEnter();
}
// ionic的生命周期函数
ionViewWillEnter() {
this.slideDidChange();
//this.getData(0);
}
toIndex() {
if (this.ifFocus) {
this.ifFocus = false;
......@@ -28,4 +145,17 @@ export class EnvHomePage implements OnInit {
}
}
toControl(p){
}
getData()
{
}
slideDidChange() {
this.slide.startAutoplay();
}
}
src/app/envCtrl/tabs/tabs.module.ts
View file @ dda81506
......@@ -26,7 +26,10 @@ const routes: Routes = [
},
{
path: 'tab-detail',
component: EnvDetailPage
component: EnvDetailPage,
// loadChildren:[{
// path:'./envCtrl/env-detail/env-detail.module#EnvDetailPageModule',
// }]
},
{
path: 'tab-anal',
......
src/app/envCtrl/tabs/tabs.page.html
View file @ dda81506
<ion-tabs>
<!--<ion-tab tab="home">Home Content</ion-tab>-->
<!--<ion-tab tab="settings">Settings Content</ion-tab>-->
<ion-tab-bar slot="bottom">
<ion-tab-button tab="tab-home">
......
src/app/home/home.page.html
View file @ dda81506
......@@ -61,7 +61,7 @@
</div>
</div>
<div class="bottom">
<div [ngClass]="{'sucCir': item.state, 'errCir': !item.state}"></div>&nbsp;
<div [ngClass]="{'sucCir': item.online, 'errCir': !item.online}"></div>&nbsp;
<span style="font-size: 13px">{{item.online ? '在线' : '离线'}}</span>
</div>
</div>
......
src/app/index/index.page.html
View file @ dda81506
......@@ -12,8 +12,8 @@
<div class="mainContent">
<div class="contentPart">
<div class="leftOnPart" (click)="goTo('home')"></div>
<!--<div class="rightOnPart " (click)="goTo('row')"></div>-->
<div class="rightOnPart " (click)="goTo('tabs/tab-home')"></div>
<div class="rightOnPart " (click)="goTo('row')"></div>
<!--<div class="rightOnPart " (click)="goTo('tabs/tab-home')"></div>-->
<div class="leftUnderPart" (click)="goTo('alarm')"></div>
<div class="rightUnderPart" (click)="goTo('mine')"></div>
</div>
......
src/app/mine/mine.page.html
View file @ dda81506
......@@ -34,7 +34,7 @@
<div Button class="button" (click)="loginOut()" [type]="'primary'" style="letter-spacing: 2px">退出登录</div>
</div>
<div style="position: fixed;bottom: 20px;display: inline-block;width: 100%;text-align: center;color: #666666;font-size: 14px;">
版本信息: v2.6.1
版本信息: v2.7.1
</div>
</div>
......
src/environments/environment.ts
View file @ dda81506
......@@ -4,7 +4,7 @@
export const environment = {
// production: false,
url: 'http://pasture.witium.com.cn/api', // 对外访问测试网地址
// url: 'http://pasture.witium.com.cn/api', // 对外访问测试网地址
// url: 'http://cloud-test.witium.com:8096', // 测试
// url: 'http://172.16.1.53:8097', // cy
// url: 'http://172.16.1.52:8096', // zz
......@@ -12,7 +12,7 @@ export const environment = {
// mqttUrl: '172.16.1.24',
// mqttUrl: '120.27.235.39'
production: true,
// url: 'http://pasture.witium.com/api', // 对外访问测试网地址
url: 'http://pasture.witium.com/api', // 对外访问测试网地址
// url: 'http://172.16.1.13:8096', // 测试
mqttUrl: '120.27.235.39'
};
......
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