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 d19ae0d..055a534 100644 Binary files a/src/assets/css/iconfont/iconfont.ttf 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 index 31debf3..a080bce 100644 Binary files a/src/assets/css/iconfont/iconfont.woff 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 index f9b361d..926a43f 100644 Binary files a/src/assets/css/iconfont/iconfont.woff2 and b/src/assets/css/iconfont/iconfont.woff2 differ 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"