From 12b5426188ca1a6280840336dfa09c2bf51e4d01 Mon Sep 17 00:00:00 2001
From: doublekou <951513186@qq.com>
Date: Fri, 24 Nov 2023 17:04:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/predictiveOutboundCall/index.vue | 101 ++++++++++++---------
 1 file changed, 59 insertions(+), 42 deletions(-)

diff --git a/src/views/predictiveOutboundCall/index.vue b/src/views/predictiveOutboundCall/index.vue
index 1ca1e4b..9af7a67 100644
--- a/src/views/predictiveOutboundCall/index.vue
+++ b/src/views/predictiveOutboundCall/index.vue
@@ -9,43 +9,6 @@
   <div class="app-container">
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="用户管理" name="first">
-        <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="65px" class="login-form">
-          <el-form-item prop="userName" label="用户名">
-            <el-input
-              v-model="form.userName"
-              type="text"
-              auto-complete="off"
-              placeholder="账号"
-            >
-              <svg-icon
-                slot="prefix"
-                icon-class="user"
-                class="el-input__icon input-icon"
-              />
-            </el-input>
-          </el-form-item>
-          <el-form-item prop="passWord" label="密码">
-            <el-input
-              v-model="form.passWord"
-              type="password"
-              auto-complete="off"
-              placeholder="密码"
-              @keyup.enter.native="handleLogin"
-            >
-              <svg-icon
-                slot="prefix"
-                icon-class="password"
-                class="el-input__icon input-icon"
-              />
-            </el-input>
-          </el-form-item>
-          <el-form-item style="display: flex;justify-content: flex-end;">
-            <!-- <el-button @click="resetForm('form')">重置</el-button> -->
-            <el-button type="primary" :loading="loading" @click="onSubmit('form')">确定</el-button>
-          </el-form-item>
-        </el-form>
-      </el-tab-pane>
-      <el-tab-pane label="活动列表" name="second">
         <el-row :gutter="20">
           <!--工具栏-->
           <div class="head-container">
@@ -62,11 +25,27 @@
           <el-table ref="table" v-loading="crud.loading" :data="crud.data" :header-cell-style="{'text-align':'left'}" style="width: 100%;">
             <el-table-column :show-overflow-tooltip="true" prop="actName" label="活动名称" />
             <!-- <el-table-column :show-overflow-tooltip="true" prop="totalNum" label="总数" /> -->
-            <el-table-column :show-overflow-tooltip="true" prop="executeTotalNum" label="预执行总数" />
-            <el-table-column :show-overflow-tooltip="true" prop="executeNum" label="已执行总数" />
-            <el-table-column :show-overflow-tooltip="true" prop="rateNum" label="接通数" />
-            <el-table-column :show-overflow-tooltip="true" prop="rate" label="并发数" />
-            <el-table-column :show-overflow-tooltip="true" prop="status" label="活动状态" />
+            <el-table-column :show-overflow-tooltip="true" prop="executeTotalNum" label="预执行总数">
+              <template slot-scope="scope">
+                <span>{{ scope.row.executeTotalNum===null?0:scope.row.executeTotalNum }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column :show-overflow-tooltip="true" prop="executeNum" label="已执行总数">
+              <template slot-scope="scope">
+                <span>{{ scope.row.executeNum===null?0:scope.row.executeNum }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column :show-overflow-tooltip="true" prop="rateNum" label="接通数">
+              <template slot-scope="scope">
+                <span>{{ scope.row.rateNum===null?0:scope.row.rateNum }}</span>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column :show-overflow-tooltip="true" prop="rate" label="并发数" /> -->
+            <el-table-column :show-overflow-tooltip="true" prop="status" label="活动状态">
+              <template slot-scope="scope">
+                <span>{{ scope.row.status===0?'启用':'暂停' }}</span>
+              </template>
+            </el-table-column>
             <el-table-column :show-overflow-tooltip="true" prop="createTime" width="135" label="创建日期">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -175,6 +154,44 @@
           </div>
         </el-dialog>
       </el-tab-pane>
+      <el-tab-pane label="活动列表" name="second">
+        <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="65px" class="login-form">
+          <el-form-item prop="userName" label="用户名">
+            <el-input
+              v-model="form.userName"
+              type="text"
+              auto-complete="off"
+              placeholder="账号"
+            >
+              <svg-icon
+                slot="prefix"
+                icon-class="user"
+                class="el-input__icon input-icon"
+              />
+            </el-input>
+          </el-form-item>
+          <el-form-item prop="passWord" label="密码">
+            <el-input
+              v-model="form.passWord"
+              type="password"
+              auto-complete="off"
+              placeholder="密码"
+              @keyup.enter.native="handleLogin"
+            >
+              <svg-icon
+                slot="prefix"
+                icon-class="password"
+                class="el-input__icon input-icon"
+              />
+            </el-input>
+          </el-form-item>
+          <el-form-item style="display: flex;justify-content: flex-end;">
+            <!-- <el-button @click="resetForm('form')">重置</el-button> -->
+            <el-button type="primary" :loading="loading" @click="onSubmit('form')">确定</el-button>
+          </el-form-item>
+        </el-form>
+
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>