diff --git a/.env.development b/.env.development index 56c364c..f3c2245 100644 --- a/.env.development +++ b/.env.development @@ -1,10 +1,10 @@ VUE_APP_MODE=development VUE_APP_NODE_ENV=development VUE_APP_SCENE=wisdomcar -VUE_APP_BASE_URL=http://www.tall.wiki/ -VUE_APP_API_URL=http://www.tall.wiki/gateway +VUE_APP_BASE_URL=http://test.tall.wiki/ +VUE_APP_API_URL=http://test.tall.wiki/gateway VUE_APP_PROXY_URL=/gateway VUE_APP_PUBLIC_PATH=/wisdomcar -VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws +VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws VUE_APP_TITLE=盐湖区人民医院数字看板 VUE_APP_DESCRIPTION=盐湖区人民医院数字看板s diff --git a/.env.production b/.env.production index 9fd34d3..bcc19d6 100644 --- a/.env.production +++ b/.env.production @@ -1,10 +1,10 @@ VUE_APP_MODE=production VUE_APP_NODE_ENV=production VUE_APP_SCENE=wisdomcar -VUE_APP_BASE_URL=http://www.tall.wiki/ -VUE_APP_API_URL=http://www.tall.wiki/gateway +VUE_APP_BASE_URL=http://test.tall.wiki/ +VUE_APP_API_URL=http://test.tall.wiki/gateway VUE_APP_PROXY_URL=/gateway VUE_APP_PUBLIC_PATH=/wisdomcar -VUE_APP_MSG_URL=wss://www.tall.wiki/websocket/message/v4.0/ws +VUE_APP_MSG_URL=wss://test.tall.wiki/websocket/message/v4.0/ws VUE_APP_TITLE=盐湖区人民医院数字看板 VUE_APP_DESCRIPTION=盐湖区人民医院数字看板 diff --git a/src/App.vue b/src/App.vue index aa264f0..4682795 100644 --- a/src/App.vue +++ b/src/App.vue @@ -19,9 +19,10 @@ export default { computed: mapState('home', ['anyringToken']), created() { - // const userId = '1338747522436435968'; - // const params = { userId }; - // this.getUserId(params); + const query = this.$route.query; + let userId = query && query.userId ? query.userId : '1338747522436435968'; + const params = { userId }; + this.getUserId(params); }, methods: mapActions('home', ['getUserId']), diff --git a/src/components/Duration/Duration.js b/src/components/Duration/Duration.js index c183a21..617ffe5 100644 --- a/src/components/Duration/Duration.js +++ b/src/components/Duration/Duration.js @@ -112,7 +112,7 @@ const mixin = { methods: { async getData() { try { - const params = { param: { id: 0 } }; + const params = { param: { projectId: '1420645306093281280', type: 0 } }; const res = await getPointTime(params); const { code, msg, data } = res.data; if (code === 200) { diff --git a/src/components/Panel/Panel.vue b/src/components/Panel/Panel.vue index 1b806be..46f133a 100644 --- a/src/components/Panel/Panel.vue +++ b/src/components/Panel/Panel.vue @@ -59,7 +59,7 @@ export default { computed: mapState('messages', ['weightMessage', 'bolusDose', 'maintenanceDose', 'thrombolyticDose', 'startMessages', 'rfidMessage']), watch: { rfidMessage(val) { - if (this.startMessages) { + if (this.startMessages || val.step === '0') { this.percent = 0; this.percentA = 0; this.info = '呼叫'; diff --git a/src/components/Statistics/Statistics.js b/src/components/Statistics/Statistics.js index 5bfe278..15a41a8 100644 --- a/src/components/Statistics/Statistics.js +++ b/src/components/Statistics/Statistics.js @@ -151,8 +151,9 @@ const mixin = { try { const params = { param: { - hospitalId: 0, - year: '2020', + projectId: '1420645306093281280', + year: '2021', + type: 0, }, }; const res = await selResult(params); diff --git a/src/config/api.js b/src/config/api.js index eba99ef..e84e207 100644 --- a/src/config/api.js +++ b/src/config/api.js @@ -10,6 +10,7 @@ import axios from 'axios'; let { proxyUrl, msgUrl } = require('@/config/setting'); const wisdomcar = `${proxyUrl}/wisdomcar`; // 盐湖医院分路径 +const qcp = `${proxyUrl}/qcp/v3.0`; // 盐湖医院分路径 const statistics = `${wisdomcar}/statistics`; // 盐湖医院相关接口 const rfid = `${wisdomcar}/rfid`; // rfid增删改查界面相关 @@ -17,12 +18,12 @@ const rfid = `${wisdomcar}/rfid`; // rfid增删改查界面相关 export const WS_BASE_URL = msgUrl; // 按钮模拟信息发送 -export const record = params => axios.post(`${wisdomcar}/debug/record`, params); +export const record = params => axios.post(`${qcp}/debug/record`, params); // 急救数量统计图数据 -export const selResult = params => axios.post(`${statistics}/get/selResult`, params); +export const selResult = params => axios.post(`${qcp}/statistical/selResult`, params); // 急救时长分析统计图数据 -export const getPointTime = params => axios.post(`${statistics}/getPointTime`, params); +export const getPointTime = params => axios.post(`${qcp}/statistical/getPointTime`, params); // 环节查询 export const queryStepList = params => axios.post(`${rfid}/queryStepList`, params); diff --git a/src/mixins/socket.js b/src/mixins/socket.js index aaa1678..528e74c 100644 --- a/src/mixins/socket.js +++ b/src/mixins/socket.js @@ -193,7 +193,8 @@ const mixin = { auth() { // const token = sessionStorage.getItem('anyringToken'); // if (!token) return; - const userId = '1338747522436435968'; + const query = this.$route.query; + const userId = query && query.userId ? query.userId : '1338747522436435968'; const data = { type: 'Auth', data: { userId }, major: 1, minor: 1 }; this.sendSocketMessage(data); }, diff --git a/src/views/BtnPage/BtnPage.vue b/src/views/BtnPage/BtnPage.vue index 85770ad..8a8693c 100644 --- a/src/views/BtnPage/BtnPage.vue +++ b/src/views/BtnPage/BtnPage.vue @@ -20,55 +20,55 @@ export default { nameList: [ { name: '呼叫', - value: '1', + value: '000101000001', }, { name: '分诊', - value: '2', + value: '000102000001', }, { name: '一线', - value: '3', + value: '000101000003', }, { name: '采血', - value: '4', + value: '000101000004', }, { name: '心电', - value: '5', + value: '000101000005', }, { name: 'CT', - value: '6', + value: '000102000003', }, { name: '二线', - value: '7', + value: '000101000007', }, { name: '谈话', - value: '8', + value: '000101000008', }, { name: '签字', - value: '9', + value: '000101000009', }, { name: '团注', - value: '10', + value: '00010100000A', }, { name: '介入', - value: '11', + value: '000102000005', }, { name: '置鞘', - value: '12', + value: '00010100000C', }, { name: '病房', - value: '13', + value: '00010100000D', }, // { // name: '分诊区',