-
+
@@ -44,7 +29,7 @@
>
![]()
-
+
@@ -66,25 +51,32 @@
import { mapGetters, mapActions } from "vuex";
import Breadcrumb from "@/components/Breadcrumb";
import Hamburger from "@/components/Hamburger";
-// import Screenfull from "@/components/Screenfull";
-// import SizeSelect from "@/components/SizeSelect";
-// import Search from "@/components/HeaderSearch";
-// import RuoYiGit from "@/components/RuoYi/Git";
-// import RuoYiDoc from "@/components/RuoYi/Doc";
+import { keys, websocketInit, beforeUnmount } from "@/utils/websocket";
export default {
components: {
Breadcrumb,
Hamburger,
- // Screenfull,
- // SizeSelect,
- // Search,
+ },
+ data() {
+ return {
+ msgNum: 0,
+ };
},
created() {
this.init();
+ websocketInit();
+ },
+ mounted() {
+ window.postMessage({ type: keys.GET_UNREAD_COUNT }, window.location.origin);
+ window.addEventListener("message", this.handleOnMessage);
+ },
+ unmounted() {
+ beforeUnmount(1000);
+ window.removeEventListener("message", this.handleOnMessage);
},
computed: {
- ...mapGetters(["sidebar", "avatar", "device"]),
+ ...mapGetters(["sidebar", "avatar", "device", "msgUnreadCount"]),
setting: {
get() {
return this.$store.state.settings.showSettings;
@@ -98,7 +90,14 @@ export default {
},
},
methods: {
- ...mapActions(["init"]),
+ ...mapActions(["init", "updateUnreadCount"]),
+ handleOnMessage({ data }) {
+ if (data.type === keys.WS_TYPE_MESSAGE_COUNT) {
+ this.updateUnreadCount({
+ msgUnreadCount: data.data.count,
+ });
+ }
+ },
toggleSideBar() {
this.$store.dispatch("app/toggleSideBar");
},
diff --git a/stdiet-ui/src/main.js b/stdiet-ui/src/main.js
index 28ac40c5a..f73283d27 100644
--- a/stdiet-ui/src/main.js
+++ b/stdiet-ui/src/main.js
@@ -18,12 +18,12 @@ import "./permission"; // permission control
import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from "@/api/system/config";
import VueScrollTo from "vue-scrollto";
-import VueResource from "vue-resource"
-import HighchartsVue from 'highcharts-vue'
-import Highcharts from 'highcharts'
+import VueResource from "vue-resource";
+import HighchartsVue from "highcharts-vue";
+import Highcharts from "highcharts";
//图片导出模块
-import exportingInit from 'highcharts/modules/exporting'
-exportingInit(Highcharts)
+import exportingInit from "highcharts/modules/exporting";
+exportingInit(Highcharts);
import {
addDateRange,
@@ -111,7 +111,7 @@ Vue.use(VueScrollTo, {
y: true
});
-Vue.use(VueResource)
+Vue.use(VueResource);
new Vue({
el: "#app",
diff --git a/stdiet-ui/src/store/actions.js b/stdiet-ui/src/store/actions.js
index cb89bf4f6..19c8af3a6 100644
--- a/stdiet-ui/src/store/actions.js
+++ b/stdiet-ui/src/store/actions.js
@@ -1,6 +1,9 @@
const actions = {
async init({ dispatch }, payload) {
dispatch("global/init", payload);
+ },
+ async updateUnreadCount({ commit }, payload) {
+ commit("global/save", payload);
}
};
diff --git a/stdiet-ui/src/store/getters.js b/stdiet-ui/src/store/getters.js
index 6275ba5fd..c731df0c2 100644
--- a/stdiet-ui/src/store/getters.js
+++ b/stdiet-ui/src/store/getters.js
@@ -9,12 +9,11 @@ const getters = {
name: state => state.user.name,
introduction: state => state.user.introduction,
roles: state => state.user.roles,
- // roles: state => ["dietician"],
permissions: state => state.user.permissions,
userId: state => state.user.userId,
- // userId: state => 131,
userRemark: state => state.user.remark,
permission_routes: state => state.permission.routes,
+ msgUnreadCount: state => state.global.msgUnreadCount,
//
nutritionistIdOptions: state => state.global.nutritionistIdOptions,
nutriAssisIdOptions: state => state.global.nutriAssisIdOptions,
diff --git a/stdiet-ui/src/store/modules/global.js b/stdiet-ui/src/store/modules/global.js
index 4a12879c4..c0dfee00b 100644
--- a/stdiet-ui/src/store/modules/global.js
+++ b/stdiet-ui/src/store/modules/global.js
@@ -10,6 +10,7 @@ const oriState = {
plannerAssisIdOptions: [],
operatorIdOptions: [],
operatorAssisIdOptions: [],
+ msgUnreadCount: 0,
pushPreSaleIdOptions:[]
};
diff --git a/stdiet-ui/src/store/modules/message.js b/stdiet-ui/src/store/modules/message.js
index bd01aa685..e3643e1c5 100644
--- a/stdiet-ui/src/store/modules/message.js
+++ b/stdiet-ui/src/store/modules/message.js
@@ -1,3 +1,6 @@
+import { getCustomerPhysicalSignsByCusId } from "@/api/custom/customer";
+import { dealHealthy } from "@/utils/healthyData";
+
import {
fetchTopicList,
postTopicReply,
@@ -6,9 +9,14 @@ import {
} from "@/api/custom/message";
const oriState = {
+ pageNum: 1,
topicList: [],
detailData: {},
- selTopicId: ""
+ selTopicId: "",
+ healthyData: {},
+ healthDataLoading: false,
+ healthyDataType: 0,
+ avoidFoodIds: []
};
const mutations = {
@@ -28,28 +36,48 @@ const mutations = {
};
const actions = {
- async init({ rootGetters, commit, dispatch }, payload) {
+ async init({ dispatch }, payload) {
+ dispatch("fetchTopicListApi", {});
+ },
+ async fetchTopicListApi({ dispatch, commit, rootGetters, state }, payload) {
const {
roles: [role],
userId
} = rootGetters;
- const result = await fetchTopicList({ role, uid: userId });
+ const { detailData, pageNum, topicList } = state;
+ const result = await fetchTopicList({
+ role,
+ uid: userId,
+ pageSize: 20,
+ pageNum
+ });
if (result.code === 200) {
- const [defTopic] = result.rows;
-
- dispatch("fetchTopicDetailActions", {
- topicId: defTopic.topicId,
- id: defTopic.id
- });
-
- commit("save", {
- topicList: result.rows
- });
+ if (!detailData.topicId) {
+ // 默认展示第一个
+ const [defTopic] = result.rows;
+ dispatch("fetchTopicDetailActions", {
+ topicId: defTopic.topicId,
+ id: defTopic.id,
+ uid: defTopic.uid
+ });
+ }
+ if (result.rows.length) {
+ commit("save", {
+ pageNum: pageNum + 1,
+ topicList: [...topicList, ...result.rows]
+ });
+ }
}
},
- async fetchTopicDetailActions({ commit }, payload) {
- const { topicId, id } = payload;
+ async fetchTopicDetailActions({ commit, dispatch, state }, payload) {
+ const { topicId, id, uid } = payload;
+ const { healthyData } = state;
commit("save", { selTopicId: topicId });
+ // 客户信息
+ if (healthyData.customerId !== parseInt(uid)) {
+ dispatch("getHealthyData", { cusId: uid, callback: payload.callback });
+ }
+ //
const result = await fetchTopicDetail({ topicId, id });
if (result.code === 200) {
commit("save", { detailData: result.data[0] });
@@ -76,11 +104,39 @@ const actions = {
if (tarTopic) {
dispatch("fetchTopicDetailActions", {
topicId: tarTopic.topicId,
- id: tarTopic.id
+ id: tarTopic.id,
+ uid: tarTopic.uid
});
}
}
return result;
+ },
+ async getHealthyData({ commit }, payload) {
+ commit("save", { healthDataLoading: true });
+ const healthyDataResult = await getCustomerPhysicalSignsByCusId(
+ payload.cusId
+ );
+ const newState = {};
+ if (healthyDataResult.code === 200) {
+ if (!healthyDataResult.data.customerHealthy) {
+ // throw new Error("客户还没填写健康评估表");
+ payload.callback && payload.callback("客户还没填写健康评估表");
+ } else {
+ newState.healthyDataType = healthyDataResult.data.type;
+ newState.healthyData = dealHealthy(
+ healthyDataResult.data.customerHealthy
+ );
+ newState.avoidFoodIds = (newState.healthyData.avoidFood || []).map(
+ obj => obj.id
+ );
+ }
+ } else {
+ throw new Error(healthyDataResult.msg);
+ }
+ commit("save", {
+ healthDataLoading: false,
+ ...newState
+ });
}
};
diff --git a/stdiet-ui/src/utils/websocket.js b/stdiet-ui/src/utils/websocket.js
new file mode 100644
index 000000000..2cf24bf16
--- /dev/null
+++ b/stdiet-ui/src/utils/websocket.js
@@ -0,0 +1,84 @@
+const { protocol, hostname, origin, port } = window.location;
+const wsProtocol = protocol.startsWith("https") ? "wss" : "ws";
+const url = `${wsProtocol}://${hostname}${
+ hostname === "localhost" ? ":8091" : ""
+}/ws`;
+let ws = undefined;
+let intervalRef = undefined;
+
+function handleOnMessageReceive({ data = {} }) {
+ if (data.type && data.type === keys.GET_UNREAD_COUNT) {
+ ws.send(keys.GET_UNREAD_COUNT);
+ }
+}
+
+function connect() {
+ try {
+ ws = new WebSocket(url);
+
+ ws.onopen = event => {
+ console.log("ws连接成功");
+ intervalRef && clearInterval(intervalRef);
+
+ setInterval(() => {
+ ws.send("ping");
+ }, 30000);
+
+ window.addEventListener("message", handleOnMessageReceive);
+ };
+
+ ws.onmessage = event => {
+ // console.log({ event });
+
+ const dataObj = JSON.parse(event.data || "{}");
+
+ if (dataObj.type && dataObj.type !== "WS_TYPE_HEART_BEAT") {
+ window.postMessage(dataObj, origin);
+ }
+ };
+
+ ws.onerror = event => {
+ // console.log({ event });
+ ws.close();
+ ws = undefined;
+ window.removeEventListener("message", handleOnMessageReceive);
+
+ // websocketInit();
+ };
+
+ ws.onclose = event => {
+ // console.log(event);
+ ws = undefined;
+ window.removeEventListener("message", handleOnMessageReceive);
+ // if (event.reason !== "unmount") {
+ // websocketInit();
+ // }
+ };
+ } catch (error) {
+ // console.log(error);
+ // console.log("浏览器不支持websocket");
+ ws.close();
+ ws = undefined;
+ // websocketInit();
+ }
+}
+
+export function beforeUnmount(code) {
+ ws && ws.close(code, "unmount");
+}
+
+export function websocketInit() {
+ !ws && connect();
+
+ !ws &&
+ (intervalRef = setInterval(() => {
+ console.log("尝试连接websocket");
+ !ws && connect();
+ }, 10000));
+}
+
+export const keys = {
+ GET_UNREAD_COUNT: "GET_UNREAD_COUNT",
+ WS_TYPE_MESSAGE_COUNT: "WS_TYPE_MESSAGE_COUNT",
+ WS_TYPE_NEW_CUSTOMER_REPLY: "WS_TYPE_NEW_CUSTOMER_REPLY"
+};
diff --git a/stdiet-ui/src/views/custom/customer/index.vue b/stdiet-ui/src/views/custom/customer/index.vue
index 9b3e48b51..217efab90 100644
--- a/stdiet-ui/src/views/custom/customer/index.vue
+++ b/stdiet-ui/src/views/custom/customer/index.vue
@@ -27,7 +27,12 @@
-->
-
+
-
-
+
+
-
-
-
-
+
+
+
@@ -330,8 +335,18 @@
-
-
+
+
-
+
-
+
@@ -413,8 +428,6 @@
-
-