diff --git a/index.html b/index.html index c15a53b..84f1692 100644 --- a/index.html +++ b/index.html @@ -2,9 +2,23 @@ - 海亮 + screen
+ diff --git a/package.json b/package.json index ce2d429..8ec84e6 100644 --- a/package.json +++ b/package.json @@ -13,10 +13,7 @@ "dependencies": { "axios": "^0.18.0", "babel-polyfill": "^6.26.0", - "echarts": "^4.2.0-rc.2", - "fetch-jsonp": "^1.1.3", - "jquery": "^3.3.1", - "lodash": "^4.17.11", + "echarts": "^5.3.2", "stylus": "^0.54.5", "stylus-loader": "^3.0.2", "vue": "^2.5.2", diff --git a/src/assets/css/font/PangMenZhengDao.ttf b/src/assets/css/font/PangMenZhengDao.ttf new file mode 100644 index 0000000..61d491d Binary files /dev/null and b/src/assets/css/font/PangMenZhengDao.ttf differ diff --git a/src/assets/css/font/SourceHanSansCN-Normal.otf b/src/assets/css/font/SourceHanSansCN-Normal.otf new file mode 100755 index 0000000..091f56d Binary files /dev/null and b/src/assets/css/font/SourceHanSansCN-Normal.otf differ diff --git a/src/assets/css/iconfont.styl b/src/assets/css/iconfont.styl new file mode 100644 index 0000000..f4c4bae --- /dev/null +++ b/src/assets/css/iconfont.styl @@ -0,0 +1,28 @@ +@font-face { + font-family: "iconfont"; /* Project id 1255596 */ + src: url('iconfont/iconfont.woff2?t=1620977303191') format('woff2'), + url('iconfont/iconfont.woff?t=1620977303191') format('woff'), + url('iconfont/iconfont.ttf?t=1620977303191') format('truetype'); +} + +@font-face { + font-family: "PangMenZhengDao"; + src: url('font/PangMenZhengDao.ttf') +} + +@font-face { + font-family: "SourceHanSansCN"; + src: url('font/SourceHanSansCN-Normal.otf'); +} + +.iconfont { + font-family: "iconfont" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-guanbi:before { + content: "\e60f"; +} \ No newline at end of file diff --git a/src/assets/css/iconfont/iconfont.json b/src/assets/css/iconfont/iconfont.json new file mode 100644 index 0000000..34ac18f --- /dev/null +++ b/src/assets/css/iconfont/iconfont.json @@ -0,0 +1,37 @@ +{ + "id": "1255596", + "name": "nl-hht-hl", + "font_family": "iconfont", + "css_prefix_text": "icon-", + "description": "", + "glyphs": [ + { + "icon_id": "2229060", + "name": "无信号", + "font_class": "no-signal", + "unicode": "e76b", + "unicode_decimal": 59243 + }, + { + "icon_id": "400034", + "name": "下拉", + "font_class": "htmal5icon03", + "unicode": "e626", + "unicode_decimal": 58918 + }, + { + "icon_id": "731140", + "name": "选择", + "font_class": "guanbi1", + "unicode": "e608", + "unicode_decimal": 58888 + }, + { + "icon_id": "4736203", + "name": "关闭", + "font_class": "guanbi", + "unicode": "e60f", + "unicode_decimal": 58895 + } + ] +} diff --git a/src/assets/css/iconfont/iconfont.ttf b/src/assets/css/iconfont/iconfont.ttf new file mode 100644 index 0000000..d19ae0d Binary files /dev/null and b/src/assets/css/iconfont/iconfont.ttf differ diff --git a/src/assets/css/iconfont/iconfont.woff b/src/assets/css/iconfont/iconfont.woff new file mode 100644 index 0000000..31debf3 Binary files /dev/null and b/src/assets/css/iconfont/iconfont.woff differ diff --git a/src/assets/css/iconfont/iconfont.woff2 b/src/assets/css/iconfont/iconfont.woff2 new file mode 100644 index 0000000..f9b361d Binary files /dev/null and b/src/assets/css/iconfont/iconfont.woff2 differ diff --git a/src/assets/css/layout.styl b/src/assets/css/layout.styl index 346f385..562fcc9 100644 --- a/src/assets/css/layout.styl +++ b/src/assets/css/layout.styl @@ -1,305 +1,5 @@ +@import 'iconfont.styl' .bg - width 100% - height 100% - overflow hidden -.login_bg width 100% height 100% - overflow hidden -.header - height .87rem - line-height .87rem - margin 0 .38rem - border-bottom 1px solid #1A0988 - overflow hidden -.logo - width 30% - font-size .28rem - line-height .87rem -.tabs - width 40% - font-size .18rem - a - float left - width 2.04rem - color #ffffff - text-align center - font-size .22rem -.tab-active - background center center / 100% 100% url(../../assets/images/tab-bg.png) no-repeat -.plugin - width 30% -.wearth - position relative - height .87rem - line-height .87rem - padding-right .2rem - span - display inline-block - .wearth-icon - position absolute - left 0 - width .5rem - height .87rem - margin-right .09rem - overflow hidden - display flex - justify-content center - align-items center - img - width 100% - height auto -.wearth-sheshi-title - font-size .4rem - margin-left .59rem -.date-box - width 1.9rem - height .87rem - padding-left .2rem - // background center left / 1px auto url(../../assets/images/w-line.png) no-repeat -.time - font-size .28rem - line-height .34rem - margin-top .2rem - text-align right -.date - font-size .12rem - line-height .2rem - text-align right -.week - font-size .14rem -// content -.content - width 100% - padding 0 .38rem - overflow hidden - // padding-bottom .36rem -.left-wrap - position relative - width 3rem - height 9.19rem - margin-top .38rem - background top left / 100% 100% url(../../assets/images/left-bg.png) no-repeat -.white-line - position absolute - top 8.5px - left 0 - width 8px - height 21px - background-color #fff -.right-wrap - position relative - height 9.57rem - overflow hidden -.left-title - position relative - font-size .16rem - line-height .34rem - padding-left .21rem - i - position absolute - display block - left 0 - top 50% - margin-top -10.5px - width 8px - height 21px - background-color #ffffff -.left-content - padding 0 .21rem -.left-content-box - padding-top .19rem -.left-tip - font-size .16rem - line-height .34rem - i - color #00C2FE - font-style normal -.data-line-bg - margin-top 5px - height 12px - background-color #0D2F87 - border-radius 12px - i - display block - height 12px - background-color #00C2FE - border-radius 12px -.center-content - width 12.4rem - margin-top .24rem - text-align center - font-size .16rem -.center-detail - line-height .34rem - margin-top .16rem - i - font-style normal - font-size .26rem - color #d6594a -.right-content - width 3.03rem -.output-box - width 8rem - height .58rem - line-height .58rem - margin 0 auto -.digit-panel - position relative -.digit - float left - width .48rem - height .58rem - margin-right 10px - overflow hidden - background 100% url(../../assets/images/number-bg.png) no-repeat -.digit:nth-child(1), -.digit:nth-child(4), -.digit:nth-child(7) - margin-right .32rem -.sub - position absolute - top 0 -.sub1 - left .58rem -.sub2 - left 2.54rem -.sub3 - left 4.5rem -.sub sub - font-size .46rem - margin-right 10px -.digit ul - transition margin-top .5s ease -.digit ul li - width .48rem - height .58rem - font-size .46rem -.center-wrap - position relative - width 10.38rem - height 5.1rem - margin .3rem auto 0 auto -.output-img - position absolute - top -2rem - left 0 - width 100% - height auto -.fs1 - position absolute - width 2rem - font-size .3rem - line-height .47rem - text-align center - p - padding-top .76rem - font-size .3rem - line-height .47rem -.fs2 - font-size .1597rem - position absolute - width 1.26rem - line-height .24rem - text-align center -.loc1 - top .94rem - left 4.19rem -.loc2 - top .1rem - left 1.78rem -.loc3 - top 1.49rem - left .18rem -.loc4 - top 3.29rem - left .95rem -.loc5 - top 3.29rem - right .94rem -.loc6 - top 1.2rem - right .18rem -.loc7 - top -0.2rem - right 1.78rem -.right-content - margin-top .38rem - width 3rem -.right-content-wrap - position relative - width 3rem - height 1.4rem - margin-bottom .2rem - background center / 100% auto url(../../assets/images/right-bg.png) no-repeat - overflow hidden -.icon-toStore - width .55rem - height .64rem - margin .39rem 0 0 .46rem - background center / 100% auto url(../../assets/images/icon-tostore.png) no-repeat -.icon-outstore - background center / 100% auto url(../../assets/images/icon-outstore.png) no-repeat -.right-content-fstyle - width 1.8rem - margin .25rem 0 0 .1rem - font-size .3rem - line-height 1 - p - font-size .16rem - line-height .34rem - white-space nowrap - overflow hidden - text-overflow ellipsis - .right-content-fstyle1 - font-size .24rem -.bottom-content - position absolute - bottom 0 - right 0 - height 2.73rem -.echart-wrap - position relative - width 7.52rem - height 2.73rem - background center / 100% auto url(../../assets/images/bottom-bg.png) no-repeat - overflow hidden -.wline - position absolute - top 25px - left 0 - width 5px - height 18px - background-color #fff -.echart-wrap-fl - margin-right .21rem -.xuni1 - font-size .18rem - font-weight bold - margin .12rem 0 0 .18rem -.xuni-box-item - width 2.62rem - margin .4rem auto 0 auto -.xuni-box-item-top - font-size .16rem - line-height .2rem - height .2rem - overflow hidden -.xuni-bg-line - width 100% - height 12px - margin-top 5px - background-color #151f8c - border-radius 10px - position relative - z-index 10 -.xuni-up-line - position absolute - height 12px - border-radius 10px - background-color #00c1ff - width 0 -.drift - transition left .3s linear -.driftWide - transition width 1s linear \ No newline at end of file + overflow hidden \ No newline at end of file diff --git a/src/assets/css/mixin.styl b/src/assets/css/mixin.styl new file mode 100644 index 0000000..d940186 --- /dev/null +++ b/src/assets/css/mixin.styl @@ -0,0 +1,40 @@ +$red = #ed4754 +$green = #67c23a +$yellow = #f2d648 +$orange = #f17d3a +$blue = #6798ef +$gray = #c9c9c9 +$fc1 = #323232 + + +//宽高 +_wh(w, h) + width: w + height: h + +//字体大小、行高、颜色 +_font(size,height,color=$fc1,weight=normal,align=left) + font-size: size + line-height: height + color: color + font-weight: weight + text-align: align + +//flex 布局和 子元素 对其方式 +_fj(x=space-between,y=center) + display: flex + justify-content: x + align-items: y + +// 背景图片地址和大小 +_bis(url,w,h=auto,x=center,y=center) + background-position: x y + background-size: w h + background-image: url(url) + background-repeat: no-repeat + +// 定位上下居中 +_ct() + position: absolute + top: 50% + transform: translateY(-50%) \ No newline at end of file diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css index 2d58820..132b8f3 100644 --- a/src/assets/css/reset.css +++ b/src/assets/css/reset.css @@ -19,6 +19,7 @@ time, mark, audio, video, input { color: #ffffff; font-weight: normal; vertical-align: baseline; + font-family: "lucida grande", "lucida sans unicode", lucida, helvetica, "Hiragino Sans GB", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif; } /* HTML5 display-role reset for older browsers */ @@ -82,13 +83,15 @@ html, body { width: 1920px; height: 1080px; /* width: 100%; - min-height: 100%; */ + height: 100%; + min-width: 1440px; + min-height: 1080px; */ } body { -webkit-text-size-adjust: none; -webkit-tap-highlight-color: rgba(0, 0, 0, 0); - background: #05032a center center / 100% 100% url(../../assets/images/bg.png) no-repeat; + background: #05032a center center / 100% 100% url(../../assets/images/screen1/bg.jpg) no-repeat; } div, p { @@ -119,6 +122,10 @@ div, p { float: right !important; } -.mgb40 { - margin-bottom: .4rem !important; -} \ No newline at end of file +.fontselect { + -moz-user-select:none;/*火狐*/ + -webkit-user-select:none;/*webkit浏览器*/ + -ms-user-select:none;/*IE10*/ + -khtml-user-select:none;/*早期浏览器*/ + user-select:none; +} diff --git a/src/assets/images/1.png b/src/assets/images/1.png deleted file mode 100644 index b3275e1..0000000 Binary files a/src/assets/images/1.png and /dev/null differ diff --git a/src/assets/images/2.png b/src/assets/images/2.png deleted file mode 100644 index 0449a97..0000000 Binary files a/src/assets/images/2.png and /dev/null differ diff --git a/src/assets/images/3.png b/src/assets/images/3.png deleted file mode 100644 index fdf6091..0000000 Binary files a/src/assets/images/3.png and /dev/null differ diff --git a/src/assets/images/4.png b/src/assets/images/4.png deleted file mode 100644 index 96f44f7..0000000 Binary files a/src/assets/images/4.png and /dev/null differ diff --git a/src/assets/images/404.png b/src/assets/images/404.png deleted file mode 100644 index 120b8ca..0000000 Binary files a/src/assets/images/404.png and /dev/null differ diff --git a/src/assets/images/ZT001.png b/src/assets/images/ZT001.png deleted file mode 100644 index 34d1e31..0000000 Binary files a/src/assets/images/ZT001.png and /dev/null differ diff --git a/src/assets/images/ZT002.png b/src/assets/images/ZT002.png deleted file mode 100644 index 7a5e908..0000000 Binary files a/src/assets/images/ZT002.png and /dev/null differ diff --git a/src/assets/images/ZT003.png b/src/assets/images/ZT003.png deleted file mode 100644 index a452268..0000000 Binary files a/src/assets/images/ZT003.png and /dev/null differ diff --git a/src/assets/images/ZT004.png b/src/assets/images/ZT004.png deleted file mode 100644 index 8a28500..0000000 Binary files a/src/assets/images/ZT004.png and /dev/null differ diff --git a/src/assets/images/bg.png b/src/assets/images/bg.png index 6de9a91..214abaf 100644 Binary files a/src/assets/images/bg.png and b/src/assets/images/bg.png differ diff --git a/src/assets/images/bg1.png b/src/assets/images/bg1.png new file mode 100644 index 0000000..e95779a Binary files /dev/null and b/src/assets/images/bg1.png differ diff --git a/src/assets/images/bg2.png b/src/assets/images/bg2.png new file mode 100644 index 0000000..82c666f Binary files /dev/null and b/src/assets/images/bg2.png differ diff --git a/src/assets/images/bg3.png b/src/assets/images/bg3.png new file mode 100644 index 0000000..41b467d Binary files /dev/null and b/src/assets/images/bg3.png differ diff --git a/src/assets/images/bg4.png b/src/assets/images/bg4.png new file mode 100644 index 0000000..b796118 Binary files /dev/null and b/src/assets/images/bg4.png differ diff --git a/src/assets/images/bottom-bg.png b/src/assets/images/bottom-bg.png deleted file mode 100644 index 4d02e3a..0000000 Binary files a/src/assets/images/bottom-bg.png and /dev/null differ diff --git a/src/assets/images/close.png b/src/assets/images/close.png deleted file mode 100644 index cb62bb4..0000000 Binary files a/src/assets/images/close.png and /dev/null differ diff --git a/src/assets/images/close1.png b/src/assets/images/close1.png deleted file mode 100644 index 4b90116..0000000 Binary files a/src/assets/images/close1.png and /dev/null differ diff --git a/src/assets/images/close2.png b/src/assets/images/close2.png deleted file mode 100644 index 8386ccf..0000000 Binary files a/src/assets/images/close2.png and /dev/null differ diff --git a/src/assets/images/cloudy.png b/src/assets/images/cloudy.png deleted file mode 100644 index 5641b78..0000000 Binary files a/src/assets/images/cloudy.png and /dev/null differ diff --git a/src/assets/images/danger.png b/src/assets/images/danger.png deleted file mode 100644 index 64d589a..0000000 Binary files a/src/assets/images/danger.png and /dev/null differ diff --git a/src/assets/images/devintro-leftb-bg.png b/src/assets/images/devintro-leftb-bg.png deleted file mode 100644 index c0cead6..0000000 Binary files a/src/assets/images/devintro-leftb-bg.png and /dev/null differ diff --git a/src/assets/images/devintro-leftt-bg.png b/src/assets/images/devintro-leftt-bg.png deleted file mode 100644 index 43945c6..0000000 Binary files a/src/assets/images/devintro-leftt-bg.png and /dev/null differ diff --git a/src/assets/images/devintro-right-bg.png b/src/assets/images/devintro-right-bg.png deleted file mode 100644 index 231390f..0000000 Binary files a/src/assets/images/devintro-right-bg.png and /dev/null differ diff --git a/src/assets/images/fault.png b/src/assets/images/fault.png deleted file mode 100644 index 55b0731..0000000 Binary files a/src/assets/images/fault.png and /dev/null differ diff --git a/src/assets/images/header.png b/src/assets/images/header.png new file mode 100644 index 0000000..47285bf Binary files /dev/null and b/src/assets/images/header.png differ diff --git a/src/assets/images/icon-outstore.png b/src/assets/images/icon-outstore.png deleted file mode 100644 index 547338c..0000000 Binary files a/src/assets/images/icon-outstore.png and /dev/null differ diff --git a/src/assets/images/icon-tostore.png b/src/assets/images/icon-tostore.png deleted file mode 100644 index 0082567..0000000 Binary files a/src/assets/images/icon-tostore.png and /dev/null differ diff --git a/src/assets/images/info.png b/src/assets/images/info.png deleted file mode 100644 index 9763961..0000000 Binary files a/src/assets/images/info.png and /dev/null differ diff --git a/src/assets/images/left-bg.png b/src/assets/images/left-bg.png deleted file mode 100644 index a31d174..0000000 Binary files a/src/assets/images/left-bg.png and /dev/null differ diff --git a/src/assets/images/line-prodata.png b/src/assets/images/line-prodata.png deleted file mode 100644 index c64a557..0000000 Binary files a/src/assets/images/line-prodata.png and /dev/null differ diff --git a/src/assets/images/mon_01.jpg b/src/assets/images/mon_01.jpg deleted file mode 100644 index 9f6239c..0000000 Binary files a/src/assets/images/mon_01.jpg and /dev/null differ diff --git a/src/assets/images/mon_01.png b/src/assets/images/mon_01.png deleted file mode 100644 index 478ae22..0000000 Binary files a/src/assets/images/mon_01.png and /dev/null differ diff --git a/src/assets/images/mon_02.png b/src/assets/images/mon_02.png deleted file mode 100644 index 2a6c370..0000000 Binary files a/src/assets/images/mon_02.png and /dev/null differ diff --git a/src/assets/images/mon_03.png b/src/assets/images/mon_03.png deleted file mode 100644 index 3349da6..0000000 Binary files a/src/assets/images/mon_03.png and /dev/null differ diff --git a/src/assets/images/number-bg.png b/src/assets/images/number-bg.png deleted file mode 100644 index cae5277..0000000 Binary files a/src/assets/images/number-bg.png and /dev/null differ diff --git a/src/assets/images/off.png b/src/assets/images/off.png deleted file mode 100644 index 35a107b..0000000 Binary files a/src/assets/images/off.png and /dev/null differ diff --git a/src/assets/images/on.png b/src/assets/images/on.png deleted file mode 100644 index 62c9418..0000000 Binary files a/src/assets/images/on.png and /dev/null differ diff --git a/src/assets/images/output.png b/src/assets/images/output.png deleted file mode 100644 index 090b8c2..0000000 Binary files a/src/assets/images/output.png and /dev/null differ diff --git a/src/assets/images/play.png b/src/assets/images/play.png deleted file mode 100644 index 8c4e1f9..0000000 Binary files a/src/assets/images/play.png and /dev/null differ diff --git a/src/assets/images/prodata-btm.png b/src/assets/images/prodata-btm.png deleted file mode 100644 index bdeb544..0000000 Binary files a/src/assets/images/prodata-btm.png and /dev/null differ diff --git a/src/assets/images/right-bg.png b/src/assets/images/right-bg.png deleted file mode 100644 index 2d2ed24..0000000 Binary files a/src/assets/images/right-bg.png and /dev/null differ diff --git a/src/assets/images/screen1/bg.jpg b/src/assets/images/screen1/bg.jpg new file mode 100644 index 0000000..0d1b610 Binary files /dev/null and b/src/assets/images/screen1/bg.jpg differ diff --git a/src/assets/images/screen1/bg.png b/src/assets/images/screen1/bg.png new file mode 100644 index 0000000..7a8bbde Binary files /dev/null and b/src/assets/images/screen1/bg.png differ diff --git a/src/assets/images/screen1/bottom.png b/src/assets/images/screen1/bottom.png new file mode 100644 index 0000000..20de4f2 Binary files /dev/null and b/src/assets/images/screen1/bottom.png differ diff --git a/src/assets/images/screen1/dot_1.png b/src/assets/images/screen1/dot_1.png new file mode 100644 index 0000000..c7b8815 Binary files /dev/null and b/src/assets/images/screen1/dot_1.png differ diff --git a/src/assets/images/screen1/header.png b/src/assets/images/screen1/header.png new file mode 100644 index 0000000..2ed32eb Binary files /dev/null and b/src/assets/images/screen1/header.png differ diff --git a/src/assets/images/screen1/item_1.png b/src/assets/images/screen1/item_1.png new file mode 100644 index 0000000..aee0026 Binary files /dev/null and b/src/assets/images/screen1/item_1.png differ diff --git a/src/assets/images/screen1/item_2.png b/src/assets/images/screen1/item_2.png new file mode 100644 index 0000000..e8d8509 Binary files /dev/null and b/src/assets/images/screen1/item_2.png differ diff --git a/src/assets/images/screen1/item_3.png b/src/assets/images/screen1/item_3.png new file mode 100644 index 0000000..115ece8 Binary files /dev/null and b/src/assets/images/screen1/item_3.png differ diff --git a/src/assets/images/screen1/item_4.png b/src/assets/images/screen1/item_4.png new file mode 100644 index 0000000..68cfc65 Binary files /dev/null and b/src/assets/images/screen1/item_4.png differ diff --git a/src/assets/images/screen1/item_5.png b/src/assets/images/screen1/item_5.png new file mode 100644 index 0000000..c73eff3 Binary files /dev/null and b/src/assets/images/screen1/item_5.png differ diff --git a/src/assets/images/screen1/item_6.png b/src/assets/images/screen1/item_6.png new file mode 100644 index 0000000..38c0449 Binary files /dev/null and b/src/assets/images/screen1/item_6.png differ diff --git a/src/assets/images/screen1/item_7.png b/src/assets/images/screen1/item_7.png new file mode 100644 index 0000000..3c2b51f Binary files /dev/null and b/src/assets/images/screen1/item_7.png differ diff --git a/src/assets/images/screen1/line_1.png b/src/assets/images/screen1/line_1.png new file mode 100644 index 0000000..496c492 Binary files /dev/null and b/src/assets/images/screen1/line_1.png differ diff --git a/src/assets/images/screen1/line_2.png b/src/assets/images/screen1/line_2.png new file mode 100644 index 0000000..e1a4a7c Binary files /dev/null and b/src/assets/images/screen1/line_2.png differ diff --git a/src/assets/images/screen1/line_3.png b/src/assets/images/screen1/line_3.png new file mode 100644 index 0000000..bd87b5d Binary files /dev/null and b/src/assets/images/screen1/line_3.png differ diff --git a/src/assets/images/screen1/title_bg_1.png b/src/assets/images/screen1/title_bg_1.png new file mode 100644 index 0000000..5506ed7 Binary files /dev/null and b/src/assets/images/screen1/title_bg_1.png differ diff --git a/src/assets/images/screen1/title_bg_2.png b/src/assets/images/screen1/title_bg_2.png new file mode 100644 index 0000000..cadbd7c Binary files /dev/null and b/src/assets/images/screen1/title_bg_2.png differ diff --git a/src/assets/images/screen1/title_bg_d1.png b/src/assets/images/screen1/title_bg_d1.png new file mode 100644 index 0000000..e28eb30 Binary files /dev/null and b/src/assets/images/screen1/title_bg_d1.png differ diff --git a/src/assets/images/screen1/title_bg_d2.png b/src/assets/images/screen1/title_bg_d2.png new file mode 100644 index 0000000..c2e42a3 Binary files /dev/null and b/src/assets/images/screen1/title_bg_d2.png differ diff --git a/src/assets/images/screen1/top_1.png b/src/assets/images/screen1/top_1.png new file mode 100644 index 0000000..61fd88c Binary files /dev/null and b/src/assets/images/screen1/top_1.png differ diff --git a/src/assets/images/screen1/top_2.png b/src/assets/images/screen1/top_2.png new file mode 100644 index 0000000..3c4be83 Binary files /dev/null and b/src/assets/images/screen1/top_2.png differ diff --git a/src/assets/images/screen1/top_3.png b/src/assets/images/screen1/top_3.png new file mode 100644 index 0000000..532f276 Binary files /dev/null and b/src/assets/images/screen1/top_3.png differ diff --git a/src/assets/images/tab-bg.png b/src/assets/images/tab-bg.png deleted file mode 100644 index 20a0845..0000000 Binary files a/src/assets/images/tab-bg.png and /dev/null differ diff --git a/src/assets/images/tip.png b/src/assets/images/tip.png new file mode 100644 index 0000000..0db0dd6 Binary files /dev/null and b/src/assets/images/tip.png differ diff --git a/src/assets/images/video-bg.png b/src/assets/images/video-bg.png deleted file mode 100644 index 875b248..0000000 Binary files a/src/assets/images/video-bg.png and /dev/null differ diff --git a/src/assets/images/w-line.png b/src/assets/images/w-line.png deleted file mode 100644 index f3e53f7..0000000 Binary files a/src/assets/images/w-line.png and /dev/null differ diff --git a/src/assets/images/wait.png b/src/assets/images/wait.png deleted file mode 100644 index 39cdee6..0000000 Binary files a/src/assets/images/wait.png and /dev/null differ diff --git a/src/assets/images/weather/100.png b/src/assets/images/weather/100.png deleted file mode 100644 index 22f300b..0000000 Binary files a/src/assets/images/weather/100.png and /dev/null differ diff --git a/src/assets/images/weather/100n.png b/src/assets/images/weather/100n.png deleted file mode 100644 index ce3252d..0000000 Binary files a/src/assets/images/weather/100n.png and /dev/null differ diff --git a/src/assets/images/weather/101.png b/src/assets/images/weather/101.png deleted file mode 100644 index 6346a9a..0000000 Binary files a/src/assets/images/weather/101.png and /dev/null differ diff --git a/src/assets/images/weather/102.png b/src/assets/images/weather/102.png deleted file mode 100644 index aadd2b0..0000000 Binary files a/src/assets/images/weather/102.png and /dev/null differ diff --git a/src/assets/images/weather/103.png b/src/assets/images/weather/103.png deleted file mode 100644 index a1913c1..0000000 Binary files a/src/assets/images/weather/103.png and /dev/null differ diff --git a/src/assets/images/weather/103n.png b/src/assets/images/weather/103n.png deleted file mode 100644 index 65af988..0000000 Binary files a/src/assets/images/weather/103n.png and /dev/null differ diff --git a/src/assets/images/weather/104.png b/src/assets/images/weather/104.png deleted file mode 100644 index e4a624c..0000000 Binary files a/src/assets/images/weather/104.png and /dev/null differ diff --git a/src/assets/images/weather/104n.png b/src/assets/images/weather/104n.png deleted file mode 100644 index d659128..0000000 Binary files a/src/assets/images/weather/104n.png and /dev/null differ diff --git a/src/assets/images/weather/200.png b/src/assets/images/weather/200.png deleted file mode 100644 index 41d83c5..0000000 Binary files a/src/assets/images/weather/200.png and /dev/null differ diff --git a/src/assets/images/weather/201.png b/src/assets/images/weather/201.png deleted file mode 100644 index 8afcd23..0000000 Binary files a/src/assets/images/weather/201.png and /dev/null differ diff --git a/src/assets/images/weather/202.png b/src/assets/images/weather/202.png deleted file mode 100644 index beb9e70..0000000 Binary files a/src/assets/images/weather/202.png and /dev/null differ diff --git a/src/assets/images/weather/203.png b/src/assets/images/weather/203.png deleted file mode 100644 index a5dcc8c..0000000 Binary files a/src/assets/images/weather/203.png and /dev/null differ diff --git a/src/assets/images/weather/204.png b/src/assets/images/weather/204.png deleted file mode 100644 index bdfee8c..0000000 Binary files a/src/assets/images/weather/204.png and /dev/null differ diff --git a/src/assets/images/weather/205.png b/src/assets/images/weather/205.png deleted file mode 100644 index ce729df..0000000 Binary files a/src/assets/images/weather/205.png and /dev/null differ diff --git a/src/assets/images/weather/206.png b/src/assets/images/weather/206.png deleted file mode 100644 index 75feb2f..0000000 Binary files a/src/assets/images/weather/206.png and /dev/null differ diff --git a/src/assets/images/weather/207.png b/src/assets/images/weather/207.png deleted file mode 100644 index 865ca06..0000000 Binary files a/src/assets/images/weather/207.png and /dev/null differ diff --git a/src/assets/images/weather/208.png b/src/assets/images/weather/208.png deleted file mode 100644 index f05b0b4..0000000 Binary files a/src/assets/images/weather/208.png and /dev/null differ diff --git a/src/assets/images/weather/209.png b/src/assets/images/weather/209.png deleted file mode 100644 index 6dedb18..0000000 Binary files a/src/assets/images/weather/209.png and /dev/null differ diff --git a/src/assets/images/weather/210.png b/src/assets/images/weather/210.png deleted file mode 100644 index 0534bbc..0000000 Binary files a/src/assets/images/weather/210.png and /dev/null differ diff --git a/src/assets/images/weather/211.png b/src/assets/images/weather/211.png deleted file mode 100644 index ddfcfa0..0000000 Binary files a/src/assets/images/weather/211.png and /dev/null differ diff --git a/src/assets/images/weather/212.png b/src/assets/images/weather/212.png deleted file mode 100644 index 6ca8532..0000000 Binary files a/src/assets/images/weather/212.png and /dev/null differ diff --git a/src/assets/images/weather/213.png b/src/assets/images/weather/213.png deleted file mode 100644 index 9a835a3..0000000 Binary files a/src/assets/images/weather/213.png and /dev/null differ diff --git a/src/assets/images/weather/300.png b/src/assets/images/weather/300.png deleted file mode 100644 index bf45370..0000000 Binary files a/src/assets/images/weather/300.png and /dev/null differ diff --git a/src/assets/images/weather/300n.png b/src/assets/images/weather/300n.png deleted file mode 100644 index 4d2f613..0000000 Binary files a/src/assets/images/weather/300n.png and /dev/null differ diff --git a/src/assets/images/weather/301.png b/src/assets/images/weather/301.png deleted file mode 100644 index 911b671..0000000 Binary files a/src/assets/images/weather/301.png and /dev/null differ diff --git a/src/assets/images/weather/301n.png b/src/assets/images/weather/301n.png deleted file mode 100644 index 07f6daa..0000000 Binary files a/src/assets/images/weather/301n.png and /dev/null differ diff --git a/src/assets/images/weather/302.png b/src/assets/images/weather/302.png deleted file mode 100644 index 725bcc2..0000000 Binary files a/src/assets/images/weather/302.png and /dev/null differ diff --git a/src/assets/images/weather/303.png b/src/assets/images/weather/303.png deleted file mode 100644 index 48b46b8..0000000 Binary files a/src/assets/images/weather/303.png and /dev/null differ diff --git a/src/assets/images/weather/304.png b/src/assets/images/weather/304.png deleted file mode 100644 index 18bf931..0000000 Binary files a/src/assets/images/weather/304.png and /dev/null differ diff --git a/src/assets/images/weather/305.png b/src/assets/images/weather/305.png deleted file mode 100644 index 9a7fc90..0000000 Binary files a/src/assets/images/weather/305.png and /dev/null differ diff --git a/src/assets/images/weather/306.png b/src/assets/images/weather/306.png deleted file mode 100644 index c1b781b..0000000 Binary files a/src/assets/images/weather/306.png and /dev/null differ diff --git a/src/assets/images/weather/307.png b/src/assets/images/weather/307.png deleted file mode 100644 index c862efb..0000000 Binary files a/src/assets/images/weather/307.png and /dev/null differ diff --git a/src/assets/images/weather/309.png b/src/assets/images/weather/309.png deleted file mode 100644 index 4139622..0000000 Binary files a/src/assets/images/weather/309.png and /dev/null differ diff --git a/src/assets/images/weather/310.png b/src/assets/images/weather/310.png deleted file mode 100644 index 234a798..0000000 Binary files a/src/assets/images/weather/310.png and /dev/null differ diff --git a/src/assets/images/weather/311.png b/src/assets/images/weather/311.png deleted file mode 100644 index 85c7422..0000000 Binary files a/src/assets/images/weather/311.png and /dev/null differ diff --git a/src/assets/images/weather/312.png b/src/assets/images/weather/312.png deleted file mode 100644 index 271e445..0000000 Binary files a/src/assets/images/weather/312.png and /dev/null differ diff --git a/src/assets/images/weather/313.png b/src/assets/images/weather/313.png deleted file mode 100644 index 98a2d8a..0000000 Binary files a/src/assets/images/weather/313.png and /dev/null differ diff --git a/src/assets/images/weather/314.png b/src/assets/images/weather/314.png deleted file mode 100644 index b8bb2ba..0000000 Binary files a/src/assets/images/weather/314.png and /dev/null differ diff --git a/src/assets/images/weather/315.png b/src/assets/images/weather/315.png deleted file mode 100644 index d0fc386..0000000 Binary files a/src/assets/images/weather/315.png and /dev/null differ diff --git a/src/assets/images/weather/316.png b/src/assets/images/weather/316.png deleted file mode 100644 index fe71e90..0000000 Binary files a/src/assets/images/weather/316.png and /dev/null differ diff --git a/src/assets/images/weather/317.png b/src/assets/images/weather/317.png deleted file mode 100644 index 95266d4..0000000 Binary files a/src/assets/images/weather/317.png and /dev/null differ diff --git a/src/assets/images/weather/318.png b/src/assets/images/weather/318.png deleted file mode 100644 index 2b4f5a3..0000000 Binary files a/src/assets/images/weather/318.png and /dev/null differ diff --git a/src/assets/images/weather/399.png b/src/assets/images/weather/399.png deleted file mode 100644 index 9c7d500..0000000 Binary files a/src/assets/images/weather/399.png and /dev/null differ diff --git a/src/assets/images/weather/400.png b/src/assets/images/weather/400.png deleted file mode 100644 index d860976..0000000 Binary files a/src/assets/images/weather/400.png and /dev/null differ diff --git a/src/assets/images/weather/401.png b/src/assets/images/weather/401.png deleted file mode 100644 index e3dffa0..0000000 Binary files a/src/assets/images/weather/401.png and /dev/null differ diff --git a/src/assets/images/weather/402.png b/src/assets/images/weather/402.png deleted file mode 100644 index e168aff..0000000 Binary files a/src/assets/images/weather/402.png and /dev/null differ diff --git a/src/assets/images/weather/403.png b/src/assets/images/weather/403.png deleted file mode 100644 index 277a4f0..0000000 Binary files a/src/assets/images/weather/403.png and /dev/null differ diff --git a/src/assets/images/weather/404.png b/src/assets/images/weather/404.png deleted file mode 100644 index 4d64601..0000000 Binary files a/src/assets/images/weather/404.png and /dev/null differ diff --git a/src/assets/images/weather/405.png b/src/assets/images/weather/405.png deleted file mode 100644 index 0278222..0000000 Binary files a/src/assets/images/weather/405.png and /dev/null differ diff --git a/src/assets/images/weather/406.png b/src/assets/images/weather/406.png deleted file mode 100644 index 66451ae..0000000 Binary files a/src/assets/images/weather/406.png and /dev/null differ diff --git a/src/assets/images/weather/406n.png b/src/assets/images/weather/406n.png deleted file mode 100644 index fd16249..0000000 Binary files a/src/assets/images/weather/406n.png and /dev/null differ diff --git a/src/assets/images/weather/407.png b/src/assets/images/weather/407.png deleted file mode 100644 index 745ef3d..0000000 Binary files a/src/assets/images/weather/407.png and /dev/null differ diff --git a/src/assets/images/weather/407n.png b/src/assets/images/weather/407n.png deleted file mode 100644 index 595bd98..0000000 Binary files a/src/assets/images/weather/407n.png and /dev/null differ diff --git a/src/assets/images/weather/408.png b/src/assets/images/weather/408.png deleted file mode 100644 index 653e855..0000000 Binary files a/src/assets/images/weather/408.png and /dev/null differ diff --git a/src/assets/images/weather/409.png b/src/assets/images/weather/409.png deleted file mode 100644 index 7ec8eb3..0000000 Binary files a/src/assets/images/weather/409.png and /dev/null differ diff --git a/src/assets/images/weather/410.png b/src/assets/images/weather/410.png deleted file mode 100644 index 392262b..0000000 Binary files a/src/assets/images/weather/410.png and /dev/null differ diff --git a/src/assets/images/weather/499.png b/src/assets/images/weather/499.png deleted file mode 100644 index 3592c5a..0000000 Binary files a/src/assets/images/weather/499.png and /dev/null differ diff --git a/src/assets/images/weather/500.png b/src/assets/images/weather/500.png deleted file mode 100644 index 9212fde..0000000 Binary files a/src/assets/images/weather/500.png and /dev/null differ diff --git a/src/assets/images/weather/501.png b/src/assets/images/weather/501.png deleted file mode 100644 index f73e635..0000000 Binary files a/src/assets/images/weather/501.png and /dev/null differ diff --git a/src/assets/images/weather/502.png b/src/assets/images/weather/502.png deleted file mode 100644 index e57b9e7..0000000 Binary files a/src/assets/images/weather/502.png and /dev/null differ diff --git a/src/assets/images/weather/503.png b/src/assets/images/weather/503.png deleted file mode 100644 index 7ced674..0000000 Binary files a/src/assets/images/weather/503.png and /dev/null differ diff --git a/src/assets/images/weather/504.png b/src/assets/images/weather/504.png deleted file mode 100644 index 427a14b..0000000 Binary files a/src/assets/images/weather/504.png and /dev/null differ diff --git a/src/assets/images/weather/507.png b/src/assets/images/weather/507.png deleted file mode 100644 index 4d56b95..0000000 Binary files a/src/assets/images/weather/507.png and /dev/null differ diff --git a/src/assets/images/weather/508.png b/src/assets/images/weather/508.png deleted file mode 100644 index 978c842..0000000 Binary files a/src/assets/images/weather/508.png and /dev/null differ diff --git a/src/assets/images/weather/509.png b/src/assets/images/weather/509.png deleted file mode 100644 index 2a86f20..0000000 Binary files a/src/assets/images/weather/509.png and /dev/null differ diff --git a/src/assets/images/weather/510.png b/src/assets/images/weather/510.png deleted file mode 100644 index 199b6c1..0000000 Binary files a/src/assets/images/weather/510.png and /dev/null differ diff --git a/src/assets/images/weather/511.png b/src/assets/images/weather/511.png deleted file mode 100644 index 4d59f9a..0000000 Binary files a/src/assets/images/weather/511.png and /dev/null differ diff --git a/src/assets/images/weather/512.png b/src/assets/images/weather/512.png deleted file mode 100644 index 37b2aff..0000000 Binary files a/src/assets/images/weather/512.png and /dev/null differ diff --git a/src/assets/images/weather/513.png b/src/assets/images/weather/513.png deleted file mode 100644 index 5289bdf..0000000 Binary files a/src/assets/images/weather/513.png and /dev/null differ diff --git a/src/assets/images/weather/514.png b/src/assets/images/weather/514.png deleted file mode 100644 index 5f7f9a5..0000000 Binary files a/src/assets/images/weather/514.png and /dev/null differ diff --git a/src/assets/images/weather/515.png b/src/assets/images/weather/515.png deleted file mode 100644 index 2e5d10f..0000000 Binary files a/src/assets/images/weather/515.png and /dev/null differ diff --git a/src/assets/images/weather/900.png b/src/assets/images/weather/900.png deleted file mode 100644 index 541d587..0000000 Binary files a/src/assets/images/weather/900.png and /dev/null differ diff --git a/src/assets/images/weather/901.png b/src/assets/images/weather/901.png deleted file mode 100644 index 2e3f772..0000000 Binary files a/src/assets/images/weather/901.png and /dev/null differ diff --git a/src/assets/images/weather/999.png b/src/assets/images/weather/999.png deleted file mode 100644 index 5f9f275..0000000 Binary files a/src/assets/images/weather/999.png and /dev/null differ diff --git a/src/assets/images/底bg.png b/src/assets/images/底bg.png deleted file mode 100644 index 4d02e3a..0000000 Binary files a/src/assets/images/底bg.png and /dev/null differ diff --git a/src/assets/images/选中.png b/src/assets/images/选中.png deleted file mode 100644 index c83651c..0000000 Binary files a/src/assets/images/选中.png and /dev/null differ diff --git a/src/assets/js/getData1.js b/src/assets/js/getData1.js new file mode 100644 index 0000000..a606e43 --- /dev/null +++ b/src/assets/js/getData1.js @@ -0,0 +1,22 @@ +import {post} from '@js/http.js' + +/** 1.1设备实时状态 */ +export const deviceStatus = (id) => post('api/deviceScreen/deviceStatus', {}) +/** 1.2设备综合效率OEE&产能利用效率TEEP */ +export const oeeAndTeep = (id) => post('api/deviceScreen/oeeAndTeep', {}) +/** 1.3运行设备大类产能比 */ +export const queryDeviceByWork = (id) => post('api/deviceScreen/queryDeviceByWork', {}) +/** 1.4设备TOP10故障次数 */ +export const deviceErrorNum = (id) => post('api/deviceScreen/deviceErrorNum', {}) +/** 1.5设备管理 */ +export const deviceManage = (id) => post('api/deviceScreen/deviceManage', {}) +/** 1.6设备综合统计 */ +export const deviceCensus = (id) => post('api/deviceScreen/deviceCensus', {}) +/** 1.7设备报警信息 */ +export const deviceErrorInfo = (id) => post('api/deviceScreen/deviceErrorInfo', {}) +/** 1.8设备产能利用 */ +export const deviceUseRate = (id) => post('api/deviceScreen/deviceUseRate', {}) +/** 1.9设备状态列表 */ +export const deviceStatusList = (id) => post('api/deviceScreen/deviceStatusList', {}) +/** 1.10近30天设备故障统计 */ +export const errCensus = (id) => post('api/deviceScreen/errCensus', {}) diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js new file mode 100644 index 0000000..39acfde --- /dev/null +++ b/src/assets/js/getData2.js @@ -0,0 +1,34 @@ +import {post, post1} from '@js/http.js' + +/** 1.1配粉设备下拉框 */ +export const queryDevice = (url) => post1(url + '/api/screen/pdm/queryDevice', {}) + +/** 1.1大屏左一 */ +export const planReached = (id) => post('api/bigscreen/product/planReached', {}) + +/** 1.2大屏左二 */ +export const worksectionHarvest = (id) => post('api/bigscreen/product/worksectionHarvest', {}) + +/** 1.3大屏左三 */ +export const monthHarvest = (id) => post('api/bigscreen/product/monthHarvest', {}) + +/** 1.4大屏右一 */ +export const output = (id) => post('api/bigscreen/product/output', {}) + +/** 1.5大屏右二 */ +export const topHarvest = (id) => post('api/bigscreen/product/topHarvest', {}) + +/** 1.6大屏右三 */ +export const monthOrder = (id) => post('api/bigscreen/product/monthOrder', {}) + +/** 1.7大屏中一 */ +export const productSchedule = (id) => post('api/bigscreen/product/productSchedule', {}) + +/** 1.8大屏中二 */ +export const unfinishOrder = (id) => post('api/bigscreen/product/unfinishOrder', {}) + +// 车间看板 +// 1.1任务数 +export const getTask = (id) => post('api/agvBigScreen/getTask', {}) +// 1.2车辆状态 +export const getAgvMsg = (id) => post('api/agvBigScreen/getAgvMsg', {}) diff --git a/src/assets/js/http.js b/src/assets/js/http.js new file mode 100644 index 0000000..5a12266 --- /dev/null +++ b/src/assets/js/http.js @@ -0,0 +1,78 @@ +import axios from 'axios' +import { Dialog, toast } from './mUtils.js' +import store from '../../vuex/store' +import router from '@/router' + +axios.defaults.timeout = 50000 +axios.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8' + +axios.interceptors.request.use( + config => { + if (config.method === 'post') { + if (!config.data.flag) { + config.data = config.data + } else { + config.data = config.data.formData + } + } + return config + }, + error => { + Dialog('错误的传参') + return Promise.reject(error) + } +) + +axios.interceptors.response.use( + response => { + if (response.status === 200) { + return Promise.resolve(response) + } else { + return Promise.reject(response) + } + }, + error => { + if (error && error.response) { + switch (error.response.status) { + case 401: + toast(error.response.data.message) + store.dispatch('setSignOut') + router.push('/login') + break + } + return Promise.reject(error.response.data) + } else { + return Promise.reject(error) + } + } +) + +export const post = (sevmethod, params) => { + return new Promise((resolve, reject) => { + axios.post(`${store.getters.baseUrl}/` + sevmethod, params) + .then(response => { + resolve(response.data) + }, error => { + // toast(error.message) + reject(error.message) + }) + .catch((error) => { + reject(error) + }) + }) +} + +export const post1 = (sevmethod, params) => { + return new Promise((resolve, reject) => { + axios.post(sevmethod, params) + .then(response => { + resolve(response.data) + }, error => { + Dialog(error.message) + reject(error.message) + }) + .catch((error) => { + reject(error) + }) + }) +} diff --git a/src/assets/tweetsip.mp4 b/src/assets/tweetsip.mp4 deleted file mode 100644 index c8c31b1..0000000 Binary files a/src/assets/tweetsip.mp4 and /dev/null differ diff --git a/src/components/DropdownMenu.vue b/src/components/DropdownMenu.vue new file mode 100644 index 0000000..6dfe33d --- /dev/null +++ b/src/components/DropdownMenu.vue @@ -0,0 +1,214 @@ + + + + + diff --git a/src/components/dialog.vue b/src/components/dialog.vue index 4de722d..0df4868 100644 --- a/src/components/dialog.vue +++ b/src/components/dialog.vue @@ -73,6 +73,7 @@ export default { top 50% left 50% width 20% + min-width 260px transition .3s transform translate3d(-50%, -50%, 0) overflow hidden @@ -87,7 +88,8 @@ export default { .text padding .25rem max-height 60vh - font-size .16rem + font-size .22rem + line-height .3rem color #333 overflow-y auto text-align center @@ -115,4 +117,7 @@ export default { line-height .5rem color #e74f1a background-color #2778f3 + border none + span + font-size .22rem diff --git a/src/components/header.vue b/src/components/header.vue index a91aa7c..4a9e63f 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -1,58 +1,48 @@ + + diff --git a/src/components/toast.vue b/src/components/toast.vue index 91cbbe8..4d6a672 100644 --- a/src/components/toast.vue +++ b/src/components/toast.vue @@ -35,9 +35,10 @@ export default { .text display inline-block width auto - padding 0 10px + padding .1rem border-radius 10px background rgba(0, 0, 0, 0.6) - font-size .16rem + font-size .22rem + line-height inherit color #fff diff --git a/src/fetch/api.js b/src/fetch/api.js deleted file mode 100644 index 15d2c3b..0000000 --- a/src/fetch/api.js +++ /dev/null @@ -1,68 +0,0 @@ -import axios from 'axios' -import qs from 'qs' -import { Dialog } from '@js/mUtils.js' -import store from '../vuex/store' - -axios.defaults.timeout = 50000 -// axios.defaults.retry = 4 -// axios.defaults.retryDelay = 5000 -axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8' - -axios.interceptors.request.use( - config => { - if (config.method === 'post') { - if (!config.data.flag) { - config.data = qs.stringify(config.data) - } else { - config.data = config.data.formData - } - } - return config - }, - error => { - Dialog(error.message) - return Promise.reject(error) - // let config = error.config - // if (!config || !config.retry) return Promise.reject(error) - // config.__retryCount = config.__retryCount || 0 - // if (config.__retryCount >= config.retry) { - // return Promise.reject(error) - // } - // config.__retryCount += 1 - // let backoff = new Promise(resolve => { - // setTimeout(() => { - // resolve() - // }, config.retryDelay || 1) - // }) - // return backoff.then(() => { - // return axios(config) - // }) - } -) - -axios.interceptors.response.use( - response => { - return Promise.resolve(response) - }, - error => { - Dialog(error.message) - return Promise.reject(error) - } -) - -export const post = (params) => { - return new Promise((resolve, reject) => { - axios.post(`${store.getters.baseUrl}/wdk?action=wdk.pub&method=call_service&ajaxparam=` + new Date().getTime(), params) - .then(response => { - // if (response.data.code === '0') { - // Dialog(response.data.desc) - // } - resolve(response.data) - }, error => { - reject(error.message) - }) - .catch((error) => { - reject(error) - }) - }) -} diff --git a/src/main.js b/src/main.js index 1bb713c..b9f87f0 100644 --- a/src/main.js +++ b/src/main.js @@ -3,21 +3,19 @@ import Vue from 'vue' import App from './App' import router from './router' import store from './vuex/store' -import _ from 'lodash' import '@css/reset.css' import '@css/layout.styl' -import '@js/rem.js' +// import '@js/rem.js' import filter from '@js/filter.js' import { Dialog, toast } from '@js/mUtils.js' -import {post} from '@fetch/api.js' -import echarts from 'echarts' +import {post} from '@js/http.js' +import * as echarts from 'echarts' import VueParticles from 'vue-particles' import scroll from 'vue-seamless-scroll' for (let k in filter) { Vue.filter(k, filter[k]) } -window._ = _ Vue.prototype.$echarts = echarts Vue.prototype.Dialog = Dialog Vue.prototype.toast = toast diff --git a/src/pages/Animation.vue b/src/pages/Animation.vue deleted file mode 100644 index 5f055d1..0000000 --- a/src/pages/Animation.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - - diff --git a/src/pages/DeviceIntro.vue b/src/pages/DeviceIntro.vue deleted file mode 100644 index 3cff00e..0000000 --- a/src/pages/DeviceIntro.vue +++ /dev/null @@ -1,199 +0,0 @@ - - - - - diff --git a/src/pages/DeviceScreen.1.vue b/src/pages/DeviceScreen.1.vue new file mode 100644 index 0000000..f6569f4 --- /dev/null +++ b/src/pages/DeviceScreen.1.vue @@ -0,0 +1,1740 @@ + + + + + diff --git a/src/pages/DeviceScreen.vue b/src/pages/DeviceScreen.vue new file mode 100644 index 0000000..6c67a5a --- /dev/null +++ b/src/pages/DeviceScreen.vue @@ -0,0 +1,2045 @@ + + + + + diff --git a/src/pages/Fault.vue b/src/pages/Fault.vue deleted file mode 100644 index 7b6e36d..0000000 --- a/src/pages/Fault.vue +++ /dev/null @@ -1,36 +0,0 @@ - - - - - diff --git a/src/pages/HomeScreen.vue b/src/pages/HomeScreen.vue new file mode 100644 index 0000000..98fe41b --- /dev/null +++ b/src/pages/HomeScreen.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/src/pages/Login.vue b/src/pages/Login.vue deleted file mode 100644 index 9276505..0000000 --- a/src/pages/Login.vue +++ /dev/null @@ -1,281 +0,0 @@ - - - - - diff --git a/src/pages/Monitor.vue b/src/pages/Monitor.vue deleted file mode 100644 index ff8c100..0000000 --- a/src/pages/Monitor.vue +++ /dev/null @@ -1,483 +0,0 @@ - - - - - diff --git a/src/pages/MonitorCenter2/Animation.vue b/src/pages/MonitorCenter2/Animation.vue deleted file mode 100644 index 5faa446..0000000 --- a/src/pages/MonitorCenter2/Animation.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - - diff --git a/src/pages/MonitorCenter2/Monitor2.vue b/src/pages/MonitorCenter2/Monitor2.vue deleted file mode 100644 index a6424ca..0000000 --- a/src/pages/MonitorCenter2/Monitor2.vue +++ /dev/null @@ -1,416 +0,0 @@ - - - - - diff --git a/src/pages/MonitorCenter2/ProData.vue b/src/pages/MonitorCenter2/ProData.vue deleted file mode 100644 index 0e79c2f..0000000 --- a/src/pages/MonitorCenter2/ProData.vue +++ /dev/null @@ -1,467 +0,0 @@ - - - - - diff --git a/src/pages/MonitorCenter2/WorkShop.vue b/src/pages/MonitorCenter2/WorkShop.vue deleted file mode 100644 index 4983fb1..0000000 --- a/src/pages/MonitorCenter2/WorkShop.vue +++ /dev/null @@ -1,705 +0,0 @@ - - - diff --git a/src/pages/MonitorCenter2/index.vue b/src/pages/MonitorCenter2/index.vue deleted file mode 100644 index 8502e85..0000000 --- a/src/pages/MonitorCenter2/index.vue +++ /dev/null @@ -1,65 +0,0 @@ - - - diff --git a/src/pages/MonitoringScreen.vue b/src/pages/MonitoringScreen.vue new file mode 100644 index 0000000..72fb52c --- /dev/null +++ b/src/pages/MonitoringScreen.vue @@ -0,0 +1,1306 @@ + + + + + diff --git a/src/pages/MonitoringScreen2.vue b/src/pages/MonitoringScreen2.vue new file mode 100644 index 0000000..1a2490f --- /dev/null +++ b/src/pages/MonitoringScreen2.vue @@ -0,0 +1,1089 @@ + + + + + diff --git a/src/pages/ProduceData.vue b/src/pages/ProduceData.vue deleted file mode 100644 index 524441b..0000000 --- a/src/pages/ProduceData.vue +++ /dev/null @@ -1,577 +0,0 @@ - - - - - diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue new file mode 100644 index 0000000..9364375 --- /dev/null +++ b/src/pages/Setup.vue @@ -0,0 +1,232 @@ + + + + + diff --git a/src/pages/StorageData.vue b/src/pages/StorageData.vue deleted file mode 100644 index 33e9044..0000000 --- a/src/pages/StorageData.vue +++ /dev/null @@ -1,761 +0,0 @@ - - - - - diff --git a/src/pages/StorageData1.vue b/src/pages/StorageData1.vue deleted file mode 100644 index 9133c15..0000000 --- a/src/pages/StorageData1.vue +++ /dev/null @@ -1,751 +0,0 @@ - - - - - diff --git a/src/pages/StorageTank.vue b/src/pages/StorageTank.vue deleted file mode 100644 index 1c63602..0000000 --- a/src/pages/StorageTank.vue +++ /dev/null @@ -1,305 +0,0 @@ - - - - - diff --git a/src/pages/TaskScreen.vue b/src/pages/TaskScreen.vue new file mode 100644 index 0000000..acb2d6f --- /dev/null +++ b/src/pages/TaskScreen.vue @@ -0,0 +1,775 @@ + + + + + diff --git a/src/pages/WorkShop.vue b/src/pages/WorkShop.vue deleted file mode 100644 index 28a0fe5..0000000 --- a/src/pages/WorkShop.vue +++ /dev/null @@ -1,620 +0,0 @@ - - - diff --git a/src/pages/WorkStep.vue b/src/pages/WorkStep.vue new file mode 100644 index 0000000..65d417a --- /dev/null +++ b/src/pages/WorkStep.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/src/pages/WorkshopScreen.vue b/src/pages/WorkshopScreen.vue new file mode 100644 index 0000000..29eeab4 --- /dev/null +++ b/src/pages/WorkshopScreen.vue @@ -0,0 +1,57 @@ + + + + + diff --git a/src/pages/management/WanTui.vue b/src/pages/management/WanTui.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/pages/management/ZhiPanGuan.vue b/src/pages/management/ZhiPanGuan.vue deleted file mode 100644 index e69de29..0000000 diff --git a/src/router/index.js b/src/router/index.js index d08f22f..1ccdf4c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,21 +1,12 @@ import Vue from 'vue' import Router from 'vue-router' -// 接口数据测试 start -// import MonitorCenter2 from '@page/MonitorCenter2/index.vue' -// import WorkShop2 from '@page/MonitorCenter2/WorkShop.vue' -// import Animation2 from '@page/MonitorCenter2/Animation.vue' -// const ProduceData = r => require.ensure([], () => r(require('@page/MonitorCenter2/ProData')), 'ProData') -// 接口数据测试 end -const Login = r => require.ensure([], () => r(require('@page/Login')), 'Login') -// const WorkShop = r => require.ensure([], () => r(require('@page/MonitorCenter2/WorkShop')), 'WorkShop') -const WorkShop = r => require.ensure([], () => r(require('@page/WorkShop')), 'WorkShop') -const Monitor = r => require.ensure([], () => r(require('@page/Monitor')), 'Monitor') -const Animation = r => require.ensure([], () => r(require('@page/Animation')), 'Animation') -const DeviceIntro = r => require.ensure([], () => r(require('@page/DeviceIntro')), 'DeviceIntro') -const ProduceData = r => require.ensure([], () => r(require('@page/ProduceData')), 'ProduceData') -const StorageTank = r => require.ensure([], () => r(require('@page/StorageTank')), 'StorageTank') -const Fault = r => require.ensure([], () => r(require('@page/Fault')), 'Fault') -const StorageData = r => require.ensure([], () => r(require('@page/StorageData')), 'StorageData') + +const Setup = r => require.ensure([], () => r(require('@page/Setup')), 'Setup') +const MonitoringScreen = r => require.ensure([], () => r(require('@page/MonitoringScreen')), 'MonitoringScreen') +const DeviceScreen = r => require.ensure([], () => r(require('@page/DeviceScreen')), 'DeviceScreen') +const WorkshopScreen = r => require.ensure([], () => r(require('@page/WorkshopScreen')), 'WorkshopScreen') +const HomeScreen = r => require.ensure([], () => r(require('@page/HomeScreen')), 'HomeScreen') + Vue.use(Router) export default new Router({ @@ -23,52 +14,27 @@ export default new Router({ routes: [ { path: '/', - redirect: '/login' + redirect: '/setup' }, { - path: '/login', - name: 'Login', - component: Login + path: '/setup', + component: Setup }, { - path: '/fault', - name: 'Fault', - component: Fault + path: '/MonitoringScreen', + component: MonitoringScreen }, { - path: '/workshop', - name: 'WorkShop', - component: WorkShop + path: '/devicescreen', + component: DeviceScreen }, { - path: '/monitor', - name: 'Monitor', - component: Monitor + path: '/WorkshopScreen', + component: WorkshopScreen }, { - path: '/animation', - name: 'Animation', - component: Animation - }, - { - path: '/deviceintro', - name: 'DeviceIntro', - component: DeviceIntro - }, - { - path: '/producedata', - name: 'producedata', - component: ProduceData - }, - { - path: '/storagetank', - name: 'storagetank', - component: StorageTank - }, - { - path: '/storageData', - name: 'StorageData', - component: StorageData + path: '/HomeScreen', + component: HomeScreen } ] }) diff --git a/src/vuex/modules/com.js b/src/vuex/modules/com.js index 0342cd0..e1fb638 100644 --- a/src/vuex/modules/com.js +++ b/src/vuex/modules/com.js @@ -1,7 +1,7 @@ import * as types from '../types' import { getStore, setStore } from '@js/mUtils.js' -const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.107:8080/hlapp' : 'http://192.168.46.5:8080/hl_nlapp' +const baseUrl = process.env.NODE_ENV === 'development' ? 'http://192.168.81.156:8010' : 'http://192.168.81.156:8010' /** * App通用配置 @@ -15,13 +15,9 @@ const state = { toastMsg: '退出登录', alertMsg: '操作成功', baseUrl: getStore('baseUrl') || baseUrl, - setTime: getStore('setTime') || 5000, - equipId: getStore('equipId') || 1, - workshopId: getStore('workshopId') || '001.001.007', - stationCode: getStore('stationCode') || '', - equipType: getStore('equipType') || 'LB0001', - imgBaseUrl: getStore('imgBaseUrl') || 'http://192.168.81.138/', - produceId: getStore('produceId') || '1' + setTime: getStore('setTime') || 10000, + setTime1: getStore('setTime1') || 60000, + equipId: getStore('equipId') || '0' } const actions = { @@ -49,12 +45,8 @@ const actions = { setConfig ({commit}, res) { setStore('baseUrl', res.baseUrl) setStore('setTime', res.setTime) + setStore('setTime1', res.setTime1) setStore('equipId', res.equipId) - setStore('workshopId', res.workshopId) - setStore('stationCode', res.stationCode) - setStore('equipType', res.equipType) - setStore('imgBaseUrl', res.imgBaseUrl) - setStore('produceId', res.produceId) commit(types.COM_CONFIG, res) } } @@ -65,12 +57,8 @@ const getters = { showAlert: state => state.showAlert, baseUrl: state => state.baseUrl, setTime: state => state.setTime, - equipId: state => state.equipId, - workshopId: state => state.workshopId, - stationCode: state => state.stationCode, - equipType: state => state.equipType, - imgBaseUrl: state => state.imgBaseUrl, - produceId: state => state.produceId + setTime1: state => state.setTime1, + equipId: state => state.equipId } const mutations = { @@ -105,12 +93,8 @@ const mutations = { [types.COM_CONFIG] (state, res) { state.baseUrl = res.baseUrl state.setTime = res.setTime + state.setTime1 = res.setTime1 state.equipId = res.equipId - state.workshopId = res.workshopId - state.stationCode = res.stationCode - state.equipType = res.equipType - state.imgBaseUrl = res.imgBaseUrl - state.produceId = res.produceId } } diff --git a/yarn.lock b/yarn.lock index e3f1b6c..8e0e817 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2330,12 +2330,13 @@ duplexify@^3.4.2, duplexify@^3.6.0: readable-stream "^2.0.0" stream-shift "^1.0.0" -echarts@^4.2.0-rc.2: - version "4.2.0-rc.2" - resolved "https://registry.yarnpkg.com/echarts/-/echarts-4.2.0-rc.2.tgz#6a98397aafa81b65cbf0bc15d9afdbfb244df91e" - integrity sha512-5Y4Kyi4eNsRM9Cnl7Q8C6PFVjznBJv1VIiMm/VSQ9zyqeo+ce1695GqUd9v4zfVx+Ow1gnwMJX67h0FNvarScw== +echarts@^5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.3.2.tgz#0a7b3be8c48a48b2e7cb1b82121df0c208d42d2c" + integrity sha512-LWCt7ohOKdJqyiBJ0OGBmE9szLdfA9sGcsMEi+GGoc6+Xo75C+BkcT/6NNGRHAWtnQl2fNow05AQjznpap28TQ== dependencies: - zrender "4.0.5" + tslib "2.3.0" + zrender "5.3.1" ee-first@1.1.1: version "1.1.1" @@ -2923,11 +2924,6 @@ faye-websocket@~0.11.0: dependencies: websocket-driver ">=0.5.1" -fetch-jsonp@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/fetch-jsonp/-/fetch-jsonp-1.1.3.tgz#9eb9e585ba08aaf700563538d17bbebbcd5a3db2" - integrity sha1-nrnlhboIqvcAVjU40Xu+u81aPbI= - figures@^2.0.0: version "2.0.0" resolved "http://registry.npm.taobao.org/figures/download/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" @@ -3994,11 +3990,6 @@ isobject@^3.0.0, isobject@^3.0.1: resolved "http://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= -jquery@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca" - integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg== - js-base64@^2.1.9: version "2.4.9" resolved "http://registry.npm.taobao.org/js-base64/download/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03" @@ -4223,7 +4214,7 @@ lodash.uniq@^4.5.0: resolved "http://registry.npm.taobao.org/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0: +lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg== @@ -6746,6 +6737,11 @@ tryer@^1.0.0: resolved "http://registry.npm.taobao.org/tryer/download/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== +tslib@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + tty-browserify@0.0.0: version "0.0.0" resolved "http://registry.npm.taobao.org/tty-browserify/download/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" @@ -7070,9 +7066,9 @@ vue-template-es2015-compiler@^1.6.0: integrity sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg== vue@^2.2.6: - version "2.6.9" - resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.9.tgz#415c1cc1a5ed00c8f0acdd0a948139d12b7ea6b3" - integrity sha512-t1+tvH8hybPM86oNne3ZozCD02zj/VoZIiojOBPJLjwBn7hxYU5e1gBObFpq8ts1NEn1VhPf/hVXBDAJ3X5ljg== + version "2.6.12" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123" + integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg== vue@^2.5.2: version "2.5.17" @@ -7396,7 +7392,9 @@ yargs@~3.10.0: decamelize "^1.0.0" window-size "0.1.0" -zrender@4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/zrender/-/zrender-4.0.5.tgz#6e8f738971ce2cd624aac82b2156729b1c0e5a82" - integrity sha512-SintgipGEJPT9Sz2ABRoE4ZD7Yzy7oR7j7KP6H+C9FlbHWnLUfGVK7E8UV27pGwlxAMB0EsnrqhXx5XjAfv/KA== +zrender@5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.3.1.tgz#fa8e63ac7e719cfd563831fe8c42a9756c5af384" + integrity sha512-7olqIjy0gWfznKr6vgfnGBk7y4UtdMvdwFmK92vVQsQeDPyzkHW1OlrLEKg6GHz1W5ePf0FeN1q2vkl/HFqhXw== + dependencies: + tslib "2.3.0"