03-11 09:42lhj

config/index.js

@@ -19,7 +19,16 @@ module.exports = {
             // '/'这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替。比如我要调用'http://api.douban.com/v2/movie/top250'，直接写‘/api/v2/movie/top250’即可
 
          }
-        }
+        },
+        '/chatHub': {
+          target : 'http://132.232.92.186:8888/chatHub',    //设置你调用的接口域名和端口号.别忘了加http
+          changeOrigin : true,   //允许跨域
+          pathRewrite : {
+              '^/chatHub':'/'
+            // '/'这里理解成用‘/api’代替target里面的地址，后面组件中我们掉接口时直接用api代替。比如我要调用'http://api.douban.com/v2/movie/top250'，直接写‘/api/v2/movie/top250’即可
+
+          }
+        },
     },
     
     // Various Dev Server settings

src/App.vue

@@ -45,5 +45,6 @@ export default {
 #app {
   margin: 0px;
   padding: 0px;
+  font-family:arial,"\5B8B\4F53" ;
 }
 </style>

src/components/Crm/DeleClient.vue

@@ -24,7 +24,7 @@
                     </el-table-column>
                     <el-table-column prop="companyName" label="所属公司">
                     </el-table-column>
-                    <el-table-column prop="sex" label="性别" width="50">
+                    <el-table-column prop="sex" label="性别" width="55">
                         <template slot-scope="sex">
                             <span v-if="sex.row.sex == 0">男</span>
                             <span v-else-if="sex.row.sex == 1">女</span>

src/components/OP/GroupsTaskAssignment.vue

@@ -6,14 +6,14 @@
         <div class="konzh" style="display: flex;justify-content: space-between;">
             <el-form style="display: flex;" label-width="70px" class="demo-form-inline">
                 <el-form-item style="width: 300px;margin-right: 20px;" label="团组名称">
-                    <el-select v-model="diId" filterable clearable placeholder="请选择" style="width:100%;"
+                    <el-select v-model="diId" filterable clearable placeholder="请选择" style="width:230px;"
                         @change="diidChange()">
                         <el-option v-for="item1 in delegationInfos" :key=item1.id :label=item1.name
                             :value=item1.id></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item style="width: 300px;margin-right: 20px;" label="操作分类">
-                    <el-select v-model="ctId" filterable clearable placeholder="请选择" style="width:100%;"
+                    <el-select v-model="ctId" filterable clearable placeholder="请选择" style="width:230px;"
                     @change="sdIdChange()">
                         <el-option v-for=" item1 in setData" :key=item1.id :label=item1.name :value=item1.id></el-option>
                     </el-select>

src/components/OP/HotelReservations.vue

@@ -37,7 +37,7 @@
             <div class="hotelr-table">
                 <el-table :data="tableDatas.slice((currentPage - 1) * pageSize, currentPage * pageSize)" border
                     style="width: 100%" v-loading="loading" element-loading-text="拼命加载中...">
-                    <el-table-column type="index" label="序号" width="50">
+                    <el-table-column type="index" label="序号" width="55">
                     </el-table-column>
                     <el-table-column prop="reservationsNo" label="预定号">
                     </el-table-column>
@@ -56,7 +56,7 @@
                     </el-table-column>
                     <el-table-column prop="createTime" label="操作时间" width="180">
                     </el-table-column>
-                    <el-table-column prop="isAuditGMStr" label="是否审核" width="80">
+                    <el-table-column prop="isAuditGMStr" label="是否审核" width="85">
                     </el-table-column>
                     <el-table-column prop="name" label="操 作" width="140">
                         <template slot-scope="scope">

src/components/OP/OPgroup.vue

@@ -82,12 +82,12 @@
                     <el-table-column
                         prop="visitDays"
                         label="出访天数"
-                        width="80">
+                        width="85">
                     </el-table-column>
                     <el-table-column
                         prop="visitPNumber"
                         label="出访人数"
-                        width="80">
+                        width="85">
                     </el-table-column>
                     <el-table-column
                         prop="jietuanOperator"

src/components/OP/OpCarTouristGuideGroundId.vue

@@ -371,7 +371,7 @@ export default {
                                         type: 'success'
                                     });
                                     setTimeout(() => {
-                                        that.$router.push('/home/CarTouristGuideGroundId')
+                                        that.$router.push('/home/CarTouristGuideGroundId?diId='+that.OpCarTouristGuideGroundData.diId+'')
                                     }, 3000);
                                 } else {
                                     that.$message.error(res.data.msg);

src/components/OP/PickupList.vue

@@ -58,7 +58,7 @@
                     <el-table-column
                     type="index"
                     label="序号"
-                    width="50">
+                    width="55">
                     </el-table-column>
                     <el-table-column
                     prop="lastName"
@@ -86,7 +86,7 @@
                     <el-table-column
                     prop="sex"
                     label="性别"
-                    width="50">
+                    width="55">
                     <template slot-scope="scope">
                         {{ scope.row.sex==0?'男':'女' }}
                     </template>

src/components/OP/ThreeStandards.vue

@@ -41,7 +41,7 @@
                     <el-table-column
                     prop="rowNumber"
                     label="序号"
-                    width="50">
+                    width="55">
                     </el-table-column>
                     <el-table-column
                     prop="continent"

src/components/Resource/InvitationOfficialActivityData.vue

@@ -6,13 +6,13 @@
             </div>
             <div>
                 <div class="communal-box" style="margin-top: 10px;">
-                    <el-autocomplete class="inline-input" v-model="Country" :fetch-suggestions="querySearchCountry"
+                    <el-autocomplete style="margin-right: 15px;" class="inline-input" v-model="Country" :fetch-suggestions="querySearchCountry"
                         placeholder="请输入国家" clearable></el-autocomplete>
-                    <el-autocomplete class="inline-input" v-model="UnitName" :fetch-suggestions="querySearchUnitName"
+                    <el-autocomplete style="margin-right: 15px;" class="inline-input" v-model="UnitName" :fetch-suggestions="querySearchUnitName"
                         placeholder="请输入邀请方" clearable></el-autocomplete>
-                    <el-autocomplete class="inline-input" v-model="Contact" :fetch-suggestions="querySearchContact"
+                    <el-autocomplete style="margin-right: 15px;" class="inline-input" v-model="Contact" :fetch-suggestions="querySearchContact"
                         placeholder="联系人" clearable></el-autocomplete>
-                    <el-select v-model="Delegation" clearable filterable placeholder="团组名称" style="width: 20%;">
+                    <el-select  v-model="Delegation" clearable filterable placeholder="团组名称" style="width: 20%;margin-right: 15px;">
                         <el-option v-for="item in restaurantDelegation" :key="item.id" :label="item.groupName"
                             :value="item.id">
                         </el-option>
@@ -27,7 +27,7 @@
                     </div>
                 </div>
                 <div class="communal-box" style="margin-top: 10px;">
-                    <el-select v-model="CreateUserId" placeholder="录入者" filterable clearable>
+                    <el-select style="margin-right: 15px;" v-model="CreateUserId" placeholder="录入者" filterable clearable>
                         <el-option v-for="item in CreateUserList" :key="item.id" :label="item.cnName" :value="item.id">
                         </el-option>
                     </el-select>
@@ -532,7 +532,5 @@ export default {
     white-space: nowrap;
     cursor: pointer;
 }
-.communal-box .el-autocomplete,.el-select{
-    margin-right: 15px;
-}
+
 </style>

src/components/child/test.vue

@@ -1,90 +1,90 @@
-<template>
-    <div class="home">
-      <h1>前端演示SignalR</h1>
-      <input v-model="user" type="text" />
-      <input v-model="message" type="text" />
-      <button @click="sendAll">发送全部</button>
-      <button @click="sendOwn">对自己发送</button>
-      <div>
-        <ul v-for="(item ,index) in messages" v-bind:key="index +'itemMessage'">
-          <li>{{item.user}} says {{item.message}}</li>
-        </ul>
-      </div>
-    </div>
+<!-- <template>
+	<div class="hello">
+	  <div id="message" v-html="remsg"></div>
+	  <input type="text" placeholder="请输入用户名" v-model="user" />
+	  <input type="text"  placeholder="请输入内容" v-model="msg">
+	  <button  @click="handle">发送消息</button>
+	</div>
   </template>
   
   <script>
+  
   import * as signalR from "@aspnet/signalr";
+  
+  let token=JSON.parse(localStorage.getItem('userinif')).token;
+  let hubUrl = "http://132.232.92.186:8888/chatHub";
+  
+  //.net core 版本中默认不会自动重连，需手动调用 withAutomaticReconnect 
+  const connection = new signalR.HubConnectionBuilder()
+		// .withAutomaticReconnect()//断线自动重连
+		.withUrl(hubUrl,{ accessTokenFactory: () => token })//传递参数Query["access_token"]
+		.build();
+  
+  //启动
+  connection.start().catch(err => {
+	console.log(err);
+  });
+  
+  //自动重连成功后的处理
+//   connection.onreconnected(connectionId => {
+// 	  console.log(connectionId);
+//   });
+  
   export default {
-    name: "SignalR",
-    components: {},
-    data() {
-      return {
-        token:"",
-        user: "", //用户
-        message: "", //消息
-        connection: "", //signalr连接
-        messages: [] //返回消息
-      };
-    },
-    methods: {
-      //给全部发送消息
-      sendAll: function() {
-        this.connection
-          .invoke("SendMessage", this.user, this.message)
-          .catch(function(err) {
-            return console.error(err);
-          });
-      },
-      //只给自己发送消息
-      sendOwn: function() {
-        this.connection
-          .invoke("SendMessageCaller", this.message)
-          .catch(function(err) {
-            return console.error(err);
-          });
-      }
-  
-   
-    },
-    created: function() {
-      this.token = JSON.parse(localStorage.getItem('userinif')).token;
-      let thisVue = this;
-      console.log(thisVue.token)
-      this.connection = new signalR.HubConnectionBuilder(
-        {
-          skipNegotiation: true,
-          transport: signalR.HttpTransportType.WebSockets
-        }
-      )
-        // .withAutomaticReconnect()//断线自动重连
-        // .withUrl("http://132.232.92.186:8888/chatHub", (opts) =>
-        //     {                    
-        //         //opts.Headers.Add("Authorization", new AuthenticationHeaderValue("Bearer ", thisVue.token).ToString());         
-        //         opts.headers['Authorization'] = 'Bearer ' + thisVue.token;
-        //         skipNegotiation = true;
-        //         transport = signalR.HttpTransportType.WebSockets;
-        //         // opts.accessTokenFactory: () => thisVue.token                     
-        //     })    
-        .withUrl("http://132.232.92.186:8888/chatHub?access_token="+"Bearer "+ thisVue.token, 
-        {
-          // headers: {"Authorization":"Bearer "+ thisVue.token},
-          //options.headers['Authorization'] = 'Bearer your_auth_token';
-          
-          //accessTokenFactory: () => "Bearer "+ thisVue.token
-        })
-        .configureLogging(signalR.LogLevel.Information)
-        .build();
-      this.connection.on("ReceiveMessage", function(data) {
-        //thisVue.messages.push({ userid, message });
-        console.log(data);
-      });
-      this.connection.on("ReceiveMessage", function(userid,message) {
-        let user = "自己";//这里为了push不报错，我就弄了一个默认值。
-        thisVue.messages.push({ userid, message });
-        console.log({ userid, message });
-      });
-      this.connection.start();
-    }
+	name: "First",
+	mounted() {
+	  var _this = this;
+  
+	  //调用后端方法 SendMessageResponse 接收定时数据
+	  connection.on("SendMessageResponse", function(data) {
+		if(data.state==200)
+			_this.remsg = _this.remsg + "<br>" + "定时数据:" + data.msg;
+	  });
+  
+	  //调用后端方法 SendMessage 接受自己人发送消息
+	  connection.on("SendMessage", function(data) {
+		if(data.state==200)
+			_this.remsg = _this.remsg + "<br>" + data.data.userName + ":" + data.msg;
+	  });
+  
+	  //调用后端方法 ConnectResponse 接收连接成功
+	  connection.on("ConnectResponse", function(data) {
+		if(data.state==200)
+			_this.remsg = _this.remsg + "<br>" + "连接:" + data.msg;
+	  });
+  
+	},
+	data() {
+	  return {
+		user: "",
+		msg: "",
+		remsg: ""
+	  };
+	},
+  
+	methods: {
+	  handle: function() {
+		if(this.msg.trim()==""){
+		  alert("不能发送空白消息");
+		  return;
+		}
+		//调用后端方法 SendMessage 传入参数
+		connection.invoke("SendMessage", this.user, this.msg);
+		this.msg = "";
+	  }
+	}
   };
-  </script>
+  </script>
+  
+ Add "scoped" attribute to limit CSS to this component only -->
+  <style scoped>
+  #message {
+  
+	overflow-y:auto;
+	text-align: left;
+	border: #42b983 solid 1px;
+	height: 500px;
+  
+  }
+  
+  </style> 

src/components/home.vue

@@ -15,32 +15,34 @@
             </span>
             <div class="read-btn">
               <el-badge :hidden="tasknot==0?true:false" :value="tasknot" class="item">
-                <el-button  size="mini" plain >未读</el-button>
+                <el-button type="primary" @click="taskclick('未读')"  size="mini" :plain="tasknobtn" >未读</el-button>
               </el-badge>
-              <el-button size="mini" plain >
+              <el-button type="primary" @click="taskclick('已读')" size="mini" :plain="taskbtn" >
                 已读
               </el-button>
             </div>
-            <div class="news-box" v-for="(item,index) in newstasklist" :key="index">
-              <div class="news-box-list">
-                <div class="news-list-hade">
-                  <div>{{item.title}}</div>
-                  <div>所属部门: {{item.issuerDep}}</div>
-                </div>
-                <div class="news-list-content" v-html="item.content">
-                </div>
-                <div class="news-list-posts">
-                  <div>发布人: {{item.issuerUser}}</div>
-                  <div>发布时间: {{item.releaseTime}}</div>
-                </div>
-                <div class="news-list-btn">
-                  <el-button v-if="item.isRead==0" type="primary">确认已读</el-button>
-                  <el-button v-if="item.isRead==1" type="info">已读</el-button>
+            <div class="scroll-box">
+              <div class="news-box" v-for="(item,index) in newstasklist" :key="index">
+                <div class="news-box-list">
+                  <div class="news-list-hade">
+                    <div>{{item.title}}</div>
+                    <div>所属部门: {{item.issuerDep}}</div>
+                  </div>
+                  <div class="news-list-content" v-html="item.content">
+                  </div>
+                  <div class="news-list-posts">
+                    <div>发布人: {{item.issuerUser}}</div>
+                    <div>发布时间: {{item.releaseTime}}</div>
+                  </div>
+                  <div class="news-list-btn" >
+                    <el-button @click="DeleMsg(index,item)" v-if="item.isRead==0" type="primary">确认已读</el-button>
+                    <el-button v-if="item.isRead==1" type="info">已读</el-button>
+                  </div>
                 </div>
               </div>
-            </div>
-            <div class="notyet" v-if="newstasklist.length==0">
-              暂无通知
+              <div class="notyet" v-if="newstasklist.length==0">
+                暂无通知
+              </div>
             </div>
           </el-tab-pane>
           <el-tab-pane name="second">
@@ -50,32 +52,34 @@
             </span>
             <div class="read-btn">
               <el-badge :hidden="groupnot==0?true:false" :value="groupnot" class="item">
-                <el-button size="mini" plain >未读</el-button>
+                <el-button type="primary" size="mini" @click="groupclick('未读')" :plain="groupnobtn" >未读</el-button>
               </el-badge>
-              <el-button size="mini" plain >
+              <el-button type="primary" size="mini" @click="groupclick('已读')" :plain="groupbtn" >
                 已读
               </el-button>
             </div>
-            <div class="news-box" v-for="(item,index) in newsgrouplist" :key="index">
-              <div class="news-box-list">
-                <div class="news-list-hade">
-                  <div>{{item.title}}</div>
-                  <div>所属部门: {{item.issuerDep}}</div>
-                </div>
-                <div class="news-list-content" v-html="item.content">
-                </div>
-                <div class="news-list-posts">
-                  <div>发布人: {{item.issuerUser}}</div>
-                  <div>发布时间: {{item.releaseTime}}</div>
-                </div>
-                <div class="news-list-btn">
-                  <el-button v-if="item.isRead==0" type="primary">确认已读</el-button>
-                  <el-button v-if="item.isRead==1" type="info">已读</el-button>
+            <div class="scroll-box">
+              <div class="news-box" v-for="(item,index) in newsgrouplist" :key="index">
+                <div class="news-box-list">
+                  <div class="news-list-hade">
+                    <div>{{item.title}}</div>
+                    <div>所属部门: {{item.issuerDep}}</div>
+                  </div>
+                  <div class="news-list-content" v-html="item.content">
+                  </div>
+                  <div class="news-list-posts">
+                    <div>发布人: {{item.issuerUser}}</div>
+                    <div>发布时间: {{item.releaseTime}}</div>
+                  </div>
+                  <div class="news-list-btn">
+                    <el-button v-if="item.isRead==0" type="primary">确认已读</el-button>
+                    <el-button v-if="item.isRead==1" type="info">已读</el-button>
+                  </div>
                 </div>
               </div>
-            </div>
-            <div class="notyet" v-if="newsgrouplist.length==0">
-              暂无通知
+              <div class="notyet" v-if="newsgrouplist.length==0">
+                暂无通知
+              </div>
             </div>
           </el-tab-pane>
         </el-tabs>
@@ -302,6 +306,10 @@ export default {
       taskReadlist:[],//任务以读
       groupnotlist:[],//团组未读
       groupReadlist:[],//团组以读
+      taskbtn:true,//plain任务已读
+      tasknobtn:true,//plain任务未读
+      groupbtn:true,//plain团组已读
+      groupnobtn:true,//plain团组未读
     };
   },
   // components: {
@@ -437,11 +445,41 @@ export default {
         }).then(function (res) {
             console.log(res)
             if(res.data.code==200){
-                that.newstasklist=res.data.data.taskNotificatio.taskNotificatioData;
-                that.tasknot=res.data.data.taskNotificatio.unReadCount;
-                that.newsgrouplist=res.data.data.operationNotificatio.operationNotificatioData;
-                that.groupnot=res.data.data.operationNotificatio.unReadCount;
-                console.log(that.newsgrouplist)
+                //初始化
+                that.tasknotlist=[];
+                that.taskReadlist=[];
+                that.groupnotlist=[];
+                that.groupReadlist=[];
+                that.taskbtn=true;//plain任务已读
+                that.tasknobtn=true;//plain任务未读
+                that.groupbtn=true;//plain团组已读
+                that.groupnobtn=true;//plain团组未读
+                var listdata=res.data.data;
+                // that.newstasklist=res.data.data.taskNotification.taskNotificationData;
+                that.tasknot=res.data.data.taskNotification.unReadCount;
+                // that.newsgrouplist=res.data.data.operationNotification.operationNotificatioData;
+                that.groupnot=res.data.data.operationNotification.unReadCount;
+                console.log(listdata.taskNotification.taskNotificationData)
+                //任务
+                for(let i=0;i<listdata.taskNotification.taskNotificationData.length;i++){
+                  if(listdata.taskNotification.taskNotificationData[i].isRead==0){
+                    that.tasknotlist.push(listdata.taskNotification.taskNotificationData[i]);
+                  }else{
+                    that.taskReadlist.push(listdata.taskNotification.taskNotificationData[i]);
+                  }
+                }
+                that.newstasklist=that.tasknotlist;
+                that.tasknobtn=false;
+                //团组
+                for(let j=0;j<listdata.operationNotification.operationNotificatioData.length;j++){
+                  if(listdata.operationNotification.operationNotificatioData[j].isRead==0){
+                    that.groupnotlist.push(listdata.operationNotification.operationNotificatioData[j]);
+                  }else{
+                    that.groupReadlist.push(listdata.operationNotification.operationNotificatioData[j]);
+                  }
+                }
+                that.newsgrouplist=that.groupnotlist;
+                that.groupnobtn=false;
             }else{
                 that.$message.error(res.data.msg);
             }
@@ -449,6 +487,60 @@ export default {
             that.$message.error("获取消息列表失败！");
         });
     },
+    //消息确认已读
+    DeleMsg(index,row){
+      console.log(index,row)
+      var url = "/api/System/DeleMsg"
+      var that = this
+      this.$axios({
+          method: 'post',
+          url: url,
+          headers: {
+              Authorization: 'Bearer ' + that.token
+          },
+          data:{
+            portType:1,
+            pageIndex:0,
+            pageSize:0,
+            msgId:row.id,
+            userId:that.userId
+          }
+      }).then(function (res) {
+          console.log(res)
+          if(res.data.code==200){
+            
+          }else{
+              that.$message.error(res.data.msg);
+          }
+      }).catch(function (error) {
+          that.$message.error("确认已读失败！");
+      });
+    },
+    //任务切换
+    taskclick(text){
+      if(text=='未读'){
+        this.newstasklist=this.tasknotlist
+        this.tasknobtn=false;
+        this.taskbtn=true;
+      }else{
+        this.newstasklist=this.taskReadlist
+        this.tasknobtn=true;
+        this.taskbtn=false;
+      }
+      console.log(this.newstasklist)
+    },
+    //团组切换
+    groupclick(text){
+      if(text=='未读'){
+        this.newsgrouplist=this.groupnotlist
+        this.groupnobtn=false;
+        this.groupbtn=true;
+      }else{
+        this.newsgrouplist=this.groupReadlist
+        this.groupnobtn=true;
+        this.groupbtn=false;
+      }
+    },
     //消息通知
     chatHub(){
         var url = "/api/chatHub"
@@ -517,6 +609,8 @@ export default {
     this.ifIndexValue();
     this.getmenu();
     this.PsotMsgPageList();
+    setInterval(this.PsotMsgPageList, 300000);
+    // setInterval(this.PsotMsgPageList, 3000);
     // this.chatHub();
   },
   created() {
@@ -554,6 +648,12 @@ export default {
 };
 </script>
 <style>
+*{
+  font-family: arial,"\5B8B\4F53";
+}
+.all-box{
+  font-family: arial,"\5B8B\4F53";
+}
 .el-menu .el-menu-item.is-active {
   color: #fff;
   background-color: rgba(0, 0, 0, 0.1);
@@ -998,5 +1098,26 @@ i.icon-tongzhi {
   padding: 0;
 }
 .delwh::-webkit-scrollbar {display:none}
+.scroll-box{
+  height: 750px;
+  overflow-y: auto;
+}
+.scroll-box::-webkit-scrollbar {
+  width: 6px;
+}
+.scroll-box::-webkit-scrollbar-track {
+  background: rgb(239, 239, 239);
+  border-radius: 2px;
+}
+.scroll-box::-webkit-scrollbar-thumb {
+  background: #40a0ff49;
+  border-radius: 10px;
+}
+.scroll-box::-webkit-scrollbar-thumb:hover {
+  background: #40a0ff;
+}
+.all-box .communal-box .el-autocomplete,.el-select{
+  margin-right: 0;
+}
 </style>
 

src/components/system/Payroll.vue

@@ -57,7 +57,7 @@
                         <el-table-column
                             prop="row_Number"
                             label="序号"
-                            width="50">
+                            width="55">
                         </el-table-column>
                         <el-table-column
                             prop="yearMonth"
@@ -120,7 +120,7 @@
                         <el-table-column
                             prop="workDays"
                             label="应出勤天数"
-                            width="95">
+                            width="100">
                         </el-table-column>
                         <!-- <el-table-column
                             prop="regularDays"

src/store/websocket.js

@@ -1,9 +1,9 @@
-export default {
-    ws:{},
-    setWs: function(newWs) {
-      this.ws = newWs
-    }
-  }
+// export default {
+//     ws:{},
+//     setWs: function(newWs) {
+//       this.ws = newWs
+//     }
+//   }
 // // <!--引入store，用于管理socket推送来的消息-->
 // import store from '../store'
 // // <!--封装websocket对象-->

vue.config.js

@@ -1,8 +1,20 @@
-module.exports = {
-    publicPath:'./',
-    devServer:{
-        Proxy:{
-            ws:false
-        }
+const { defineConfig } = require('@vue/cli-service')
+module.exports = defineConfig({
+  transpileDependencies:true,
+  lintOnSave:false, //关闭哦语法检查
+  devServer: {
+    host: '132.232.92.186',
+    // https:true,
+    port: 8888,
+    client: {
+      webSocketURL: 'ws://132.232.92.186:8888/chatHub',
+    },
+    headers: {
+      'Access-Control-Allow-Origin': '*',
     }
+  },
+  transpileDependencies: true
+})
+module.exports = {
+  lintOnSave: false,
 }