sale-client 3.7.2 → 3.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.7.2",
+  "version": "3.7.4",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/charge/business/ServiceEvaluation.vue

@@ -1,14 +1,5 @@
 <template>
   <div class="evaluation-panel">
-<!--    <div class="response" v-if="response">-->
-<!--      <h4>响应结果:</h4>-->
-<!--      <pre>{{ response }}</pre>-->
-<!--    </div>-->
-
-<!--    <div class="error" v-if="error">-->
-<!--      <h4>错误信息:</h4>-->
-<!--      <pre>{{ error }}</pre>-->
-<!--    </div>-->
     <div class="status-bar">
       <div class="status-item">
         <span :class="['status-badge', deviceStatusClass]"></span>
@@ -31,15 +22,9 @@
       <p>{{ autoProcessMessage }}</p>
     </div>
     <div class="section">
-<!--      <button v-on:click="handleSignIn" v-bind:disabled="loading">登录评价器</button>-->
       <button v-on:click="handleEvaluate" v-bind:disabled="loading">发起评价</button>
-<!--      <button v-on:click="getEvaluationResult" v-bind:disabled="loading">获取结果</button>-->
       <button v-on:click="checkStatus" v-bind:disabled="loading">检查在线状态</button>
       <button v-on:click="getLoginInfo" v-bind:disabled="loading">检查登录状态</button>
-<!--      <button v-on:click="pauseService" v-bind:disabled="loading">暂停服务</button>-->
-<!--      <button v-on:click="playWelcome" v-bind:disabled="loading">播放欢迎词</button>-->
-<!--      <button v-on:click="playWaitTip" v-bind:disabled="loading">播放等待提醒</button>-->
-<!--      <button v-on:click="signOut" v-bind:disabled="loading">退出评价器</button>-->
     </div>
   </div>
 </template>
@@ -71,7 +56,10 @@ module.exports = {
       deviceCheckInterval: 10000,
       loginCheckTimer: null,
       loginCheckInterval: 1000,
-      evaluationStatus: '未发起'
+      evaluationStatus: '未发起',
+      // 新增：组件销毁标志和请求跟踪
+      isComponentDestroyed: false,
+      pendingRequests: new Set()
     }
   },
   props: {
@@ -80,9 +68,11 @@ module.exports = {
       default: undefined
     }
   },
-  destroyed () {
-    this.stopDeviceStatusMonitoring()
-    this.stopLoginStatusMonitoring()
+  beforeDestroy() {
+    this.cleanup();
+  },
+  destroyed() {
+    this.cleanup();
   },
   async ready() {
     console.log('row', this.row)
@@ -90,23 +80,54 @@ module.exports = {
     this.startDeviceStatusMonitoring()
   },
   methods: {
+    // 新增：统一的清理方法
+    cleanup() {
+      console.log('开始清理组件资源');
+      this.isComponentDestroyed = true;
+
+      // 清理所有定时器
+      this.stopDeviceStatusMonitoring();
+      this.stopLoginStatusMonitoring();
+
+      // 取消所有进行中的请求
+      this.pendingRequests.clear();
+
+      // 重置状态
+      this.loading = false;
+    },
+
+    // 新增：安全执行方法，检查组件状态
+    safeExecute(callback) {
+      if (this.isComponentDestroyed) {
+        console.log('组件已销毁，停止执行');
+        return false;
+      }
+      return true;
+    },
+
     async initSystem () {
-      // 1. 检查设备状态
+      if (!this.safeExecute()) return;
+
       console.log('检查设备状态')
       await this.checkStatus()
-      // 2. 如果设备在线，检查登录状态
+      if (!this.safeExecute()) return;
+
       console.log('设备在线，检查登录状态')
       if (this.deviceOnline) {
         await this.getLoginInfo()
       }
-      // 3. 如果设备在线但未登录，自动登录
+      if (!this.safeExecute()) return;
+
       if (this.deviceOnline && !this.userLogin) {
-        console.log('备在线但未登录，自动登录')
+        console.log('设备在线但未登录，自动登录')
         await this.handleSignIn()
       }
     },
+
     // 提交评价
     async submitEvaluation(value) {
+      if (!this.safeExecute()) return;
+
       this.evaluationStatus = '未发起'
       console.log('用户评价值：', value)
       let req = await this.$resetpost('api/af-revenue/logic/saveEvaluationBussiness', {
@@ -118,14 +139,23 @@ module.exports = {
       }, {resolveMsg: '提交评价成功', rejectMsg: '提交评价失败!'})
       this.$dispatch('success', '评价')
     },
+
     handleSignIn () {
+      if (!this.safeExecute()) return;
+
       let self = this;
       self.loading = true;
       self.error = null;
       self.response = null;
+
+      const requestId = 'signIn_' + Date.now();
+      this.pendingRequests.add(requestId);
+
       return co(
         this.$CEVEvaluator.signIn(this.signInParams)
           .then(function(result) {
+            if (!self.safeExecute() || !self.pendingRequests.has(requestId)) return;
+
             self.response = JSON.stringify(result.data, null, 2);
             console.log('登录result.data', result.data)
             if (result.data.code === '0' && result.data.text) {
@@ -135,23 +165,36 @@ module.exports = {
             }
           })
           .catch(function(err) {
+            if (!self.safeExecute() || !self.pendingRequests.has(requestId)) return;
+
             self.error = err.message || '签到失败';
             self.showCeAlert('签到失败: ' + (err.message || '未知错误'), 'error');
           })
           .finally(function() {
-            self.loading = false;
+            self.pendingRequests.delete(requestId);
+            if (self.safeExecute()) {
+              self.loading = false;
+            }
           })
       )
     },
 
     handleEvaluate () {
+      if (!this.safeExecute()) return;
+
       let self = this;
       self.loading = true;
       self.error = null;
       self.response = null;
       self.evaluationStatus = '等待用户评价'
+
+      const requestId = 'evaluate_' + Date.now();
+      this.pendingRequests.add(requestId);
+
       this.$CEVEvaluator.startEvaluateDirect()
         .then(async function (result) {
+          if (!self.safeExecute() || !self.pendingRequests.has(requestId)) return;
+
           self.response = JSON.stringify(result.data, null, 2);
           if (result.data.code === '0') {
             console.log('result.data.data', result.data.data)
@@ -160,27 +203,45 @@ module.exports = {
             if (res !== 'confirm') return
             self.submitEvaluation(result.data.data)
           }
-          //self.showCeAlert('', 'success');
         })
         .catch(function(err) {
+          if (!self.safeExecute() || !self.pendingRequests.has(requestId)) return;
+
           self.error = err.message || '评价启动失败';
           self.showCeAlert('用户评价失败: ' + (err.message || '未知错误'), 'error');
           self.evaluationStatus = '未发起'
         })
         .finally(function() {
-          self.loading = false;
+          self.pendingRequests.delete(requestId);
+          if (self.safeExecute()) {
+            self.loading = false;
+          }
         });
     },
+
     // 启动设备状态定时监测
     startDeviceStatusMonitoring() {
+      if (!this.safeExecute()) return;
+
+      // 先停止可能存在的旧定时器
+      this.stopDeviceStatusMonitoring();
+
       this.deviceCheckTimer = setInterval(async () => {
+        if (!this.safeExecute()) {
+          this.stopDeviceStatusMonitoring();
+          return;
+        }
+
         await this.checkStatus();
-        // 如果设备状态变化，更新登录状态
+        if (!this.safeExecute()) return;
+
         if (this.deviceOnline) {
           await this.getLoginInfo();
         }
+        if (!this.safeExecute()) return;
+
         if (this.deviceOnline && !this.userLogin) {
-          console.log('备在线但未登录，自动登录')
+          console.log('设备在线但未登录，自动登录')
           await this.handleSignIn()
         }
       }, this.deviceCheckInterval);
@@ -193,15 +254,26 @@ module.exports = {
         this.deviceCheckTimer = null;
       }
     },
+
     // 启动登录定时监测
     startLoginStatusMonitoring() {
+      if (!this.safeExecute()) return;
+
+      this.stopLoginStatusMonitoring();
+
       this.loginCheckTimer = setInterval(async () => {
-        let self = this
+        if (!this.safeExecute()) {
+          this.stopLoginStatusMonitoring();
+          return;
+        }
+
+        let self = this;
         try {
           const result = await this.$CEVEvaluator.getProgress();
+          if (!self.safeExecute()) return;
+
           console.log('progress', result.data)
           if (result.data.code === '0') {
-            // 如果进度达到100%，停止检测
             if (result.data.progress >= 100) {
               self.stopLoginStatusMonitoring();
               self.loginIng = false
@@ -209,6 +281,7 @@ module.exports = {
             }
           }
         } catch (error) {
+          if (!self.safeExecute()) return;
           console.error('评价进度检测失败:', error);
         }
       }, this.loginCheckInterval);
@@ -221,79 +294,62 @@ module.exports = {
         this.loginCheckTimer = null;
       }
     },
-    getEvaluationResult () {
-      let self = this;
-      self.loading = true;
-      self.error = null;
-
-      this.$CEVEvaluator.getEvaluateResult()
-        .then(function(result) {
-          self.response = JSON.stringify(result.data, null, 2);
-        })
-        .catch(function(err) {
-          self.error = err.message || '获取评价结果失败';
-          self.showCeAlert('获取评价结果失败', 'error');
-        })
-        .finally(function() {
-          self.loading = false;
-        });
-    },
 
     checkStatus () {
+      if (!this.safeExecute()) return;
+
       let self = this;
       self.loading = true;
       self.error = null;
       self.response = null;
+
+      const requestId = 'checkStatus_' + Date.now();
+      this.pendingRequests.add(requestId);
+
       return co(
         this.$CEVEvaluator.checkOnline()
           .then(function(result) {
+            if (!self.safeExecute() || !self.pendingRequests.has(requestId)) return;
+
             self.response = JSON.stringify(result.data, null, 2);
             if (result.data.code === '0' && result.data.online === '1') {
               self.deviceOnline = true
-              //self.showCeAlert('状态检查完成', 'success');
             } else {
               self.deviceOnline = false
               self.showCeAlert('状态检查完成', 'success');
             }
-
           })
           .catch(function(err) {
+            if (!self.safeExecute() || !self.pendingRequests.has(requestId)) return;
+
             self.error = err.message || '状态检查失败';
             self.showCeAlert('状态检查失败', 'error');
           })
           .finally(function() {
-            self.loading = false;
+            self.pendingRequests.delete(requestId);
+            if (self.safeExecute()) {
+              self.loading = false;
+            }
           })
       )
     },
 
-    getVersionInfo () {
+    getLoginInfo () {
+      if (!this.safeExecute()) return;
+
       let self = this;
       self.loading = true;
       self.error = null;
       self.response = null;
 
-      this.$CEVEvaluator.getVersion()
-        .then(function(result) {
-          self.response = JSON.stringify(result.data, null, 2);
-        })
-        .catch(function(err) {
-          self.error = err.message || '获取版本信息失败';
-          self.showCeAlert('获取版本信息失败', 'error');
-        })
-        .finally(function() {
-          self.loading = false;
-        });
-    },
+      const requestId = 'getLoginInfo_' + Date.now();
+      this.pendingRequests.add(requestId);
 
-    getLoginInfo () {
-      let self = this;
-      self.loading = true;
-      self.error = null;
-      self.response = null;
       return co(
         this.$CEVEvaluator.getLoginInfo()
           .then(async function (result) {
+            if (!self.safeExecute() || !self.pendingRequests.has(requestId)) return;
+
             self.response = JSON.stringify(result.data, null, 2);
             console.log('result.data', result.data)
             if (result.data.code === '0' && result.data.info.name) {
@@ -303,105 +359,62 @@ module.exports = {
               } else {
                 await self.signOut()
               }
-              //self.showCeAlert('当前用户已登录评价器', 'success');
             } else {
               self.userLogin = false
               self.showCeAlert('当前用户未登录评价器', 'error');
             }
           })
           .catch(function(err) {
+            if (!self.safeExecute() || !self.pendingRequests.has(requestId)) return;
+
             self.error = err.message || '获取登录信息失败';
             self.showCeAlert('获取登录信息失败', 'error');
           })
           .finally(function() {
-            self.loading = false;
+            self.pendingRequests.delete(requestId);
+            if (self.safeExecute()) {
+              self.loading = false;
+            }
           })
       )
     },
 
-    pauseService () {
-      let self = this;
-      self.loading = true;
-      self.error = null;
-      self.response = null;
-
-      this.$CEVEvaluator.pauseService()
-        .then(function(result) {
-          self.response = JSON.stringify(result.data, null, 2);
-          self.showCeAlert('暂停服务成功', 'success');
-        })
-        .catch(function(err) {
-          self.error = err.message || '暂停服务失败';
-          self.showCeAlert('暂停服务失败', 'error');
-        })
-        .finally(function() {
-          self.loading = false;
-        });
-    },
-
-    playWelcome () {
-      let self = this;
-      self.loading = true;
-      self.error = null;
-      self.response = null;
-
-      this.$CEVEvaluator.playWelcome()
-        .then(function(result) {
-          self.response = JSON.stringify(result.data, null, 2);
-          self.showCeAlert('播放欢迎词成功', 'success');
-        })
-        .catch(function(err) {
-          self.error = err.message || '播放欢迎词失败';
-          self.showCeAlert('播放欢迎词失败', 'error');
-        })
-        .finally(function() {
-          self.loading = false;
-        });
-    },
+    signOut () {
+      if (!this.safeExecute()) return;
 
-    playWaitTip () {
       let self = this;
       self.loading = true;
       self.error = null;
       self.response = null;
 
-      this.$CEVEvaluator.playWaitTip()
-        .then(function(result) {
-          self.response = JSON.stringify(result.data, null, 2);
-          self.showCeAlert('播放等待提醒成功', 'success');
-        })
-        .catch(function(err) {
-          self.error = err.message || '播放等待提醒失败';
-          self.showCeAlert('播放等待提醒失败', 'error');
-        })
-        .finally(function() {
-          self.loading = false;
-        });
-    },
-
-    signOut () {
-      let self = this;
-      self.loading = true;
-      self.error = null;
-      self.response = null;
+      const requestId = 'signOut_' + Date.now();
+      this.pendingRequests.add(requestId);
 
       return co(
         this.$CEVEvaluator.signOut()
           .then(function(result) {
+            if (!self.safeExecute() || !self.pendingRequests.has(requestId)) return;
+
             self.response = JSON.stringify(result.data, null, 2);
-            //self.showCeAlert('签退成功', 'success');
           })
           .catch(function(err) {
+            if (!self.safeExecute() || !self.pendingRequests.has(requestId)) return;
+
             self.error = err.message || '签退失败';
             self.showCeAlert('签退失败', 'error');
           })
           .finally(function() {
-            self.loading = false;
+            self.pendingRequests.delete(requestId);
+            if (self.safeExecute()) {
+              self.loading = false;
+            }
           })
       )
     },
 
     showCeAlert (message, type) {
+      if (!this.safeExecute()) return;
+
       if (type === 'error') {
         console.error(message);
         this.$showAlert(message, 'danger', 2000);

package/src/components/revenue/base/leftview/HiddenDangerInfo.vue

@@ -74,7 +74,7 @@ import { HttpResetClass } from 'vue-client'
 let getHiddenDangerGen = async function (self) {
   try {
     let http = new HttpResetClass()
-    let condition = `f_userinfoid = ${self.data.f_userinfo_id} and f_is_repaired = '隐患未处理'`
+    let condition = `f_userinfoid = ${self.data.f_userinfo_id} and f_is_repaired in ('隐患未处理','用户自行整改','转维修')`
     let getHiddenDanger = await http.load('POST', 'rs/sql/defectDetails', {
       data: {
         condition: condition,

package/src/components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferManage.vue

@@ -213,13 +213,13 @@
           }
         } else if (self.model.f_print[0] === '国税发票') {
           // TODO
-          self.$dispatch('success')
+          self.$dispatch('success', '过户')
         } else if (self.model.f_print[0] === '电子发票') {
           // TODO
-          self.$dispatch('success')
+          self.$dispatch('success', '过户')
         }
       } else {
-        self.$dispatch('success')
+        self.$dispatch('success', '过户')
       }
     } catch (error) {
       self.$showAlert(error, 'danger', 0)
@@ -403,7 +403,7 @@
         this.billData.bill = val.bill
       },
       printok () {
-        this.$dispatch('success')
+        this.$dispatch('success', '过户')
       },
 
       // 过户表及操作表信息

package/src/components/revenue/comprehen/ComprehenOperation/OtherGas/OtherGas.vue

@@ -407,7 +407,7 @@
             this.print = true
           }
         } else {
-          this.$dispatch('success')
+          this.$dispatch('success', '其他补气')
         }
       },
       pregas () {
@@ -481,7 +481,7 @@
         this.$dispatch('cancelclean', this.row)
       },
       printok () {
-        this.$dispatch('success')
+        this.$dispatch('success', '其他补气')
       }
     },
     events: {

package/src/components/revenue/comprehen/ComprehenOperation/ReplaceCard/ReplaceCardManage.vue

@@ -279,7 +279,7 @@
       },
       eticket_toggle () {
         this.eticket_show = false
-        this.$dispatch('success')
+        this.$dispatch('success', '补卡')
       },
       confirm () {
         this.eticket_msg = false
@@ -385,7 +385,7 @@
       },
       printok () {
         // 收据打完，判断是否还有其他票据进行请求 TODO
-        this.$dispatch('success')
+        this.$dispatch('success', '补卡')
       },
       fillcardChange (val) {
         if (val === 'IC卡丢失或损坏') {

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ChangeMeter.vue

@@ -563,7 +563,7 @@ export default {
       if (msg == 'confirm') {
         this.$dispatch('get-new-row', this.row)
       } else {
-        this.$dispatch('success')
+        this.$dispatch('success', '换表')
       }
     },
     flowmetermodels (label) {

package/src/components/revenue/comprehen/ComprehenOperation/newchangemeter/ResetMeter.vue

@@ -598,7 +598,7 @@ export default {
       if (msg == 'confirm') {
         this.$dispatch('get-new-row', this.row)
       } else {
-        this.$dispatch('success')
+        this.$dispatch('success', '换表')
       }
     },
     flowmetermodels (label) {

package/src/filiale/rongchuang/SafeCheck.vue

@@ -209,6 +209,16 @@
           暂无图片
         </td>
       </tr>
+      <tr v-for="checkitem in model.safecheckitem">
+        <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%" >处理后图片</td>
+        <td style="text-align: center;border: #E9E9E9 solid 1px;width: 66%" colspan="2" v-if="checkitem.f_repair_path">
+          <img-self :src="'rs/image/file/'+checkitem.f_repair_path" width="150" height="150"></img-self>
+        </td>
+        <td style="text-align: center;border: #E9E9E9 solid 1px;width: 66%" colspan="2"
+            v-if="!checkitem.f_repair_path">
+          暂无处理后图片
+        </td>
+      </tr>
     </table>
     <table class="table table-striped table-bordered" v-if="model.f_notified_path=='' && model.f_notified_path==null">
       <thead>

package/src/filiale/shimen/ChargeManage.vue

@@ -254,6 +254,14 @@ export default {
           this.$refs.oper.business({name: '评价', value: {routeName: 'service-evaluation'}})
         }
       },
+      hasEvaluatePermission (name) {
+        if (!this.$login.r || !Array.isArray(this.$login.r)) {
+          console.warn('权限列表不存在或不是数组')
+          return false
+        }
+        const permissionName = `${name}评价权限`
+        return this.$login.r.includes(permissionName)
+      }
     },
     events: {
       'error' (name, row, res) {
@@ -279,7 +287,7 @@ export default {
           this.serRow(row)
           return
         }
-        if (name !== '评价' && this.reSearchShowBusiness) {
+        if (this.hasEvaluatePermission(name) && this.reSearchShowBusiness) {
           console.log('row', row)
           this.$refs.oper.noButton = false
           this.$showMessage('要进行业务评价吗？', ['confirm', 'cancel']).then((res) => {

package/src/filiale/shimen/GiftFee/icTable.vue

@@ -238,7 +238,7 @@ export default {
           this.row.f_bill_style = '普通收据'
           this.print = true
         } else {
-          this.$dispatch('success')
+          this.$dispatch('success', '卡表赠费')
         }
       })
     },
@@ -308,7 +308,7 @@ export default {
       this.$dispatch('cancelclean', this.row)
     },
     printok () {
-      this.$dispatch('success')
+      this.$dispatch('success', '卡表赠费')
     }
   },
   computed: {

package/src/filiale/shimen/GiftFee/iotTable.vue

@@ -219,7 +219,7 @@ export default {
       })
     },
     printok () {
-      this.$dispatch('success')
+      this.$dispatch('success', '物联网赠费')
     },
     clean () {
       this.$dispatch('refresh')

package/src/filiale/shimen/ServiceEvaluation.vue

@@ -0,0 +1,582 @@
+<template>
+  <div class="evaluation-panel">
+<!--    <div class="response" v-if="response">-->
+<!--      <h4>响应结果:</h4>-->
+<!--      <pre>{{ response }}</pre>-->
+<!--    </div>-->
+
+<!--    <div class="error" v-if="error">-->
+<!--      <h4>错误信息:</h4>-->
+<!--      <pre>{{ error }}</pre>-->
+<!--    </div>-->
+    <div class="status-bar">
+      <div class="status-item" >
+        <span :class="['status-badge', deviceStatusClass]" v-if="isScanDevice"></span>
+        <span>设备状态: {{ deviceStatusText }}</span>
+      </div>
+      <div class="status-item">
+        <span :class="['status-badge', loginStatusClass]"></span>
+        <span>登录状态: {{ loginStatusText }}</span>
+      </div>
+      <div class="status-item">
+        <i class="fas fa-user"></i>
+        <span>用户: {{ signInParams.name }} (工号: {{ signInParams.num }})</span>
+      </div>
+      <div class="status-item">
+        <span>评价状态: {{ evaluationStatus }}</span>
+      </div>
+    </div>
+    <div class="auto-process" v-if="autoProcessMessage && isScanDevice">
+      <h4>评价器状态</h4>
+      <p>{{ autoProcessMessage }}</p>
+    </div>
+    <div class="section">
+<!--      <button v-on:click="handleSignIn" v-bind:disabled="loading">登录评价器</button>-->
+      <button v-on:click="handleEvaluate" v-bind:disabled="loading">发起评价</button>
+<!--      <button v-on:click="getEvaluationResult" v-bind:disabled="loading">获取结果</button>-->
+      <button v-on:click="checkStatus" v-bind:disabled="loading">检查在线状态</button>
+      <button v-on:click="getLoginInfo" v-bind:disabled="loading">检查登录状态</button>
+<!--      <button v-on:click="pauseService" v-bind:disabled="loading">暂停服务</button>-->
+<!--      <button v-on:click="playWelcome" v-bind:disabled="loading">播放欢迎词</button>-->
+<!--      <button v-on:click="playWaitTip" v-bind:disabled="loading">播放等待提醒</button>-->
+<!--      <button v-on:click="signOut" v-bind:disabled="loading">退出评价器</button>-->
+    </div>
+  </div>
+</template>
+
+<script>
+import co from "co";
+
+module.exports = {
+  title: 'EvaluationPanel',
+  data () {
+    return {
+      signInParams: {
+        num: this.$login.f.id,
+        name: this.$login.f.name,
+        pos: this.$login.f.f_show_rolestr,
+        org: this.$login.f.f_show_department_name,
+        equ: this.$login.f.f_show_department_name,
+        star: '5',
+        inf: `工号：${this.$login.f.id}`,
+        photo: '127.0.0.1:8068/photo.jpg'
+      },
+      loading: false,
+      response: null,
+      error: null,
+      userLogin: false,
+      loginIng: false,
+      deviceOnline: false,
+      deviceCheckTimer: null,
+      deviceCheckInterval: 10000,
+      loginCheckTimer: null,
+      loginCheckInterval: 1000,
+      evaluationStatus: '未发起',
+    //   是否扫描设备
+      isScanDevice: false
+
+    }
+  },
+  props: {
+    row: {
+      type: Object,
+      default: undefined
+    }
+  },
+  destroyed () {
+    this.stopDeviceStatusMonitoring()
+    this.stopLoginStatusMonitoring()
+  },
+  async ready() {
+    console.log('row', this.row)
+    console.log('这是登录信息', this.$login)
+    let roleList = this.$login.f.f_role_name.spilt(' ')
+    if (roleList.includes('收费员')){
+      this.isScanDevice = true
+      await this.initSystem()
+    }
+    this.startDeviceStatusMonitoring()
+  },
+  methods: {
+    async initSystem () {
+      // 1. 检查设备状态
+      console.log('检查设备状态')
+      await this.checkStatus()
+      // 2. 如果设备在线，检查登录状态
+      console.log('设备在线，检查登录状态')
+      if (this.deviceOnline) {
+        await this.getLoginInfo()
+      }
+      // 3. 如果设备在线但未登录，自动登录
+      if (this.deviceOnline && !this.userLogin) {
+        console.log('备在线但未登录，自动登录')
+        await this.handleSignIn()
+      }
+    },
+    // 提交评价
+    async submitEvaluation(value) {
+      this.evaluationStatus = '未发起'
+      console.log('用户评价值：', value)
+      let req = await this.$resetpost('api/af-revenue/logic/saveEvaluationBussiness', {
+        f_orgid: this.$login.f.orgid,
+        f_userinfo_id: this.row.f_userinfo_id,
+        f_operatorid: this.$login.f.id,
+        f_satisfaction: 5 - value,
+        f_user_type: this.row.f_user_type
+      }, {resolveMsg: '提交评价成功', rejectMsg: '提交评价失败!'})
+      this.$dispatch('success', '评价')
+    },
+    handleSignIn () {
+      let self = this;
+      self.loading = true;
+      self.error = null;
+      self.response = null;
+      return co(
+        this.$CEVEvaluator.signIn(this.signInParams)
+          .then(function(result) {
+            self.response = JSON.stringify(result.data, null, 2);
+            console.log('登录result.data', result.data)
+            if (result.data.code === '0' && result.data.text) {
+              self.showCeAlert(result.data.text, 'success');
+              self.loginIng = true
+              self.startLoginStatusMonitoring()
+            }
+          })
+          .catch(function(err) {
+            self.error = err.message || '签到失败';
+            self.showCeAlert('签到失败: ' + (err.message || '未知错误'), 'error');
+          })
+          .finally(function() {
+            self.loading = false;
+          })
+      )
+    },
+
+    handleEvaluate () {
+      let self = this;
+      self.loading = true;
+      self.error = null;
+      self.response = null;
+      self.evaluationStatus = '等待用户评价'
+      this.$CEVEvaluator.startEvaluateDirect()
+        .then(async function (result) {
+          self.response = JSON.stringify(result.data, null, 2);
+          if (result.data.code === '0') {
+            console.log('result.data.data', result.data.data)
+            self.evaluationStatus = '用户已评价'
+            let res = await self.$showMessage(`用户已评价，请提交`, ['confirm', 'cancel'])
+            if (res !== 'confirm') return
+            self.submitEvaluation(result.data.data)
+          }
+          //self.showCeAlert('', 'success');
+        })
+        .catch(function(err) {
+          self.error = err.message || '评价启动失败';
+          self.showCeAlert('用户评价失败: ' + (err.message || '未知错误'), 'error');
+          self.evaluationStatus = '未发起'
+        })
+        .finally(function() {
+          self.loading = false;
+        });
+    },
+    // 启动设备状态定时监测
+    startDeviceStatusMonitoring() {
+      this.deviceCheckTimer = setInterval(async () => {
+        await this.checkStatus();
+        // 如果设备状态变化，更新登录状态
+        if (this.deviceOnline) {
+          await this.getLoginInfo();
+        }
+        if (this.deviceOnline && !this.userLogin) {
+          console.log('备在线但未登录，自动登录')
+          await this.handleSignIn()
+        }
+      }, this.deviceCheckInterval);
+    },
+
+    // 停止设备状态监测
+    stopDeviceStatusMonitoring() {
+      if (this.deviceCheckTimer) {
+        clearInterval(this.deviceCheckTimer);
+        this.deviceCheckTimer = null;
+      }
+    },
+    // 启动登录定时监测
+    startLoginStatusMonitoring() {
+      this.loginCheckTimer = setInterval(async () => {
+        let self = this
+        try {
+          const result = await this.$CEVEvaluator.getProgress();
+          console.log('progress', result.data)
+          if (result.data.code === '0') {
+            // 如果进度达到100%，停止检测
+            if (result.data.progress >= 100) {
+              self.stopLoginStatusMonitoring();
+              self.loginIng = false
+              await self.getLoginInfo()
+            }
+          }
+        } catch (error) {
+          console.error('评价进度检测失败:', error);
+        }
+      }, this.loginCheckInterval);
+    },
+
+    // 停止评价状态监测
+    stopLoginStatusMonitoring() {
+      if (this.loginCheckTimer) {
+        clearInterval(this.loginCheckTimer);
+        this.loginCheckTimer = null;
+      }
+    },
+    getEvaluationResult () {
+      let self = this;
+      self.loading = true;
+      self.error = null;
+
+      this.$CEVEvaluator.getEvaluateResult()
+        .then(function(result) {
+          self.response = JSON.stringify(result.data, null, 2);
+        })
+        .catch(function(err) {
+          self.error = err.message || '获取评价结果失败';
+          self.showCeAlert('获取评价结果失败', 'error');
+        })
+        .finally(function() {
+          self.loading = false;
+        });
+    },
+
+    checkStatus () {
+      let self = this;
+      self.loading = true;
+      self.error = null;
+      self.response = null;
+      return co(
+        this.$CEVEvaluator.checkOnline()
+          .then(function(result) {
+            self.response = JSON.stringify(result.data, null, 2);
+            if (result.data.code === '0' && result.data.online === '1') {
+              self.deviceOnline = true
+              //self.showCeAlert('状态检查完成', 'success');
+            } else {
+              self.deviceOnline = false
+              self.showCeAlert('状态检查完成', 'success');
+            }
+
+          })
+          .catch(function(err) {
+            self.error = err.message || '状态检查失败';
+            self.showCeAlert('状态检查失败', 'error');
+          })
+          .finally(function() {
+            self.loading = false;
+          })
+      )
+    },
+
+    getVersionInfo () {
+      let self = this;
+      self.loading = true;
+      self.error = null;
+      self.response = null;
+
+      this.$CEVEvaluator.getVersion()
+        .then(function(result) {
+          self.response = JSON.stringify(result.data, null, 2);
+        })
+        .catch(function(err) {
+          self.error = err.message || '获取版本信息失败';
+          self.showCeAlert('获取版本信息失败', 'error');
+        })
+        .finally(function() {
+          self.loading = false;
+        });
+    },
+
+    getLoginInfo () {
+      let self = this;
+      self.loading = true;
+      self.error = null;
+      self.response = null;
+      return co(
+        this.$CEVEvaluator.getLoginInfo()
+          .then(async function (result) {
+            self.response = JSON.stringify(result.data, null, 2);
+            console.log('result.data', result.data)
+            if (result.data.code === '0' && result.data.info.name) {
+              if (result.data.info.name === self.signInParams.name) {
+                self.userLogin = true
+                self.stopLoginStatusMonitoring();
+              } else {
+                await self.signOut()
+              }
+              //self.showCeAlert('当前用户已登录评价器', 'success');
+            } else {
+              self.userLogin = false
+              self.showCeAlert('当前用户未登录评价器', 'error');
+            }
+          })
+          .catch(function(err) {
+            self.error = err.message || '获取登录信息失败';
+            self.showCeAlert('获取登录信息失败', 'error');
+          })
+          .finally(function() {
+            self.loading = false;
+          })
+      )
+    },
+
+    pauseService () {
+      let self = this;
+      self.loading = true;
+      self.error = null;
+      self.response = null;
+
+      this.$CEVEvaluator.pauseService()
+        .then(function(result) {
+          self.response = JSON.stringify(result.data, null, 2);
+          self.showCeAlert('暂停服务成功', 'success');
+        })
+        .catch(function(err) {
+          self.error = err.message || '暂停服务失败';
+          self.showCeAlert('暂停服务失败', 'error');
+        })
+        .finally(function() {
+          self.loading = false;
+        });
+    },
+
+    playWelcome () {
+      let self = this;
+      self.loading = true;
+      self.error = null;
+      self.response = null;
+
+      this.$CEVEvaluator.playWelcome()
+        .then(function(result) {
+          self.response = JSON.stringify(result.data, null, 2);
+          self.showCeAlert('播放欢迎词成功', 'success');
+        })
+        .catch(function(err) {
+          self.error = err.message || '播放欢迎词失败';
+          self.showCeAlert('播放欢迎词失败', 'error');
+        })
+        .finally(function() {
+          self.loading = false;
+        });
+    },
+
+    playWaitTip () {
+      let self = this;
+      self.loading = true;
+      self.error = null;
+      self.response = null;
+
+      this.$CEVEvaluator.playWaitTip()
+        .then(function(result) {
+          self.response = JSON.stringify(result.data, null, 2);
+          self.showCeAlert('播放等待提醒成功', 'success');
+        })
+        .catch(function(err) {
+          self.error = err.message || '播放等待提醒失败';
+          self.showCeAlert('播放等待提醒失败', 'error');
+        })
+        .finally(function() {
+          self.loading = false;
+        });
+    },
+
+    signOut () {
+      let self = this;
+      self.loading = true;
+      self.error = null;
+      self.response = null;
+
+      return co(
+        this.$CEVEvaluator.signOut()
+          .then(function(result) {
+            self.response = JSON.stringify(result.data, null, 2);
+            //self.showCeAlert('签退成功', 'success');
+          })
+          .catch(function(err) {
+            self.error = err.message || '签退失败';
+            self.showCeAlert('签退失败', 'error');
+          })
+          .finally(function() {
+            self.loading = false;
+          })
+      )
+    },
+
+    showCeAlert (message, type) {
+      if (type === 'error') {
+        console.error(message);
+        this.$showAlert(message, 'danger', 2000);
+      } else {
+        console.log(message);
+        this.$showAlert(message, 'success', 2000);
+      }
+    }
+  },
+  computed: {
+    deviceStatusClass() {
+      if (this.loading) return 'loading';
+      return this.deviceOnline ? 'online' : 'offline';
+    },
+    deviceStatusText() {
+      if (this.loading) return '检测中...';
+      return this.deviceOnline ? '在线' : '离线';
+    },
+    loginStatusClass() {
+      if (this.loading) return 'loading';
+      return this.userLogin ? 'online' : 'offline';
+    },
+    loginStatusText() {
+      if (this.loading) return '验证中...';
+      return this.userLogin ? '已登录' : this.loginIng ? '登录中' : '未登录'
+    },
+    autoProcessMessage () {
+      if (!this.deviceOnline) return '系统启动中，正在检查设备状态...'
+      return this.deviceOnline && this.userLogin ? '系统已就绪，可以开始评价' : this.loginIng ? '系统初始化中正在登录..' : '系统初始化失败，请检查设备连接'
+    }
+  },
+};
+</script>
+
+<style scoped>
+.section {
+  margin-bottom: 20px;
+  padding: 15px;
+  border: 1px solid #e0e0e0;
+  border-radius: 5px;
+}
+
+.section h3 {
+  margin-top: 0;
+  color: #333;
+  border-bottom: 1px solid #ddd;
+  padding-bottom: 8px;
+}
+
+.input-group {
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+}
+
+.input-group label {
+  display: inline-block;
+  width: 80px;
+  font-weight: bold;
+  margin-right: 10px;
+}
+
+.input-group input {
+  flex: 1;
+  padding: 8px;
+  border: 1px solid #ccc;
+  border-radius: 3px;
+  max-width: 300px;
+}
+
+button {
+  margin-right: 10px;
+  margin-bottom: 10px;
+  padding: 10px 15px;
+  background-color: #4CAF50;
+  color: white;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 14px;
+}
+
+button:disabled {
+  background-color: #cccccc;
+  cursor: not-allowed;
+}
+
+button:hover:not(:disabled) {
+  background-color: #45a049;
+}
+
+.response, .error {
+  margin-top: 20px;
+  padding: 15px;
+  border-radius: 5px;
+  font-size: 14px;
+}
+
+.response {
+  background-color: #f0f9f0;
+  border-left: 4px solid #4CAF50;
+}
+
+.error {
+  background-color: #fef0f0;
+  border-left: 4px solid #f56c6c;
+}
+
+pre {
+  white-space: pre-wrap;
+  word-wrap: break-word;
+  margin: 0;
+  font-family: 'Courier New', monospace;
+  font-size: 13px;
+}
+
+h2 {
+  text-align: center;
+  color: #333;
+  margin-bottom: 30px;
+}
+.auto-process {
+  background: #fff3cd;
+  border-left: 4px solid #ffc107;
+  padding: 10px 15px;
+  margin: 15px 0;
+  border-radius: 4px;
+}
+
+.auto-process h4 {
+  color: #856404;
+  margin-bottom: 5px;
+}
+.status-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin: 5px 0;
+}
+
+.status-badge {
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+  border-radius: 50%;
+  margin-right: 5px;
+}
+
+.online {
+  background: #2ecc71;
+}
+
+.offline {
+  background: #e74c3c;
+}
+
+.loading {
+  background: #f39c12;
+  animation: pulse 1.5s infinite;
+}
+.timer-badge {
+  display: inline-block;
+  padding: 3px 8px;
+  border-radius: 12px;
+  background: #3498db;
+  color: white;
+  font-size: 12px;
+  margin-left: 8px;
+}
+</style>

package/src/filiale/shimen/ShowCardSellGas.vue

@@ -426,7 +426,7 @@ let initCardGen = async function (self) {
       }
     } else {
       self.$showAlert('发卡售气成功', 'success', 2000)
-      self.$dispatch('success')
+      self.$dispatch('success', '发卡售气')
     }
     self.clickConfirm = false
   } catch (error) {
@@ -713,7 +713,7 @@ export default {
     },
     eticket_toggle () {
       this.eticket_show = false
-      this.$dispatch('success')
+      this.$dispatch('success', '发卡售气')
     },
     async confirm () {
       this.eticket_msg = false
@@ -805,7 +805,7 @@ export default {
       this.billData.bill = val.bill
     },
     printok () {
-      this.$dispatch('success')
+      this.$dispatch('success', '发卡售气')
     },
     calText (val) {
       let str = ''

package/src/filiale/shimen/sale.js

@@ -43,4 +43,7 @@ export default function () {
   Vue.component('charge-manage', (resolve) => { require(['./ChargeManage'], resolve) })
   // 业务操作组件
   Vue.component('charge-oper', (resolve) => { require(['./ChargeOper'], resolve) })
+
+  Vue.component('service-evaluation', (resolve) => { require(['./ServiceEvaluation'], resolve) })
+
 }

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/rongchuang/sale'
+import FilialeSale from './filiale/bayan/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'