From 9eed216197930cd0b1b77c36e9cfab61e6038065 Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Mon, 19 Aug 2024 11:28:47 +0800
Subject: [PATCH] 修改线上消息提示失败

---
 .env.development                                  | 4 ++++
 .env.production                                   | 5 +++++
 package.json                                      | 2 ++
 src/components/ColumnSettings/index.vue           | 2 +-
 src/components/FormDialog/index.vue               | 1 -
 src/main.js                                       | 2 +-
 src/permission.js                                 | 1 -
 src/store/getters.js                              | 1 +
 src/utils/define.js                               | 1 +
 src/utils/request.js                              | 2 +-
 src/views/Login.vue                               | 4 ++--
 src/views/baseSpecialAction/Form.vue              | 1 -
 src/views/homePage/components/news/NewsDialog.vue | 2 +-
 src/views/homePage/components/news/index.vue      | 1 -
 src/views/systemPage/InfoList.vue                 | 1 -
 15 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 .env.development
 create mode 100644 .env.production

diff --git a/.env.development b/.env.development
new file mode 100644
index 0000000..b5ed980
--- /dev/null
+++ b/.env.development
@@ -0,0 +1,4 @@
+NODE_ENV='development'
+VUE_APP_TITLE='开发环境地址'
+VUE_APP_BASE_API="http://8.130.38.56:8043"
+VUE_APP_BASE_WSS="ws://8.130.38.56:8043/api/message/websocket"
\ No newline at end of file
diff --git a/.env.production b/.env.production
new file mode 100644
index 0000000..43a4042
--- /dev/null
+++ b/.env.production
@@ -0,0 +1,5 @@
+
+NODE_ENV='development'
+VUE_APP_TITLE='生产环境'
+VUE_APP_BASE_API="http://8.130.38.56:8043"
+VUE_APP_BASE_WSS="ws://8.130.38.56:8043/api/message/websocket"
\ No newline at end of file
diff --git a/package.json b/package.json
index c54d024..049d793 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,8 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
+    "build:stage": "vue-cli-service build --mode development",
+    "build:prod": "vue-cli-service build --mode production",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
diff --git a/src/components/ColumnSettings/index.vue b/src/components/ColumnSettings/index.vue
index faf66be..640bb48 100644
--- a/src/components/ColumnSettings/index.vue
+++ b/src/components/ColumnSettings/index.vue
@@ -39,7 +39,7 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .columnSetting-popover {
   padding: 0 !important;
 }
diff --git a/src/components/FormDialog/index.vue b/src/components/FormDialog/index.vue
index 15ac0a7..e3a7707 100644
--- a/src/components/FormDialog/index.vue
+++ b/src/components/FormDialog/index.vue
@@ -30,7 +30,6 @@
     },
     methods: {
         openDialog() {
-            console.log(11);
             let row = this.row;
             if(this.row.state != '已填写') return;
             this.btnLoading = true;
diff --git a/src/main.js b/src/main.js
index eccc595..3973367 100644
--- a/src/main.js
+++ b/src/main.js
@@ -32,7 +32,7 @@ import components from './components'
 Vue.use(components)
 // 添加实例属性
 Object.assign(Vue.prototype, {
-  define: require('./utils/define'), // 常量
+  define: require('@/utils/define'), // 常量
   ncc, // 公共方法
   formValidate: require('./utils/formValidate').default, // 表单验证
   $message: message
diff --git a/src/permission.js b/src/permission.js
index 4526a0c..3841331 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -25,7 +25,6 @@ router.beforeEach((to, from, next) => {
                 // 判断当前用户是否已拉取完user_info信息
                 store.dispatch('GetInfo').then((res) => {
                     isRelogin.show = false
-                    console.log(res, 'res-user');
                     store.dispatch('generateRoutes', res).then(accessRoutes => {
                         // 根据roles权限生成可访问的路由表
                         router.addRoutes(accessRoutes) // 动态添加可访问路由表
diff --git a/src/store/getters.js b/src/store/getters.js
index f52c5a8..be6309a 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -15,6 +15,7 @@ const getters = {
     topbarRouters:state => state.permission.topbarRouters,
     defaultRoutes:state => state.permission.defaultRoutes,
     sidebarRouters:state => state.permission.sidebarRouters,
+    socket:state => state.user.socket,
   }
   export default getters
   
\ No newline at end of file
diff --git a/src/utils/define.js b/src/utils/define.js
index a447fbc..1bc1f4d 100644
--- a/src/utils/define.js
+++ b/src/utils/define.js
@@ -8,6 +8,7 @@ module.exports = {
   timeout: process.env.NODE_ENV === 'development' ? 10000 : 1000000,
   // WebSocketUrl: process.env.NODE_ENV === 'development' ? APIURl.replace('http', 'ws') + '/websocket' : process.env.VUE_APP_BASE_WSS,
   WebSocketUrl: process.env.NODE_ENV === 'development' ? APIURl.replace('http', 'ws') + '/api/message/websocket' : process.env.VUE_APP_BASE_WSS,
+  // WebSocketUrl: APIURl.replace('http', 'ws') + '/api/message/websocket',
   comUploadUrl: process.env.VUE_APP_BASE_API + '/api/file/Uploader',
   comUrl: process.env.VUE_APP_BASE_API,
   // 本地文件预览
diff --git a/src/utils/request.js b/src/utils/request.js
index b1c8356..2e890e3 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -11,7 +11,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 
 const service = axios.create({
     // axios中请求配置有baseURL选项，表示请求URL公共部分
-    baseURL: '/api',
+    baseURL: process.env.VUE_APP_BASE_API + '/api',
     withCredentials: false,
     // 超时
     // timeout: define.timeout
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 83e9359..488a42a 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -71,7 +71,8 @@ export default {
       if (!val) this.loading = false;
     },
   },
-  created() {},
+  created() {
+  },
   mounted() {},
   methods: {
     toHome() {
@@ -84,7 +85,6 @@ export default {
           this.$store
             .dispatch("Login", this.form)
             .then(() => {
-              console.log(222);
               this.$router.push({ path: "/homePage" });
             })
             .catch(() => {
diff --git a/src/views/baseSpecialAction/Form.vue b/src/views/baseSpecialAction/Form.vue
index 5403ebf..60e0cf5 100644
--- a/src/views/baseSpecialAction/Form.vue
+++ b/src/views/baseSpecialAction/Form.vue
@@ -280,7 +280,6 @@ export default {
       this.$nextTick(() => {
         this.$refs["elForm"].resetFields();
         if(this.dataForm.id) {
-          console.log(row, 'row');
           this.dataForm.communicationArea = JSON.parse(row.communicationArea);
           this.dataForm.communicationOut = JSON.parse(row.communicationOut);
         }
diff --git a/src/views/homePage/components/news/NewsDialog.vue b/src/views/homePage/components/news/NewsDialog.vue
index 4d62729..3796a1c 100644
--- a/src/views/homePage/components/news/NewsDialog.vue
+++ b/src/views/homePage/components/news/NewsDialog.vue
@@ -3,7 +3,7 @@
     <div class="news-title">
       <div class="left">我的消息</div>
       <div class="right">
-        <el-button type="primary" size="small" @click="toReadAll"
+        <el-button type="text" size="small" :disabled="!messageList.length" @click="toReadAll"
           >标记全部已读</el-button
         >
       </div>
diff --git a/src/views/homePage/components/news/index.vue b/src/views/homePage/components/news/index.vue
index bfd0d4d..7e1af56 100644
--- a/src/views/homePage/components/news/index.vue
+++ b/src/views/homePage/components/news/index.vue
@@ -47,7 +47,6 @@ export default {
       this.messageCount = val;
     },
     initWebSocket() {
-      console.log("1");
       this.socket = this.$store.getters.socket || null;
       if ("WebSocket" in window) {
         if (!this.socket) {
diff --git a/src/views/systemPage/InfoList.vue b/src/views/systemPage/InfoList.vue
index f84b22f..26d938f 100644
--- a/src/views/systemPage/InfoList.vue
+++ b/src/views/systemPage/InfoList.vue
@@ -81,7 +81,6 @@ export default {
     // this.initList();
   },
   mounted() {
-    console.log(this.$route.path, "path");
   },
   watch: {
     $route: {
--
libgit2 0.21.4