Browse Source

优化交互统计、其他优化

wennn 3 years ago
parent
commit
f37f8920bd

+ 2 - 0
src/utils/device_type.js

@@ -34,6 +34,8 @@ export function returnDeviceType(value) {
       return '信标'
     case 17:
       return '看板'
+    case 18:
+      return '门禁'
     case 20:
       return '485转换盒'
     case 21:

+ 2 - 1
src/views/customer/components/customerManager.vue

@@ -43,7 +43,7 @@
     <el-dialog :visible.sync="customerFormVisible" title="用户信息" class="customer-dialog">
       <el-tabs v-model="activeName" type="border-card" tab-position="bottom" width="50%" @tab-click="handleClick">
         <el-tab-pane label="基本信息" name="customerBaseInfo">
-          <div style="height: 450px">
+          <div style="height: 490px">
             <el-form ref="editForm" :model="formmodel" :rules="rules" label-width="120px">
               <el-row>
                 <el-col :span="12">
@@ -1034,6 +1034,7 @@ export default {
               this.$message.success('修改成功!')
               this.customerFormVisible = false
               this.isDisabled = false
+              this.getList()
               this.$emit('saved')
             })
           }

+ 2 - 1
src/views/hospital/ncs_customer/customerManager.vue

@@ -43,7 +43,7 @@
     <el-dialog :visible.sync="customerFormVisible" title="用户信息" class="customer-dialog">
       <el-tabs v-model="activeName" type="border-card" tab-position="bottom" width="50%" @tab-click="handleClick">
         <el-tab-pane label="基本信息" name="customerBaseInfo">
-          <div style="height: 450px">
+          <div style="height: 490px">
             <el-form ref="editForm" :model="formmodel" :rules="rules" label-width="120px">
               <el-row>
                 <el-col :span="12">
@@ -1025,6 +1025,7 @@ export default {
               this.$message.success('修改成功!')
               this.customerFormVisible = false
               this.isDisabled = false
+              this.getList()
               this.$emit('saved')
             })
           }

+ 12 - 6
src/views/ncs-chars/index.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="container">
     <div style="margin: 10px">
+      <el-select v-model="sssparams.fromToType" filterable @change="handleClick">
+        <el-option label="全部" :value="0" />
+        <el-option label="客户与员工" :value="1" />
+        <el-option label="同事与同事" :value="2" />
+      </el-select>
       <span>
         <span>查询周期:</span>
         <en-year-month-picker :bool-day="true" @changed="handleYearMonthChanged" />
@@ -46,7 +51,7 @@
                   </div>
                   <div class="card-panel-description">
                     <div class="card-panel-text">
-                      未响应次数
+                      未完成次数
                     </div>
                     <!--            <span>高温</span>-->
                     <count-to :start-val="0" :end-val="partTotal.noCount" :duration="3200" class="card-panel-num" />
@@ -62,7 +67,7 @@
               <el-table-column type="index" width="100" label="序号" align="center" />
               <el-table-column prop="name" label="类型" min-width="130" align="center" />
               <el-table-column prop="count" label="交互次数" min-width="130" align="center" />
-              <el-table-column prop="noCount" label="未响应次数" min-width="130" align="center" />
+              <el-table-column prop="noCount" label="未完成次数" min-width="130" align="center" />
             </el-table>
           </div>
           <el-card shadow="always" style="margin-top: 15px;">
@@ -133,7 +138,8 @@ export default {
         month: '',
         cycle_type: 'MONTH',
         day: '',
-        seller_id: null
+        seller_id: null,
+        fromToType: 0
       },
       chart: null,
       chartData: {},
@@ -174,7 +180,7 @@ export default {
           _this.buildTable(res.btList, res.noBtList)
           _this.buildBtChart(res.btList, res.noBtList) // 饼图
           _this.buildChart(res.dataList, res.tilStr, res.xAxis, 'chart', '时间段交互统计')
-          _this.buildChart(res.noDataList, res.noTilStr, res.xAxis, 'noChart', '未响应交互统计')
+          _this.buildChart(res.noDataList, res.noTilStr, res.xAxis, 'noChart', '未完成交互统计')
         }
       })
     },
@@ -305,7 +311,7 @@ export default {
             data: btList
           },
           {
-            name: '未响应交互',
+            name: '未完成交互',
             type: 'pie',
             radius: [20, 140],
             center: ['75%', '50%'],
@@ -343,7 +349,7 @@ export default {
           data: res.hasZztDate
         },
         {
-          name: '未响应交互',
+          name: '未完成交互',
           type: 'bar',
           stack: 'Ad',
           barWidth: 5,

+ 2 - 0
src/views/ncs-interaction/index.vue

@@ -322,6 +322,8 @@ export default {
           return '广播'
         case 'TIME':
           return '时间'
+        case 'ENTRACEGUARD':
+          return '门禁'
         default:
           return '未知'
       }