Przeglądaj źródła

协议样式优化

@dongkboy 2 lat temu
rodzic
commit
95f7d42b62

+ 21 - 22
src/utils/websocket.js

@@ -5,38 +5,38 @@ let messageCallback = null
 let errorCallback = null
 let wsUrl = process.env.SOCKET_Url
 let tryTime = 0
- 
+
 // 接收ws后端返回的数据
-function websocketonmessage (e) { 
+function websocketonmessage (e) {
   messageCallback(JSON.parse(e.data))
 }
- 
+
 /**
  * 发起websocket连接
  * @param {Object} agentData 需要向后台传递的参数数据
  */
 function websocketSend (agentData) {
-  // 加延迟是为了尽量让ws连接状态变为OPEN   
-  setTimeout(() => { 
+  // 加延迟是为了尽量让ws连接状态变为OPEN
+  setTimeout(() => {
     // 添加状态判断,当为OPEN时,发送消息
-    if (websock.readyState === websock.OPEN) { // websock.OPEN = 1 
+    if (websock.readyState === websock.OPEN) { // websock.OPEN = 1
       // 发给后端的数据需要字符串化
       websock.send(JSON.stringify(agentData))
     }
-    if (websock.readyState === websock.CLOSED) { // websock.CLOSED = 3 
+    if (websock.readyState === websock.CLOSED) { // websock.CLOSED = 3
       console.log('websock.readyState=3')
-      Message.error('ws连接异常,请稍候重试')
+      // Message.error('ws连接异常,请稍候重试')
       errorCallback()
     }
   }, 500)
 }
- 
+
 // 关闭ws连接
-function websocketclose (e) {  
+function websocketclose (e) {
   // e.code === 1000  表示正常关闭。 无论为何目的而创建, 该链接都已成功完成任务。
   // e.code !== 1000  表示非正常关闭。
   if (e && e.code !== 1000) {
-    Message.error('ws连接异常,请稍候重试')
+    // Message.error('ws连接异常,请稍候重试')
     errorCallback()
     // // 如果需要设置异常重连则可替换为下面的代码,自行进行测试
     // if (tryTime < 10) {
@@ -55,35 +55,35 @@ function websocketclose (e) {
 function websocketOpen (e) {
   // console.log('ws连接成功')
 }
- 
+
 // 初始化weosocket
-function initWebSocket () { 
+function initWebSocket () {
   if (typeof (WebSocket) === 'undefined') {
     Message.error('您的浏览器不支持WebSocket,无法获取数据')
     return false
   }
-  
+
   // const token = Cookies.get('token')
   // // ws请求完整地址
   // const requstWsUrl = wsUrl + '?' + token
   // websock = new WebSocket(requstWsUrl)
   websock = new WebSocket(wsUrl)
- 
+
   websock.onmessage = function (e) {
     websocketonmessage(e)
-  } 
+  }
   websock.onopen = function () {
     websocketOpen()
   }
   websock.onerror = function () {
-    Message.error('ws连接异常,请稍候重试')
+    // Message.error('ws连接异常,请稍候重试')
     errorCallback()
   }
   websock.onclose = function (e) {
     websocketclose(e)
-  } 
+  }
 }
- 
+
 /**
  * 发起websocket请求函数
  * @param {string} url ws连接地址
@@ -91,7 +91,7 @@ function initWebSocket () {
  * @param {function} successCallback 接收到ws数据,对数据进行处理的回调函数
  * @param {function} errCallback ws连接错误的回调函数
  */
-export function sendWebsocket (url, agentData, successCallback, errCallback) { 
+export function sendWebsocket (url, agentData, successCallback, errCallback) {
 
   wsUrl+=url
   initWebSocket()
@@ -99,7 +99,7 @@ export function sendWebsocket (url, agentData, successCallback, errCallback) {
   errorCallback = errCallback
   websocketSend(agentData)
 }
- 
+
 /**
  * 关闭websocket函数
  */
@@ -109,4 +109,3 @@ export function closeWebsocket () {
     websock.onclose() // 关闭websocket
   }
 }
- 

+ 5 - 22
src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -36,6 +36,8 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="是否外部订单">
               <el-select :size="overSize" v-model="queryForm.isExternal" placeholder="请选择" clearable style="width: 100%">
@@ -55,7 +57,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="审核方式">
-              <el-select :size="overSize" v-model="queryForm.auditType" placeholder="请选择审核方式" style="width: 100%">
+              <el-select :size="overSize" v-model="queryForm.auditType" clearable placeholder="请选择审核方式" style="width: 100%">
                 <el-option label="人工审核" :value="1"></el-option>
                 <el-option label="自动审核" :value="2"></el-option>
               </el-select>
@@ -69,6 +71,8 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="录入人">
               <el-input :size="overSize" clearable v-model.trim="queryForm.creator" placeholder="请输入录入人"></el-input>
@@ -396,16 +400,6 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="12">
-                  <el-form-item label="险种组合类">
-                    <el-select v-model="productFilterList" multiple placeholder="选择险种" style="width: 100%"
-                      @change="productFilterListChange">
-                      <el-option v-for="item in productsTypeoptions" :key="item.dictValue" :label="item.dictTag"
-                        :value="item.dictValue"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-
                 <el-col :span="12">
                   <el-form-item label="序号" prop="serialNumber">
                     <el-input-number :min="0" v-model="agreement.serialNumber"></el-input-number>
@@ -1118,16 +1112,6 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="险种组合类">
-                  <el-select v-model="productFilterList" multiple placeholder="选择险种" style="width: 100%"
-                    @change="productFilterListChange">
-                    <el-option v-for="item in productsTypeoptions" :key="item.dictValue" :label="item.dictTag"
-                      :value="item.dictValue"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-
               <el-col :span="12">
                 <el-form-item label="序号" prop="serialNumber">
                   <el-input-number :min="0" v-model="agreementsHistoryInfo.agreement.serialNumber"></el-input-number>
@@ -2296,7 +2280,6 @@ export default {
       approvalStatusoptions: [], //审批状态
       productsTypeoptions: [], //车险产品字典
       productsTypeRuleoptions: [], //车险产品字典(不含费用的兜底配置)
-      InsInsuranceKindoptions: [],//险种组合类
       natureOfVehicleUseoptions: [],//车辆使用性质
 
       //操作符字典