Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/utils/websocket.js

@@ -3,7 +3,6 @@ import { Message } from 'element-ui'
 let websock = null
 let messageCallback = null
 let errorCallback = null
-let wsUrl = process.env.SOCKET_Url
 let tryTime = 0
 
 // 接收ws后端返回的数据
@@ -57,7 +56,7 @@ function websocketOpen (e) {
 }
 
 // 初始化weosocket
-function initWebSocket () {
+function initWebSocket (wsUrl) {
   if (typeof (WebSocket) === 'undefined') {
     Message.error('您的浏览器不支持WebSocket，无法获取数据')
     return false
@@ -92,9 +91,8 @@ function initWebSocket () {
  * @param {function} errCallback ws连接错误的回调函数
  */
 export function sendWebsocket (url, agentData, successCallback, errCallback) {
-
-  wsUrl+=url
-  initWebSocket()
+  url
+  initWebSocket(url)
   messageCallback = successCallback
   errorCallback = errCallback
   websocketSend(agentData)

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesDetail.vue

@@ -111,6 +111,23 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="增加类型" prop="addType">
+              <el-select
+                size="small"
+                clearable
+                v-model="formDataList.addType"
+                filterable
+              >
+                <el-option
+                  v-for="(s, i) in addTypeList"
+                  :key="i"
+                  :label="s.label"
+                  :value="s.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -287,6 +304,23 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="增加类型" prop="addType">
+              <el-select
+                size="small"
+                clearable
+                v-model="formDataAdd.addType"
+                filterable
+              >
+                <el-option
+                  v-for="(s, i) in addTypeList"
+                  :key="i"
+                  :label="s.label"
+                  :value="s.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -918,12 +952,18 @@ export default {
         isCheckBox: true,
         isPaginationShow: true,
       },
+      addTypeList: [],
     };
   },
   created() {
     this.$api.dept.findDeptTree("9", "").then((res) => {
       this.treedata = res.data;
     });
+    this.$api.dict.findByLableName("add_type").then((res) => {
+      if (res.code === 200) {
+        this.addTypeList = res.data;
+      }
+    });
     this.getDicType("productsType"); //险种类型
     this.getDicType("agreementType"); //险种类型
     this.areaqueryList(1, 99, "provinceId");

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicingUnsettled.vue

@@ -162,9 +162,9 @@
         <el-form-item label="进账日期：">
           <el-date-picker
             v-model="form.settlementTime"
-            type="date"
+            type="datetime"
             placeholder="选择日期"
-            value-format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesDetail.vue

@@ -113,6 +113,24 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="20">
+            <el-form-item label="增加类型" prop="addType">
+              <el-select
+                size="small"
+                clearable
+                v-model="formDataList.addType"
+                filterable
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="(s, i) in addTypeList"
+                  :key="i"
+                  :label="s.label"
+                  :value="s.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -256,6 +274,23 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="增加类型" prop="addType">
+              <el-select
+                size="small"
+                clearable
+                v-model="formDataAdd.addType"
+                filterable
+              >
+                <el-option
+                  v-for="(s, i) in addTypeList"
+                  :key="i"
+                  :label="s.label"
+                  :value="s.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -832,12 +867,18 @@ export default {
           value: "1",
         },
       ],
+      addTypeList: [],
     };
   },
   created() {
     this.$api.dept.findDeptTree("9", "").then((res) => {
       this.treedata = res.data;
     });
+    this.$api.dict.findByLableName("add_type").then((res) => {
+      if (res.code === 200) {
+        this.addTypeList = res.data;
+      }
+    });
     this.getDicType("productsType"); //险种类型
     this.getDicType("agreementType"); //险种类型
     this.areaqueryList(1, 99, "provinceId");

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicingUnsettled.vue

@@ -108,9 +108,9 @@
         <el-form-item label="进账日期：">
           <el-date-picker
             v-model="form.settlementTime"
-            type="date"
+            type="datetime"
             placeholder="选择日期"
-            value-format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>

src/views/Login.vue

@@ -318,8 +318,8 @@ export default {
                     userId,
                     systemType:this.systemType
                   }
-                  // sendWebsocket(`ws://192.168.0.52:8080//pcWebsocket/${userId}`,data)
-                  sendWebsocket(`/pcWebsocket/${userId}`,data)
+                  sendWebsocket(`${process.env.SOCKET_Url}/pcWebsocket/${userId}`,data)
+                  // sendWebsocket(`/pcWebsocket/${userId}`,data)
                   },1000)
                   
 

src/views/PeopleManage/Institutional.vue

@@ -530,9 +530,29 @@ export default {
   text-align: center;
 }
 .info-title {
+  position: relative;
   color: #262626;
   font-size: 18px;
-  padding: 16px 0;
+  height: 50px;
+  line-height: 50px;
+  padding-left: 10px;
+  margin-bottom: 20px;
+  border-bottom: 1px solid #eee;
+  font-weight: 600;
   font-family: PingFang SC, PingFang SC;
+  box-sizing: border-box;
+}
+.info-title::before{
+  content: "";
+  background: #D42426;
+  width: 4px;
+  height: 18px;
+  position: absolute;
+  left: 0;
+  top: 50%;
+  transform: translateY(-50%);
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
 }
 </style>

src/views/PeopleManage/PcLoginRecord.vue

@@ -50,10 +50,14 @@
         <span>历史记录</span>
         <span style="color: #c3c3c3;font-size:18px" @click="infoWindowVisible = false"> ×</span>
       </p>
-      <el-table :data="tableData" border style="width: 100%;  overflow: auto;" :header-cell-style="{
+      <el-table :data="tableData" border style="width: 98%; max-height: 45vh;
+    overflow-y: auto; " 
+    :cell-style="{padding: '3px 8px'}"
+    :header-cell-style="{
         background: '#F2F7FC',
         fontWeight: '700',
         color: '#606266',
+        
       }">
         <el-table-column prop="userId" label="工号" width="150">
         </el-table-column>
@@ -79,7 +83,7 @@
           <el-tab-pane label="历史在线人数" name="2"></el-tab-pane>
         </el-tabs>
         <span style="color: #3865E9 ; cursor: pointer; font-size: 14px;position: absolute;line-height: 40px;
-    right: 30px;" @click="isCollapse = !isCollapse">{{
+    right: 30px;" @click="isCollapse = !isCollapse;if(isCollapse)infoWindowVisible=false">{{
       isCollapse ? '收起' : '展开' }} </span>
       </p>
       <div v-show="activeName == 1">
@@ -922,7 +926,7 @@ export default {
   }
 
   span {
-    margin-right: 5px;
+    margin-right: 15px;
   }
 }
 
@@ -944,19 +948,23 @@ export default {
   z-index: 100;
   background-color: white;
   padding: 10px;
-  width: 25vw;
+  width: 500px;
+  box-sizing: border-box;
   box-shadow: 0px 5px 10px #ddd;
+  // max-height: 57vh;
+  //   overflow-y: auto;
 }
 
 .personnel-window {
   position: fixed;
   bottom: 10px;
-  right: 10px;
+  right: 5px;
   z-index: 100;
   background-color: white;
   padding: 10px;
-  width: 460px;
   box-shadow: 0px 5px 10px #ddd;
+  box-sizing: border-box;
+    width: 500px;
 }
 
 .bottomFixed {
@@ -1087,5 +1095,6 @@ export default {
       margin-right: 10px;
     }
   }
+
 }
 </style>

src/views/PeopleManage/UserMap.vue

@@ -51,7 +51,10 @@
         <span>历史记录</span>
         <span style="color: #c3c3c3;font-size:18px" @click="infoWindowVisible = false"> ×</span>
       </p>
-      <el-table :data="tableData" border style="width: 100%;  overflow: auto;" :header-cell-style="{
+      <el-table :data="tableData" border style="width: 98%; max-height: 45vh;
+    overflow-y: auto;"
+    :cell-style="{padding: '3px 8px'}"
+     :header-cell-style="{
         background: '#F2F7FC',
         fontWeight: '700',
         color: '#606266',
@@ -80,7 +83,7 @@
           <el-tab-pane label="历史在线人数" name="2"></el-tab-pane>
         </el-tabs>
         <span style="color: #3865E9 ; cursor: pointer; font-size: 14px;position: absolute;line-height: 40px;
-    right: 30px;" @click="isCollapse = !isCollapse">{{
+    right: 30px;" @click="isCollapse = !isCollapse;if(isCollapse)infoWindowVisible=false">{{
       isCollapse ? '收起' : '展开' }} </span>
       </p>
       <div v-show="activeName == 1">
@@ -857,7 +860,7 @@ export default {
   }
 
   span {
-    margin-right: 5px;
+    margin-right: 15px;
   }
 }
 
@@ -879,19 +882,24 @@ export default {
   z-index: 100;
   background-color: white;
   padding: 10px;
-  width: 25vw;
+  width: 500px;
+  box-sizing: border-box;
   box-shadow: 0px 5px 10px #ddd;
+  // max-height: 57vh;
+  //   overflow-y: auto;
 }
 
 .personnel-window {
   position: fixed;
   bottom: 10px;
-  right: 10px;
+  right: 5px;
   z-index: 100;
   background-color: white;
   padding: 10px;
   width: 460px;
   box-shadow: 0px 5px 10px #ddd;
+  box-sizing: border-box;
+    width: 500px;
 }
 
 .bottomFixed {
@@ -1021,4 +1029,5 @@ export default {
       margin-right: 10px;
     }
   }
+ 
 }</style>