From 19fe1e4c8ac2bf28579f3ca7a44fcc488b23c9f8 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Tue, 22 Nov 2022 16:43:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=92=AD=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/assets/css/iconfont.styl | 12 ++++- src/assets/css/iconfont/iconfont.json | 28 +++--------- src/assets/css/iconfont/iconfont.ttf | Bin 2052 -> 2016 bytes src/assets/css/iconfont/iconfont.woff | Bin 1376 -> 1356 bytes src/assets/css/iconfont/iconfont.woff2 | Bin 944 -> 976 bytes src/assets/js/getData2.js | 13 ++++++ src/assets/js/http.js | 2 +- src/pages/DeviceManage.vue | 60 ++++++++++++++++++++++--- src/pages/playVoice.vue | 52 +++++++++++++++++++++ src/router/index.js | 5 +++ yarn.lock | 5 +++ 12 files changed, 149 insertions(+), 29 deletions(-) create mode 100644 src/pages/playVoice.vue diff --git a/package.json b/package.json index 8ec84e6..8c24e7b 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "axios": "^0.18.0", "babel-polyfill": "^6.26.0", "echarts": "^5.3.2", + "speak-tts": "^2.0.8", "stylus": "^0.54.5", "stylus-loader": "^3.0.2", "vue": "^2.5.2", diff --git a/src/assets/css/iconfont.styl b/src/assets/css/iconfont.styl index 911c75e..4774a7d 100644 --- a/src/assets/css/iconfont.styl +++ b/src/assets/css/iconfont.styl @@ -7,7 +7,7 @@ .iconfont { font-family: "iconfont" !important; - font-size: 16px; + font-size: .16rem; font-style: normal; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -15,4 +15,12 @@ .icon-guanbi:before { content: "\e60f"; -} \ No newline at end of file +} + +.ifon_broadcast + color #fff +.ifon_broadcast:before { + content: '\e600' +} +.ifon_broadcast_active + color #f17d3a \ No newline at end of file diff --git a/src/assets/css/iconfont/iconfont.json b/src/assets/css/iconfont/iconfont.json index 34ac18f..f977773 100644 --- a/src/assets/css/iconfont/iconfont.json +++ b/src/assets/css/iconfont/iconfont.json @@ -1,30 +1,16 @@ { - "id": "1255596", - "name": "nl-hht-hl", + "id": "3109872", + "name": "no name", "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": "201560", + "name": "喇叭", + "font_class": "laba", + "unicode": "e600", + "unicode_decimal": 58880 }, { "icon_id": "4736203", diff --git a/src/assets/css/iconfont/iconfont.ttf b/src/assets/css/iconfont/iconfont.ttf index d19ae0d69deb508c110d24f379a84e2089fd95d5..055a534c2017949598cae7093507d80c487d90ce 100644 GIT binary patch delta 1065 zcmY*XOHUI~6h3$E%$-+Z2AnA(1WLuJmJ%qBVk{6*iB-c2f+i|DwB->fphARIA);~N z0-ZnLW8)(vE;Z4(R5wO9YK&154Qk@b#0Vx(&$Oe7w>kHG=X~G!=Jw7k>MPn(P1a0& z1Rz%c;B+!$Po*xte1Y{E#--u$xuNdJXB~iE#`?iX+D-+N#xvBeV8lkSA%38Xh#z6p zj%221eF#wd9XH?jWYUJa@E+&qv6eFS>=Y>l)RV1P2PW)HI;-DmzYien1>lCKCeKZG zz5Ub(Al^nn8xVIiHxDOxECF!G&VP&MJJ@Z%H`Z}VYySyqLHqH>*R-oF8=iL~xt}7mdFy{>S+nML&Y~kW|BI7RPRx!EZ`mbt*_;+~sRt13E zI=zm6i$E3ZhU0J^U`Lc%+k?zB%KT-1Lu6txF%5rnQ(LSp))KO4ixu+tDq=7Zg)SNG z%o1v0i9dI`#PG)n8dMXP?Iax}){3LlFrzphvg%0CYAtDr#Yx_{t;8_t=z`2tO-qC$ zk#ItkHC2@QqRmawSUf5Vs^$yTH-w6Gg-J~v-=tD8&^1tg2leXXt$n-dNmlkTQBnwz z!{x@o+H(DBk<63@eVf%&S#^bL7Boed!imGnM-pM)Cn=f`?LGRuzjyOTJXI-ZswSB| z$9w!DBEB+Bp75Md(bz5N%4SN{Y&@hDmqTN zpA9dgs|6Q4OhAV_E>0rBK`}h^2#Um05A%rMcvt{GeDN^D{)UGY=qE)UR>304{b$qm zbUGCnoC}O5Cnts`C#IbScE-8MEN6}B&O7$XSr!9jlyHO+9{6#4&}PFk_Qc>Q9`O%E C38yCj delta 1081 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 diff --git a/src/assets/css/iconfont/iconfont.woff2 b/src/assets/css/iconfont/iconfont.woff2 index f9b361d1d545ec87b1e7878f7d73ee25fdfc77f1..926a43fb813284efbea48f6a93d6a51bff15793f 100644 GIT binary patch literal 976 zcmV;>126n{Pew8T0RR9100Ynf3jhEB00-az00V*m0RR9100000000000000000000 z0000SR0d!Gg9ZwNID-`dHUcCA3=0SV1Rw>3X9qVM@&?GBnmkz&P(T4ts(=Z7;K5Vf z>)YMCOK(=Il?oQhgfL>E7-V7)`=b9Ry{{K6;Mo%vaz)HfCLf;6!O2PJ#OhprbXV?f zwO0u|@LcZS*xE1&dx4IH(ODoDjwN^%!Uikyed69}W05=y02Zw|v z1M(DxR|maQyC5KKtp-1A>FR~Z8Z!r^5?RH9G+S!35ks)3;##srk_c$e7~~2GbjN=J zyu;7SUqKKIC?A0}*L~eA!|N%SiW0Q{8up`2mq%+W@W8-)V;Whto1TO?G$%;ci9{wj zaD-0k{r{hkuS>#~|9A>X!OF}67}KyK0+$Uz6ct9n_4k7S65s>)G4$$Mo`xBzbJNqg zb=>&z(A`Hh3En=h*6Zm#n)W$X?Md=l9Wb7e`c9NMTz8!e*s_wr+~wYH_aa9{MHh+Pp?VS}N1^ts-y z()->JPJmtW@89z|tLJ|F`_IaFHh1To=l>$%rxNKoYwol8U=jeaT@-==uo3_MNB)NS z!&*HNRrNI)CIZ0!(hLb*u>)L^yhD@Vw}}@Zq0`-9aUI`nfB^Fn@IKN>ON0NE3sClX zxTFGSf=H^QPzfEFq%PUfr|>ei2$D`nn`!Q!QQ;zxI0Rs53xO!Q1(o-ODSAtGbU(bh zX#_=ok@g58M#~rmQX?gp5g8fQAhYCjD2|kc<#rR}3LBKmHlKTym%JP`3Z3k5w{07J#k|Y%Z2^3U;DsTr-ir{HK z+PvNUe&Xq_sb<46i9}RM#H%D|RV+~w*(?5&f7V;bv&rtASM)db`TFUZ`v7fxvql zGeazQpgBk?Ac4+N^Ww~d)T=<0eY<@eQrOFe_Z}#a60j&2U7R& z509)!f~bM=5pbfU3ZK0(LgsUjuu3&aMo4@yh@a)43iKFo4R`^t7G2W_A+=32(fO5J z&xe%uvZplaMSma5x$>rY@MT5jO;_rN*VoKE+LF?aM*DbuKZ`=C4OCx%FwzT#~_4jTa@R^Z)i*D@h zMU|D|P*b8s#QRhjptY2osJ#GUh#G6CU9U`7KoD{D9g- zxIynqgl#xj4#l^cVvb=E@$--(Sj+@jn6Iep!qO}wN7E9{?!#15A}BL0BcG|qW=yA; zqRp1F7$b;KiwV_9$6=$sw?PkFP(_LyC90@(4=gh^MKW_nf0>!6BKIK% SWn_Cvvp6%aWO{M~0001s6S_M9 diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js index fc5e2be..5d5016a 100644 --- a/src/assets/js/getData2.js +++ b/src/assets/js/getData2.js @@ -40,3 +40,16 @@ export const getDeviceYearMainPlan = (id) => post('api/deviceBigScreen/getDevice export const getDeviceGroupStatus = (id) => post('api/deviceBigScreen/getDeviceGroupStatus', {}) /** 8.1当日任务列表 */ export const getTodayTask = (id) => post('api/deviceBigScreen/getTodayTask', {}) +// export const getTodayTask = (id) => { +// let res = { +// code: '1', +// srb: { +// device_group_arr: [{fault_desc: '三六九1', needcast: '1', id: '1'}, {fault_desc: '三六九等了房椒粉', needcast: '1', id: '2'}, {fault_desc: '1', needcast: '1', id: '3'}] +// } +// } +// return res +// } +/** 9.1当日任务列表播报列表 */ +export const updateWarnTime = (ids) => post('api/deviceBigScreen/updateWarnTime', { + ids: ids +}) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 4960031..5917cfb 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -37,7 +37,7 @@ axios.interceptors.response.use( case 401: toast(error.response.data.message) store.dispatch('setSignOut') - router.push('/login') + router.push('/setup1') break } return Promise.reject(error.response.data) diff --git a/src/pages/DeviceManage.vue b/src/pages/DeviceManage.vue index f25d274..3f44a43 100644 --- a/src/pages/DeviceManage.vue +++ b/src/pages/DeviceManage.vue @@ -146,7 +146,7 @@
{{e.input_time}}
{{e.device_name}}
{{e.extend_code}}
-
{{e.fault_desc}}
+
{{e.fault_desc}}
{{e.dept_name}}
{{e.invstatus}}
{{e.user_name}}
@@ -242,7 +242,8 @@ diff --git a/src/router/index.js b/src/router/index.js index d9f028c..ae65097 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -6,6 +6,7 @@ const Setup1 = r => require.ensure([], () => r(require('@page/Setup1')), 'Setup1 const TaskScreen = r => require.ensure([], () => r(require('@page/TaskScreen')), 'TaskScreen') const WorkStep = r => require.ensure([], () => r(require('@page/WorkStep')), 'WorkStep') const DeviceManage = r => require.ensure([], () => r(require('@page/DeviceManage')), 'DeviceManage') +const playVoice = r => require.ensure([], () => r(require('@page/playVoice')), 'playVoice') Vue.use(Router) @@ -35,6 +36,10 @@ export default new Router({ { path: '/DeviceManage', component: DeviceManage + }, + { + path: '/playVoice', + component: playVoice } ] }) diff --git a/yarn.lock b/yarn.lock index 8e0e817..1db2604 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6394,6 +6394,11 @@ spdy@^3.4.1: select-hose "^2.0.0" spdy-transport "^2.0.18" +speak-tts@^2.0.8: + version "2.0.8" + resolved "https://registry.yarnpkg.com/speak-tts/-/speak-tts-2.0.8.tgz#9ed6660fcd710840fcc01144e73ba5ea35f99c1e" + integrity sha512-VY6Q6mRjdou6bF+x0LspvM7GJhBxHx8CLyGPTNQQ7jrztiGutyI4QNZn0cA17c4uk0FnFbA4PaMI3skeZ6PiFg== + split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" resolved "http://registry.npm.taobao.org/split-string/download/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"