Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/workman/components/EditPersonel.vue

@@ -7,6 +7,7 @@
     cancel-text="取消"
     width="820px"
     :maskClosable="false"
+    destroyOnClose
   >
     <a-form-model
       :model="form"
@@ -53,31 +54,14 @@
                 {{ v.name }}</a-select-option
               >
             </a-select>
-            <!-- <a-select
-              v-model="form.deptId"
-              @change="handleDeptSelect"
-              placeholder="请选择部门"
-            >
-              <a-select-option
-                v-for="v in diptData"
-                :key="v.id"
-                :value="v.id"
-                >{{ v.name }}</a-select-option
-              >
-            </a-select> -->
           </a-form-model-item>
         </a-col>
         <a-col :span="12">
-          <a-form-model-item label="星级" prop="starlevel">
-            <a-select v-model="form.starlevel" placeholder="请选择星级">
-              <a-select-option :value="5">5星</a-select-option>
-              <a-select-option :value="4">4星</a-select-option>
-              <a-select-option :value="3">3星</a-select-option>
-              <a-select-option :value="2">2星</a-select-option>
-              <a-select-option :value="1">1星</a-select-option>
-            </a-select>
+          <a-form-model-item label="经办人Id" prop="operatorId">
+            <a-input v-model="form.operatorId" placeholder="请输入经办人Id" />
           </a-form-model-item>
         </a-col>
+
         <!-- <a-col :span="12">
           <a-form-model-item label="所属窗口" prop="windowId">
             <a-select
@@ -96,18 +80,33 @@
         </a-col> -->
       </a-row>
       <a-row>
+        <a-col :span="12">
+          <a-form-model-item label="星级" prop="starlevel">
+            <a-select
+              allowClear
+              v-model="form.starlevel"
+              placeholder="请选择星级"
+            >
+              <a-select-option :value="5">5星</a-select-option>
+              <a-select-option :value="4">4星</a-select-option>
+              <a-select-option :value="3">3星</a-select-option>
+              <a-select-option :value="2">2星</a-select-option>
+              <a-select-option :value="1">1星</a-select-option>
+            </a-select>
+          </a-form-model-item>
+        </a-col>
         <a-col :span="12">
           <a-form-model-item label="职务" prop="userpost">
             <a-input v-model="form.userpost" placeholder="请输入职务" />
           </a-form-model-item>
         </a-col>
+      </a-row>
+      <a-row>
         <a-col :span="12">
           <a-form-model-item label="职称" prop="posttitle">
             <a-input v-model="form.posttitle" placeholder="请输入职称" />
           </a-form-model-item>
         </a-col>
-      </a-row>
-      <a-row>
         <a-col :span="12">
           <a-form-model-item label="政治面貌" prop="politicalstatus">
             <a-select
@@ -140,9 +139,14 @@
             </a-select>
           </a-form-model-item>
         </a-col>
+        <a-col :span="12">
+          <a-form-model-item label="电话" prop="phone">
+            <a-input v-model="form.phone" placeholder="请输入电话" />
+          </a-form-model-item>
+        </a-col>
       </a-row>
       <a-row v-if="form.dangyuan === 99">
-        <a-col :span="12"> </a-col>
+        <!-- <a-col :span="12"> </a-col> -->
         <a-col :span="12">
           <a-form-model-item label="其他称号" prop="dangyuanext">
             <a-input v-model="form.dangyuanext" placeholder="请输入称号" />
@@ -150,18 +154,11 @@
         </a-col>
       </a-row>
       <a-row>
-        <a-col :span="12">
-          <a-form-model-item label="电话" prop="phone">
-            <a-input v-model="form.phone" placeholder="请输入电话" />
-          </a-form-model-item>
-        </a-col>
         <a-col :span="12">
           <a-form-model-item label="手机" prop="mobile">
             <a-input v-model="form.mobile" placeholder="请输入手机" />
           </a-form-model-item>
         </a-col>
-      </a-row>
-      <a-row>
         <a-col :span="12">
           <a-form-model-item label="身份证" prop="idCard">
             <a-input v-model="form.idCard" placeholder="请输入身份证号码" />
@@ -428,6 +425,7 @@ export default {
         duty: "", // 岗位职责
         promise: "", // 服务承诺
         business: "", // 办理事项
+        operatorId: "", // 经办人id
         // modelIds: [], // 模块
       },
       rules: {
@@ -529,7 +527,7 @@ export default {
     },
     // 关闭对话框
     handleClose() {
-      this.$refs.formData.resetFields();
+      // this.$refs.formData.resetFields();
       this.loading = false;
       this.Visible = false;
     },

base-manager-ui/admin/src/pages/basicset/workman/components/addpersonnel.vue

@@ -7,6 +7,7 @@
     cancel-text="重置"
     width="820px"
     :maskClosable="false"
+    destroyOnClose
   >
     <a-form-model
       :model="form"
@@ -53,37 +54,14 @@
                 {{ v.name }}</a-select-option
               >
             </a-select>
-
-            <!-- <a-select
-              v-model="form.deptId"
-              @change="handleDeptSelect"
-              allowClear
-              placeholder="请选择部门"
-            >
-              <a-select-option
-                v-for="v in diptData"
-                :key="v.id"
-                :value="v.id"
-                >{{ v.name }}</a-select-option
-              >
-            </a-select> -->
           </a-form-model-item>
         </a-col>
         <a-col :span="12">
-          <a-form-model-item label="星级" prop="starlevel">
-            <a-select
-              allowClear
-              v-model="form.starlevel"
-              placeholder="请选择星级"
-            >
-              <a-select-option :value="5">5星</a-select-option>
-              <a-select-option :value="4">4星</a-select-option>
-              <a-select-option :value="3">3星</a-select-option>
-              <a-select-option :value="2">2星</a-select-option>
-              <a-select-option :value="1">1星</a-select-option>
-            </a-select>
+          <a-form-model-item label="经办人Id" prop="operatorId">
+            <a-input v-model="form.operatorId" placeholder="请输入经办人Id" />
           </a-form-model-item>
         </a-col>
+
         <!-- <a-col :span="12">
           <a-form-model-item label="所属窗口" prop="windowId">
             <a-select
@@ -102,18 +80,33 @@
         </a-col> -->
       </a-row>
       <a-row>
+        <a-col :span="12">
+          <a-form-model-item label="星级" prop="starlevel">
+            <a-select
+              allowClear
+              v-model="form.starlevel"
+              placeholder="请选择星级"
+            >
+              <a-select-option :value="5">5星</a-select-option>
+              <a-select-option :value="4">4星</a-select-option>
+              <a-select-option :value="3">3星</a-select-option>
+              <a-select-option :value="2">2星</a-select-option>
+              <a-select-option :value="1">1星</a-select-option>
+            </a-select>
+          </a-form-model-item>
+        </a-col>
         <a-col :span="12">
           <a-form-model-item label="职务" prop="userpost">
             <a-input v-model="form.userpost" placeholder="请输入职务" />
           </a-form-model-item>
         </a-col>
+      </a-row>
+      <a-row>
         <a-col :span="12">
           <a-form-model-item label="职称" prop="posttitle">
             <a-input v-model="form.posttitle" placeholder="请输入职称" />
           </a-form-model-item>
         </a-col>
-      </a-row>
-      <a-row>
         <a-col :span="12">
           <a-form-model-item label="政治面貌" prop="politicalstatus">
             <a-select
@@ -146,9 +139,14 @@
             </a-select>
           </a-form-model-item>
         </a-col>
+        <a-col :span="12">
+          <a-form-model-item label="电话" prop="phone">
+            <a-input v-model="form.phone" placeholder="请输入电话" />
+          </a-form-model-item>
+        </a-col>
       </a-row>
       <a-row v-if="form.dangyuan === 99">
-        <a-col :span="12"> </a-col>
+        <!-- <a-col :span="12"> </a-col> -->
         <a-col :span="12">
           <a-form-model-item label="其他称号" prop="dangyuanext">
             <a-input v-model="form.dangyuanext" placeholder="请输入称号" />
@@ -156,18 +154,11 @@
         </a-col>
       </a-row>
       <a-row>
-        <a-col :span="12">
-          <a-form-model-item label="电话" prop="phone">
-            <a-input v-model="form.phone" placeholder="请输入电话" />
-          </a-form-model-item>
-        </a-col>
         <a-col :span="12">
           <a-form-model-item label="手机" prop="mobile">
             <a-input v-model="form.mobile" placeholder="请输入手机" />
           </a-form-model-item>
         </a-col>
-      </a-row>
-      <a-row>
         <a-col :span="12">
           <a-form-model-item label="身份证" prop="idCard">
             <a-input v-model="form.idCard" placeholder="请输入身份证号码" />
@@ -470,6 +461,7 @@ export default {
         duty: "", // 岗位职责
         promise: "", // 服务承诺
         business: "", // 办理事项
+        operatorId: "", // 经办人id
         // modelIds: [], // 模块
       },
       rules: {
@@ -582,7 +574,7 @@ export default {
     },
     // 关闭对话框
     handleClose() {
-      this.$refs.formData.resetFields();
+      // this.$refs.formData.resetFields();
       this.loading = false;
       this.Visible = false;
     },

base-manager-ui/admin/src/pages/basicset/workman/personnel.vue

@@ -199,7 +199,7 @@
               onChange: handlePagination,
               onShowSizeChange: showSizeChange,
             }"
-            :scroll="{ y: 450 }"
+            :scroll="{ y: 530 }"
             :loading="loading"
             :columns="columns"
             :data-source="WorkmanData"

portal-manager-ui/admin/src/api/dataAdmin.js

@@ -28,6 +28,11 @@ export function getWorkerInfo(params) {
   return http.get(`${baseURL}/base/workman/info`, params);
 }
 
+
+//评价选项
+export function getOptonList(params){
+  return http.post(`${BASEURL}/bkb/bkbset/optionlist`,params)
+}
 //评价数据列表
 export function getEvaList(params) {
   return http.post(`${BASEURL}/bkb/evaluate/evaluatelist`, params);

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/components/HandlingDetails.vue

@@ -11,14 +11,14 @@
       <div v-if="modalInfo.show==1">
         <div class="headerInfo">
           <p>
-            <span>总耗时：{{queEvaData.alltime}}<i class="fa fa-long-arrow-down"></i></span>
-            <span>等待时间：{{queEvaData.waittime}}<i class="fa fa-long-arrow-down"></i></span>
-            <span>办理时间：{{queEvaData.bltime}}<i class="fa fa-long-arrow-down"></i></span>
+            <span>总耗时：{{queEvaData.alltime?queEvaData.alltime:'--'}}<i class="fa fa-long-arrow-down"></i></span>
+            <span>等待时间：{{queEvaData.waittime?queEvaData.waittime:'--'}}<i class="fa fa-long-arrow-down"></i></span>
+            <span>办理时间：{{queEvaData.bltime?queEvaData.bltime:'--'}}<i class="fa fa-long-arrow-down"></i></span>
           </p>
           <p>
-            <span>平均耗时：{{queEvaData.p_alltime}}</span>
-            <span>平均等待时间：{{queEvaData.p_waittime}}</span>
-            <span>平均办理时间：{{queEvaData.p_bltime}}</span>
+            <span>平均耗时：{{queEvaData.p_alltime?queEvaData.p_alltime:'--'}}</span>
+            <span>平均等待时间：{{queEvaData.p_waittime?queEvaData.p_waittime:'--'}}</span>
+            <span>平均办理时间：{{queEvaData.p_bltime?queEvaData.p_bltime:'--'}}</span>
           </p>
         </div>
         <div class="state" v-if="queEvaData.style==0">未办理</div>
@@ -45,12 +45,12 @@
               slot="description"
             >
               <div class="details">
-                <span><i class="lable">申报人：</i>{{queEvaData.people_name}}</span>
-                <span><i class="lable">取号时间:</i>{{queEvaData.taketime}}</span>
-                <span><i class="lable">排队编码：</i>{{queEvaData.flownum}}</span>
-                <span><i class="lable">取号方式：</i>{{queEvaData.wy_signin>0?'在线取号':'现场取号'}}</span>
+                <span><i class="lable">申报人：</i>{{queEvaData.people_name?queEvaData.people_name:'--'}}</span>
+                <span><i class="lable">取号时间:</i>{{queEvaData.taketime?queEvaData.taketime:'--'}}</span>
+                <span><i class="lable">排队编码：</i>{{queEvaData.flownum?queEvaData.flownum:'--'}}</span>
+                <span><i class="lable">取号方式：</i>{{queEvaData.wy_signin==''?'--':queEvaData.wy_signin>0?'在线取号':'现场取号'}}</span>
                 <span><i class="lable">注册方式：</i>--</span>
-                <span><i class="lable">取号设备：</i>{{queEvaData.take_name}}</span>
+                <span><i class="lable">取号设备：</i>{{queEvaData.take_name?queEvaData.take_name:'--'}}</span>
               </div>
             </div>
           </a-step>
@@ -69,10 +69,10 @@
               slot="description"
             >
               <div class="details">
-                <span><i class="lable">办理窗口：</i>{{queEvaData.window_name}}</span>
-                <span><i class="lable">办理开始时间：</i>{{queEvaData.bltime}}</span>
-                <span><i class="lable">工作人员：</i>{{queEvaData.workman_name}}</span>
-                <span><i class="lable">叫号设备：</i>{{queEvaData.calltime}}</span>
+                <span><i class="lable">办理窗口：</i>{{queEvaData.window_name?queEvaData.window_name:'--'}}</span>
+                <span><i class="lable">办理开始时间：</i>{{queEvaData.bltime?queEvaData.bltime:'--'}}</span>
+                <span><i class="lable">工作人员：</i>{{queEvaData.workman_name?queEvaData.workman_name:'--'}}</span>
+                <span><i class="lable">叫号设备：</i>{{queEvaData.call_name}}</span>
               </div>
             </div>
           </a-step>
@@ -92,17 +92,18 @@
               slot="description"
             >
               <div class="details">
-                <span><i class="lable">办理结束时间：</i>{{queEvaData.endtime}}</span>
-                <span><i class="lable">评价选项：</i>{{queEvaData.option_id}}</span>
-                <span><i class="lable">评价时间：</i>{{queEvaData.pj_time}}</span>
+                <span><i class="lable">办理结束时间：</i>{{queEvaData.endtime?queEvaData.endtime:'--'}}</span>
+                <span><i class="lable">评价选项：</i>{{queEvaData.option_id?queEvaData.option_id:'--'}}</span>
+                <span><i class="lable">评价时间：</i>{{queEvaData.pj_time?queEvaData.pj_time:'--'}}</span>
                 <span style="width:100%"><i class="lable">评价指标：</i>
                   <i class="pjzb" v-for="(item,index) in queEvaData.content" :key="index">{{item}}</i>
+                  <!-- <span v-if="queEvaData.content.length==0">--</span> -->
                 </span>
-                <span><i class="lable">评价来源：</i>{{queEvaData.source}}</span>
-                <span><i class="lable">评价设备：</i>{{queEvaData.pj_name}}</span>
+                <span><i class="lable">评价来源：</i>{{queEvaData.source?queEvaData.source:'--'}}</span>
+                <span><i class="lable">评价设备：</i>{{queEvaData.pj_name?queEvaData.pj_name:'--'}}</span>
                 <span><i class="lable">评价人照片：</i>
-                  <a-avatar v-if="!queEvaData.idcardData_PhotoFileName" shape="square" :size="40" icon="user" />
-                  <img v-else :src="process.env.VUE_APP_API_BASE_URL+text" alt="" srcset="">
+                  <a-avatar v-if="!queEvaData.picture || !baseurl" shape="square" :size="40" icon="user" />
+                  <img v-else :src="baseurl+'/'+queEvaData.picture" alt="" srcset="" style="max-width: 100px; max-height: 100px;">
                 </span>
               </div>
             </div>
@@ -132,21 +133,22 @@
               slot="description"
             >
               <div class="details">
-                <span><i class="lable">评价人：</i>{{queEvaData.idcard_Name}}</span>
-                <span><i class="lable">手机号:</i>{{queEvaData.phone}}</span>
-                <span><i class="lable">身份证号：</i>{{queEvaData.idcard_IDCardNo}}</span>
-                <span><i class="lable">窗口编号：</i>{{queEvaData.window_fronum}}</span>
-                <span><i class="lable">评价选项：</i>{{queEvaData.option_id}}</span>
-                <span><i class="lable">评价时间：</i>{{queEvaData.create_time}}</span>
+                <span><i class="lable">评价人：</i>{{queEvaData.idcard_Name?queEvaData.idcard_Name:'--'}}</span>
+                <span><i class="lable">手机号:</i>{{queEvaData.phone?queEvaData.phone:'--'}}</span>
+                <span><i class="lable">身份证号：</i>{{queEvaData.idcard_IDCardNo?queEvaData.idcard_IDCardNo:'--'}}</span>
+                <span><i class="lable">窗口编号：</i>{{queEvaData.window_fronum?queEvaData.window_fronum:'--'}}</span>
+                <span><i class="lable">评价选项：</i>{{queEvaData.option_id?queEvaData.option_id:'--'}}</span>
+                <span><i class="lable">评价时间：</i>{{queEvaData.create_time?queEvaData.create_time:'--'}}</span>
                 <span style="width:100%"><i class="lable">评价指标：</i>
                   <i class="pjzb" v-for="(item,index) in queEvaData.content" :key="index">{{item}}</i>
+                  <!-- <span v-if="queEvaData.content.length==0">--</span> -->
                 </span>
-                <span><i class="lable">评价来源：</i>{{queEvaData.source}}</span>
+                <span><i class="lable">评价来源：</i>{{queEvaData.source?queEvaData.source:'--'}}</span>
                 <span><i class="lable">评价设备：</i>--</span>
                 <span>
                   <i class="lable">评价人照片：</i>
-                  <a-avatar v-if="!queEvaData.idcardData_PhotoFileName" shape="square" :size="40" icon="user" />
-                  <img v-else :src="process.env.VUE_APP_API_BASE_URL+text" alt="" srcset="">
+                  <a-avatar v-if="!queEvaData.picture" shape="square" :size="40" icon="user" />
+                  <img v-else :src="process.env.VUE_APP_API_BASE_URL+'/'+queEvaData.picture" alt="" srcset="" style="max-width: 100px; max-height: 100px;">
                 </span>
               </div>
             </div>
@@ -166,7 +168,8 @@ export default {
 
   data() {
     return {
-      queEvaData:{}
+      queEvaData:{},
+      baseurl:'',
     };
   },
   filters: {
@@ -195,7 +198,9 @@ export default {
   },
   mounted() {},
 
-  methods: {},
+  created(){
+      this.baseurl = process.env.VUE_APP_API_PHP_URL
+  }
 };
 </script>
 

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/departmentEvaluation.vue

 <template>
-  <div class="callRecord-Container">
-    <div class="header_box">
-      <div>
-        <a-button
-          :loading="btnLoading"
-          type="success"
-          @click="handleExportTable"
-        >
-          <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
-        </a-button>
-        <a-button type="danger" @click="delTable">
-          <span>批量删除</span>
-        </a-button>
-        <b
-          >评价次数：<i>{{ evaCount }}次</i></b
-        >
-        <sub
-          >统计时间段：{{ BegindAndEndTime[0] }}~{{ BegindAndEndTime[1] }}</sub
-        >
-      </div>
-      <span>
-        <a-space>
-          <a-select
-            placeholder="全部评价"
-            @change="changeEvaChoose"
-            mode="multiple"
-          >
-            <a-select-option value="非常满意"> 非常满意 </a-select-option>
-            <a-select-option value="基本满意"> 基本满意 </a-select-option>
-            <a-select-option value="满意"> 满意 </a-select-option>
-            <a-select-option value="不满意"> 不满意 </a-select-option>
-            <a-select-option value="非常不满意"> 非常不满意 </a-select-option>
-          </a-select>
-          <a-select
-            placeholder="全部来源"
-            @change="changeEvaFrom"
-            mode="multiple"
-          >
-            <a-select-option value="1"> 窗口评价 </a-select-option>
-            <a-select-option value="2"> 自助服务终端 </a-select-option>
-            <a-select-option value="3"> 背靠背评价 </a-select-option>
-            <a-select-option value="4"> 微官网 </a-select-option>
-            <a-select-option value="5"> 好差评 </a-select-option>
-            <a-select-option value="6"> 一体化评价 </a-select-option>
-          </a-select>
+    <div class="callRecord-Container">
+        <div class="header_box">
+            <div>
+                <a-button type="success" @click="toexportTable">
+                    <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
+                </a-button>
+                <a-button type="danger" @click="delTable">
+                    <span>批量删除</span>
+                </a-button>
+                <b>评价次数：<i>{{evaCount}}次</i></b>
+                <sub>统计时间段：{{evaDates[0]}}~{{evaDates[1]}}</sub>
+            </div>
+            <span>
+                <a-space>
+                    <a-select v-model="evaChoose" placeholder="全部评价" @change="changeEvaChoose" mode="multiple" style="max-width:140px">
+                    <a-select-option v-for="item in optonList" :key="item.id" :value="item.id">{{item.name}}</a-select-option>
+                </a-select>
+                <a-select v-model="evaFrom" placeholder="全部来源" @change="changeEvaFrom" mode="multiple" style="max-width:160px">
+                    <a-select-option value="1"> 窗口评价 </a-select-option>
+                    <a-select-option value="2"> 自助服务终端 </a-select-option>
+                    <a-select-option value="3"> 背靠背评价 </a-select-option>
+                    <a-select-option value="4"> 微官网 </a-select-option>
+                    <a-select-option value="5"> 好差评 </a-select-option>
+                    <a-select-option value="6"> 一体化评价 </a-select-option>
+                </a-select>
 
-          <a-range-picker
-            :allowClear="false"
-            format="YYYY-MM-DD"
-            class="range_picker_style"
-            valueFormat="YYYY-MM-DD"
-            v-model="BegindAndEndTime"
-          >
-          </a-range-picker>
+                <a-range-picker :allowClear="false" format="YYYY年MM月DD日" class="range_picker_style" @change="rangePickerChange"
+                    v-model="BegindAndEndTime">
+                </a-range-picker>
 
-          <a-input v-model="searchName" placeholder="请输入内容搜索搜索">
-            <a-icon slot="prefix" type="search" />
-          </a-input>
-          <a-button type="primary" @click="handleSearch">搜索</a-button>
-          <a-button @click="resetBtn">重置</a-button>
-        </a-space>
-      </span>
+                <a-input v-model="searchName" placeholder="请输入评价人姓名或窗口编号搜索">
+                    <a-icon slot="prefix" type="search" />
+                </a-input>
+                <a-button type="primary" @click="togetevalist()">搜索</a-button>
+                <a-button @click="clearnAllChoose()">重置</a-button>
+                </a-space>
+            </span>
+        </div>
+        <div class="main">
+            <a-table size="small" bordered :row-key="(record) => record.id" :row-selection="{
+                selectedRowKeys: tableSelectedKeys,
+                onChange: onSelectChange,
+            }" :scroll="{ y: 590 }" :pagination="tablePagination" @change="pagTableChange" :loading="tableLoading"
+                :columns="tableHeaders" :dataSource="tableSourceData">
+                <template slot="评价人照片" slot-scope="text, record, index">
+                    <a-avatar v-if="!text || !baseurl" shape="square" :size="40" icon="user" />
+                    <img v-else :src="baseurl+'/'+text" alt="" srcset="" style="max-width: 100px; max-height: 100px;">
+                </template>
+                <template slot="操作" slot-scope="text, record, index">
+                    <a-button type="link" style="color:#FF7370;">删除</a-button>
+                    <a-button type="link" @click="openHandlingDetails(record)">详情</a-button>
+                </template>
+            </a-table>
+            <HandlingDetails ref="HandlingDetails"/>            
+            <a-modal v-model="visible" title="系统提示" @ok="togetEvaDetil()">
+                {{content}}
+            </a-modal>
+        </div>
     </div>
-    <div class="main">
-      <a-table
-        size="small"
-        bordered
-        :row-key="(record) => record.id"
-        :row-selection="{
-          selectedRowKeys: tableSelectedKeys,
-          onChange: onSelectChange,
-        }"
-        :scroll="{ y: 590 }"
-        :pagination="tablePagination"
-        @change="pagTableChange"
-        :loading="tableLoading"
-        :columns="tableHeaders"
-        :dataSource="tableSourceData"
-      >
-        <!-- 序号 -->
-        <span slot="index" slot-scope="text, record, index">{{
-          (tablePagination.current - 1) * tablePagination.pageSize + index + 1
-        }}</span>
-        <template slot="评价人照片" slot-scope="text">
-          <a-avatar v-if="!text" shape="square" :size="40" icon="user" />
-          <img
-            v-else
-            :src="process.env.VUE_APP_API_BASE_URL + text"
-            alt=""
-            srcset=""
-          />
-        </template>
-        <template slot="操作" slot-scope="text, record">
-          <a-button type="link" style="color: #ff7370">删除</a-button>
-          <a-button type="link" @click="openHandlingDetails(record)"
-            >详情</a-button
-          >
-        </template>
-      </a-table>
-      <HandlingDetails ref="HandlingDetails" />
-      <a-modal v-model="visible" title="系统提示" @ok="togetEvaDetil()">
-        {{ content }}
-      </a-modal>
-    </div>
-  </div>
 </template>
 
 <script>
 import table from "@/mixins/table";
 import HandlingDetails from "./components/HandlingDetails.vue";
-import {
-  getEvaList,
-  getEvaData,
-  getEvaDetil,
-  getQueEvaData,
-} from "@/api/dataAdmin";
+import { getOptonList, getEvaList, getEvaData, getEvaDetil, getQueEvaData } from "@/api/dataAdmin";
 
 export default {
-  mixins: [table],
-  name: "departmentEvaluation",
-  data() {
-    return {
-      btnLoading: false,
-      tableHeaders: [
-        {
-          title: "序号",
-          width: "60px",
-          align: "center",
-          scopedSlots: {
-            customRender: "index",
-          },
+    mixins: [table],
+    name: "departmentEvaluation",
+    data() {
+        return {
+            tableHeaders: [
+                {
+                    title: "序号",
+                    dataIndex: "index",
+                    width: "60px",
+                    key: "index",
+                    align: "center",
+                    customRender: (text, record, index) => `${index + 1}`,
+                },
+                {
+                    title: "部门名称",
+                    align: "center",
+                    dataIndex: "section",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "评价选项",
+                    align: "center",
+                    dataIndex: "option_id",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "评价人",
+                    align: "center",
+                    dataIndex: "idcard_Name",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "身份证号",
+                    align: "center",
+                    dataIndex: "idcard_IDCardNo",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "手机号",
+                    align: "center",
+                    dataIndex: "phone",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "评价时间",
+                    align: "center",
+                    dataIndex: "create_time",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "评价来源",
+                    align: "center",
+                    dataIndex: "pjxt",
+                    customRender: (text, record, index) => {
+                        if(text == 1){
+                            return '窗口评价'
+                        }else if(text == 2){
+                            return '自助服务终端'
+                        }else if(text == 3){
+                            return '背靠背评价'
+                        }else if(text == 4){
+                            return '微官网'
+                        }else if(text == 5){
+                            return '好差评'
+                        }else if(text == 6){
+                            return '一体化评价'
+                        }else{
+                            return '--'
+                        }
+                    },
+                },
+                {
+                    title: "评价设备",
+                    align: "center",
+                    dataIndex: "source",
+                    customRender: (text, record, index) => {
+                        if(text == 1){
+                            return '安卓'
+                        }else if(text == 2){
+                            return '导视机'
+                        }else if(text == 3){
+                            return '微信'
+                        }else{
+                            return '--'
+                        }
+                    },
+                },
+                {
+                    title: "评价人照片",
+                    align: "center",
+                    dataIndex: "picture",
+                    scopedSlots: {
+                        customRender: "评价人照片",
+                    },
+                },
+                {
+                    title: "操作",
+                    align: "center",
+                    dataIndex: "操作",
+                    scopedSlots: {
+                        customRender: "操作",
+                    },
+                },
+            ],
+            BegindAndEndTime: [],
+            searchName: undefined,            
+            //删除窗口判断
+            visible: false,
+            tableSourceData:[],
+            evaCount:0,//评价次数
+            evaChoose:[],//评价选项
+            evaFrom:[],// 评价来源
+            evaDates:[],// 评价日期
+            content:'此操作将删除该评价信息，是否继续？',
+            delId:null,//当前删除id
+            baseurl:'',
+            optonList:[]
+        };
+    },
+    components: {
+        HandlingDetails
+    },
+    mounted() {
+        this.setMoment();
+        // 设置默认时间为今天
+        this.evaDates=[this.$moment(new Date()).format("YYYY-MM-DD"),this.$moment(new Date()).format("YYYY-MM-DD")]
+        
+        this.togetevalist()
+
+        getOptonList().then(res=>{
+            console.log(res);
+            if(res.code==1){
+                this.optonList = res.data
+            }
+        })
+    },
+    methods: {
+        
+        clearnAllChoose(){
+            this.evaChoose = []
+            this.evaFrom = []
+            this.searchName = ''
         },
-        {
-          title: "部门名称",
-          align: "center",
-          customRender: (text) => {
-            return text.section ? text.section : "--";
-          },
+        //导出
+        toexportTable() {
+            let tableData = [];
+            // 拼接评价选项
+            let chooseStr = this.evaChoose.join(',')
+            // 要先拼接评价来源
+            let fromString = this.evaFrom.join(',')
+            if (this.tableSelectedRows.length == 0) {
+                getEvaList({
+                    page:1,
+                    size:-1,
+                    type:'bmpj',
+                    option_id:chooseStr,
+                    pjxt:fromString,//传0代表全部
+                    time:this.evaDates,
+                    info:this.searchName
+                }).then((res)=>{
+                    const{code,data} = res;
+                    if(code == 1){
+                        tableData = JSON.parse(JSON.stringify(data.data.data));
+                        tableData.forEach((item)=>{
+                            item.pjxt = item.pjxt == 1?'窗口评价':item.pjxt == 2?'自助服务终端':item.pjxt == 3?'背靠背评价':item.pjxt == 4?'微官网':item.pjxt == 5?'好差评':'一体化评价'
+                            item.source = item.source == 1?'安卓': item.source == 2?'导视机':'微信'
+                        })
+                        let tableColumns = JSON.parse(JSON.stringify(this.tableHeaders));
+                        let newTableData = tableData.map(item => {
+                            let obj = {};
+                            for (let key in item) {
+                                obj[key] = item[key];
+                            }
+                            return obj;
+                        })
+                        let exprotExcelName = `${this.nowDay} / ${this.nowTime} / ${this.$route['meta']['title'] || '报表信息统计'}`;
+                        this.exportExcel(tableColumns, newTableData, exprotExcelName);
+                    }
+                })
+
+            } else {
+                tableData = JSON.parse(JSON.stringify(this.tableSelectedRows));
+                tableData.forEach((item)=>{
+                    item.pjxt = item.pjxt == 1?'窗口评价':item.pjxt == 2?'自助服务终端':item.pjxt == 3?'背靠背评价':item.pjxt == 4?'微官网':item.pjxt == 5?'好差评':'一体化评价'
+                    item.source = item.source == 1?'安卓': item.source == 2?'导视机':'微信'
+                })
+                let tableColumns = JSON.parse(JSON.stringify(this.tableHeaders));
+                let newTableData = tableData.map(item => {
+                    let obj = {};
+                    for (let key in item) {
+                        obj[key] = item[key];
+                    }
+                    return obj;
+                })
+                let exprotExcelName = `${this.nowDay} / ${this.nowTime} / ${this.$route['meta']['title'] || '报表信息统计'}`;
+                this.exportExcel(tableColumns, newTableData, exprotExcelName);
+            }
+
         },
-        {
-          title: "评价选项",
-          align: "center",
-          dataIndex: "option_id",
+        delTable(){
+            // console.log(this.tableSelectedRows);
+            this.visible = true;
+            if(!this.tableSelectedRows.length){
+                this.content = '一条评论都没有选中'
+            }else{
+                this.content = '此操作将删除这些评价信息，是否继续？'
+                let arr = []
+                this.tableSelectedRows.forEach(item => {
+                    arr.push(item.id)
+                });
+                this.delId = arr
+            }
         },
-        {
-          title: "评价人",
-          align: "center",
-          customRender: (text) => {
-            return text.idcard_Name ? text.idcard_Name : "--";
-          },
+        togetEvaDetil(){
+            getEvaDetil({
+                id:this.delId
+            }).then(res=>{
+                {
+                    this.delId=null
+                    this.visible = false;
+                    // 要刷新页面
+                    this.togetevalist()
+                }
+            })
         },
-        {
-          title: "身份证号",
-          align: "center",
-          customRender: (text) => {
-            return text.idcard_IDCardNo ? text.idcard_IDCardNo : "--";
-          },
+        togetQueEvaData(record){
+            getQueEvaData({
+                id:record.id
+            }).then(res=>{
+                console.log(res);
+                const {code,data} = res
+                if(code==1){
+                    this.$refs.HandlingDetails.queEvaData = data
+                }
+            })
         },
-        {
-          title: "手机号",
-          align: "center",
-          customRender: (text) => {
-            return text.phone ? text.phone : "--";
-          },
+        togetEvaData(id){
+            getEvaData({
+                id:id
+            }).then(res=>{
+                console.log(res);
+                const {code,data} = res
+                if(code==1){
+                    this.$refs.HandlingDetails.queEvaData = data
+                }
+            })
         },
-        {
-          title: "评价时间",
-          align: "center",
-          dataIndex: "create_time",
+        togetevalist(){
+            // 拼接评价选项
+            let chooseStr = this.evaChoose.join(',')
+            // 要先拼接评价来源
+            let fromString = this.evaFrom.join(',')
+            getEvaList({
+                page:this.tablePagination.current,
+                size:this.tablePagination.pageSize,
+                type:'bmpj',
+                option_id:chooseStr,
+                pjxt:fromString,//传0代表全部
+                time:this.evaDates,
+                info:this.searchName
+            }).then((res)=>{
+                console.log(11111,res);
+                const{code,data} = res;
+                if(code == 1){
+                    this.tableSourceData = data.data.data
+                    this.evaCount = data.count
+                    this.tablePagination.total = data.count
+                }
+            })
         },
-        {
-          title: "评价来源",
-          align: "center",
-          dataIndex: "pjxt",
-          customRender: (text, record, index) => {
-            if (text == 1) {
-              return "窗口评价";
-            } else if (text == 2) {
-              return "自助服务终端";
-            } else if (text == 3) {
-              return "背靠背评价";
-            } else if (text == 4) {
-              return "微官网";
-            } else if (text == 5) {
-              return "好差评";
-            } else {
-              return "一体化评价";
+        changeEvaFrom(val){
+            if(val.length){
+                this.evaFrom = val;
+            }else{
+                this.evaFrom = [0]
             }
-          },
         },
-        {
-          title: "评价设备",
-          align: "center",
-          dataIndex: "source",
-          customRender: (text, record, index) => {
-            if (text == 1) {
-              return "安卓";
-            } else if (text == 2) {
-              return "导视机";
-            } else {
-              return "微信";
+        changeEvaChoose(val){
+            this.evaChoose = val
+        },
+        rangePickerChange(val) {
+            this.evaDates = [this.$moment(val[0]).format("YYYY-MM-DD"),this.$moment(val[1]).format("YYYY-MM-DD")]
+        },
+        QueueState(type) {
+            switch (type) {
+                case 0:
+                    return "type1";
+                case 1:
+                    return "type2";
+
+                default:
+                    return "type0";
             }
-          },
         },
-        {
-          title: "评价人照片",
-          align: "center",
-          dataIndex: "picture",
-          scopedSlots: {
-            customRender: "评价人照片",
-          },
+        //详情模块
+        openHandlingDetails(record) {
+            // 判断为窗口屏或者其他状况，调用不同接口
+            // if(record.pjxt==1){
+            //     this.$refs.HandlingDetails.modalInfo.title = "办理明细";
+            //     this.$refs.HandlingDetails.modalInfo.show = 1;
+            //     this.togetQueEvaData(record)
+            // }else{
+                this.$refs.HandlingDetails.modalInfo.title = "评价详情";
+                this.$refs.HandlingDetails.modalInfo.show = 2;
+                this.togetEvaData(record.id)
+            // }
+            
+            this.$refs.HandlingDetails.modalInfo.visible = true;
         },
-        {
-          title: "操作",
-          align: "center",
-          dataIndex: "操作",
-          scopedSlots: {
-            customRender: "操作",
-          },
+        //删除模态框
+        showModal(record) {
+            this.visible = true;
+            this.delId = record.id
         },
-      ],
-      BegindAndEndTime: [
-        this.$moment(new Date()).format("YYYY-MM-DD"),
-        this.$moment(new Date()).format("YYYY-MM-DD"),
-      ],
-      searchName: undefined,
-      //删除窗口判断
-      visible: false,
-      tableSourceData: [],
-      evaCount: 0, //评价次数
-      evaChoose: [], //评价选项
-      evaFrom: [0], // 评价来源
-      evaDates: [
-        this.$moment(new Date()).format("YYYY-MM-DD"),
-        this.$moment(new Date()).format("YYYY-MM-DD"),
-      ], // 评价日期
-      content: "此操作将删除该评价信息，是否继续？",
-      delId: null, //当前删除id
-      tHeader: [
-        // 导出的表头名信息
-        "部门名称",
-        "评价选项",
-        "评价人",
-        "身份证号码",
-        "手机号",
-        "评价时间",
-        "评价来源",
-        "评价设备",
-      ],
-      filterVal: [
-        // 导出的表头字段名，需要导出表格字段名
-        "section",
-        "option_id",
-        "idcard_Name",
-        "idcard_IDCardNo",
-        "phone",
-        "create_time",
-        "pjxt",
-        "source",
-      ],
-      tableSelectedKeys: [],
-      tableSelectedRows: [],
-    };
-  },
-  components: {
-    HandlingDetails,
-  },
-  mounted() {
-    this.setMoment();
-    this.togetevalist();
-  },
-  methods: {
-    delTable() {
-      // console.log(this.tableSelectedRows);
-      this.visible = true;
-      if (!this.tableSelectedRows.length) {
-        this.content = "一条评论都没有选中";
-      } else {
-        this.content = "此操作将删除这些评价信息，是否继续？";
-        let arr = [];
-        this.tableSelectedRows.forEach((item) => {
-          arr.push(item.id);
-        });
-        this.delId = arr;
-      }
-    },
-    togetEvaDetil() {
-      getEvaDetil({
-        id: this.delId,
-      }).then((res) => {
-        {
-          this.delId = null;
-          this.visible = false;
-          // 要刷新页面
-          this.togetevalist();
-        }
-      });
     },
-    togetQueEvaData(record) {
-      getQueEvaData({
-        id: record.id,
-      }).then((res) => {
-        console.log(res);
-        const { code, data } = res;
-        if (code == 1) {
-          this.$refs.HandlingDetails.queEvaData = data;
+    watch:{
+        tablePagination(){
+            this.togetevalist()
         }
-      });
-    },
-    togetEvaData(id) {
-      getEvaData({
-        id: id,
-      }).then((res) => {
-        const { code, data } = res;
-        if (code == 1) {
-          this.$refs.HandlingDetails.queEvaData = data;
-        }
-      });
-    },
-    // 搜索
-    handleSearch() {
-      this.tablePagination.current = 1;
-      this.tableSelectedKeys = [];
-      this.tableSelectedRows = [];
-      this.togetevalist();
     },
-    //重置按钮
-    resetBtn() {
-      this.tablePagination.current = 1;
-      this.tableSelectedKeys = [];
-      this.tableSelectedRows = [];
-      this.BegindAndEndTime = [
-        this.$moment(new Date()).format("YYYY-MM-DD"),
-        this.$moment(new Date()).format("YYYY-MM-DD"),
-      ];
-      this.searchName = "";
-      this.togetevalist();
-    },
-    togetevalist() {
-      // 拼接评价选项
-      let chooseStr = this.evaChoose.join(",");
-      // 要先拼接评价来源
-      let fromString = this.evaFrom.join(",");
-      getEvaList({
-        page: this.tablePagination.current,
-        size: this.tablePagination.pageSize,
-        type: "bmpj",
-        option_id: chooseStr,
-        pjxt: fromString, //传0代表全部
-        time: this.BegindAndEndTime,
-        info: this.searchName,
-      }).then((res) => {
-        const { code, data } = res;
-        if (code == 1) {
-          this.tableSourceData = data.data.data;
-          this.evaCount = data.count;
-          this.tablePagination.total = data.count;
-        }
-      });
-    },
-    changeEvaFrom(val) {
-      if (val.length) {
-        this.evaFrom = val;
-      } else {
-        this.evaFrom = [0];
-      }
-    },
-    changeEvaChoose(val) {
-      this.evaChoose = val;
-    },
-    rangePickerChange(val) {
-      this.evaDates = [
-        this.$moment(val[0]).format("YYYY-MM-DD"),
-        this.$moment(val[1]).format("YYYY-MM-DD"),
-      ];
-    },
-    QueueState(type) {
-      switch (type) {
-        case 0:
-          return "type1";
-        case 1:
-          return "type2";
-
-        default:
-          return "type0";
-      }
-    },
-    //详情模块
-    openHandlingDetails(record) {
-      // 判断为窗口屏或者其他状况，调用不同接口
-      // if(record.pjxt==1){
-      //     this.$refs.HandlingDetails.modalInfo.title = "办理明细";
-      //     this.$refs.HandlingDetails.modalInfo.show = 1;
-      //     this.togetQueEvaData(record)
-      // }else{
-      this.$refs.HandlingDetails.modalInfo.title = "评价详情";
-      this.$refs.HandlingDetails.modalInfo.show = 2;
-      this.togetEvaData(record.id);
-      // }
-
-      this.$refs.HandlingDetails.modalInfo.visible = true;
-    },
-    //删除模态框
-    showModal(record) {
-      this.visible = true;
-      this.delId = record.id;
-    },
-    // 选中
-    onSelectChange(keys, rows) {
-      this.tableSelectedKeys = keys;
-      const res = new Map();
-      this.tableSelectedRows = [...this.tableSelectedRows, ...rows]
-        .filter((v) => {
-          return !res.has(v.id) && res.set(v.id, 1);
-        })
-        .filter((v) => {
-          return this.tableSelectedKeys.some((val) => v.id == val);
-        });
-    },
-    // 导出
-    async handleExportTable() {
-      this.btnLoading = true;
-      let obj = {
-        1: "窗口评价",
-        2: "自助服务终端",
-        3: "背靠背评价",
-        4: "微官网",
-        5: "好差评",
-        6: "一体化评价",
-      };
-      if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
-        this.tableSelectedRows.forEach((item) => {
-          Object.keys(obj).forEach((keys) => {
-            if (item.pjxt == keys) {
-              item.pjxt = obj[keys];
-            }
-          });
-        });
-        export2Excel(
-          this.tHeader,
-          this.filterVal,
-          this.tableSelectedRows,
-          "办事部门评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-        );
-      } else {
-        // 拼接评价选项
-        let chooseStr = this.evaChoose.join(",");
-        // 要先拼接评价来源
-        let fromString = this.evaFrom.join(",");
-        getEvaList({
-          page: 1,
-          size: -1,
-          type: "bmpj",
-          option_id: chooseStr,
-          pjxt: fromString, //传0代表全部
-          time: this.BegindAndEndTime,
-          info: this.searchName,
-        }).then((res) => {
-          const { code, data } = res;
-          if (code == 1) {
-            if (!data.data.data.length) return;
-            for (let item of data.data.data) {
-              Object.keys(obj).forEach((key) => {
-                if (item.pjxt == key) {
-                  item.pjxt = obj[key];
-                }
-              });
-            }
-            export2Excel(
-              this.tHeader,
-              this.filterVal,
-              data.data.data,
-              "办事部门评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-            );
-          }
-        });
-      }
-      this.btnLoading = false;
-    },
-  },
-  watch: {
-    tablePagination() {
-      this.togetevalist();
-    },
-  },
+    created(){
+        this.baseurl = process.env.VUE_APP_API_PHP_URL
+    }
 };
 </script>
 
 <style lang="less" scoped>
 /deep/.ant-spin-container {
-  display: block;
+    display: block;
 }
 
 .header_box {
-  padding-bottom: 1rem;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-
-  & > div {
+    padding-bottom: 1rem;
     display: flex;
-    justify-content: flex-start;
+    justify-content: space-between;
     align-items: center;
 
-    b {
-      font-style: normal;
-      font-weight: unset;
-      font-size: 16px;
-      margin-left: 20px;
+    &>div {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
 
-      i {
-        color: #0595fd;
-        font-style: normal;
-      }
-    }
+        b {
+            font-style: normal;
+            font-weight: unset;
+            font-size: 16px;
+            margin-left: 20px;
+
+            i {
+                color: #0595fd;
+                font-style: normal;
+            }
+        }
 
-    sub {
-      font-size: 14px;
-      font-style: normal;
-      bottom: unset;
-      margin-left: 20px;
+        sub {
+            font-size: 14px;
+            font-style: normal;
+            bottom: unset;
+            margin-left: 20px;
+        }
     }
-  }
 }
 </style>
 

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/matterEvaluation.vue

 <template>
-  <div class="callRecord-Container">
-    <div class="header_box">
-      <div>
-        <a-button
-          :loading="btnLoading"
-          type="success"
-          @click="handleExportTable"
-        >
-          <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
-        </a-button>
-        <a-button type="danger" @click="delTable">
-          <span>批量删除</span>
-        </a-button>
-        <b
-          >评价次数：<i>{{ evaCount }}次</i></b
-        >
-        <sub
-          >统计时间段：{{ BegindAndEndTime[0] }}~{{ BegindAndEndTime[1] }}</sub
-        >
-      </div>
-      <span>
-        <a-space>
-          <a-select
-            placeholder="全部评价"
-            @change="changeEvaChoose"
-            mode="multiple"
-          >
-            <a-select-option value="非常满意"> 非常满意 </a-select-option>
-            <a-select-option value="基本满意"> 基本满意 </a-select-option>
-            <a-select-option value="满意"> 满意 </a-select-option>
-            <a-select-option value="不满意"> 不满意 </a-select-option>
-            <a-select-option value="非常不满意"> 非常不满意 </a-select-option>
-          </a-select>
-          <a-select
-            placeholder="全部来源"
-            @change="changeEvaFrom"
-            mode="multiple"
-          >
-            <a-select-option value="1"> 窗口评价 </a-select-option>
-            <a-select-option value="2"> 自助服务终端 </a-select-option>
-            <a-select-option value="3"> 背靠背评价 </a-select-option>
-            <a-select-option value="4"> 微官网 </a-select-option>
-            <a-select-option value="5"> 好差评 </a-select-option>
-            <a-select-option value="6"> 一体化评价 </a-select-option>
-          </a-select>
+    <div class="callRecord-Container">
+        <div class="header_box">
+            <div>
+                <a-button type="success" @click="toexportTable">
+                    <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
+                </a-button>
+                <a-button type="danger" @click="delTable">
+                    <span>批量删除</span>
+                </a-button>
+                <b>评价次数：<i>{{evaCount}}次</i></b>
+                <sub>统计时间段：{{evaDates[0]}}~{{evaDates[1]}}</sub>
+            </div>
+            <span>
+                <a-space>
+                    <a-select v-model="evaChoose"  placeholder="全部评价" @change="changeEvaChoose" mode="multiple" style="max-width:140px">
+                    <a-select-option v-for="item in optonList" :key="item.id" :value="item.id">{{item.name}}</a-select-option>
+                </a-select>
+                <a-select v-model="evaFrom"  placeholder="全部来源" @change="changeEvaFrom" mode="multiple" style="max-width:160px">
+                    <a-select-option value="1"> 窗口评价 </a-select-option>
+                    <a-select-option value="2"> 自助服务终端 </a-select-option>
+                    <a-select-option value="3"> 背靠背评价 </a-select-option>
+                    <a-select-option value="4"> 微官网 </a-select-option>
+                    <a-select-option value="5"> 好差评 </a-select-option>
+                    <a-select-option value="6"> 一体化评价 </a-select-option>
+                </a-select>
 
-          <a-range-picker
-            allowClear
-            format="YYYY-MM-DD"
-            valueFormat="YYYY-MM-DD"
-            class="range_picker_style"
-            v-model="BegindAndEndTime"
-          >
-          </a-range-picker>
+                <a-range-picker :allowClear="false" format="YYYY年MM月DD日" class="range_picker_style" @change="rangePickerChange"
+                    v-model="BegindAndEndTime">
+                </a-range-picker>
 
-          <a-input v-model="searchName" placeholder="请输入内容搜索搜索">
-            <a-icon slot="prefix" type="search" />
-          </a-input>
-          <a-button type="primary" @click="handleSearch">搜索</a-button>
-          <a-button @click="resetBtn">重置</a-button>
-        </a-space>
-      </span>
+                <a-input v-model="searchName" placeholder="请输入评价人姓名或窗口编号搜索">
+                    <a-icon slot="prefix" type="search" />
+                </a-input>
+                <a-button type="primary" @click="togetevalist()">搜索</a-button>
+                <a-button @click="clearnAllChoose()">重置</a-button>
+                </a-space>
+            </span>
+        </div>
+        <div class="main">
+            <a-table size="small" bordered :row-key="(record) => record.id" :row-selection="{
+                selectedRowKeys: tableSelectedKeys,
+                onChange: onSelectChange,
+            }" :scroll="{ y: 590 }" :pagination="tablePagination" @change="pagTableChange" :loading="tableLoading"
+                :columns="tableHeaders" :dataSource="tableSourceData">
+                <template slot="评价人照片" slot-scope="text, record, index">
+                    <a-avatar v-if="!text || !baseurl" shape="square" :size="40" icon="user" />
+                    <img v-else :src="baseurl+'/'+text" alt="" srcset="" style="max-width: 100px; max-height: 100px;">
+                </template>
+                <template slot="操作" slot-scope="text, record, index">
+                    <a-button type="link" style="color:#FF7370;" @click="showModal(record)">删除</a-button>
+                    <a-button type="link" @click="openHandlingDetails(record)">详情</a-button>
+                </template>
+            </a-table>
+            <HandlingDetails ref="HandlingDetails" />
+            <a-modal v-model="visible" title="系统提示" @ok="togetEvaDetil()">
+                {{content}}
+            </a-modal>
+        </div>
     </div>
-    <div class="main">
-      <a-table
-        size="small"
-        bordered
-        :row-key="(record) => record.id"
-        :row-selection="{
-          selectedRowKeys: tableSelectedKeys,
-          onChange: onSelectChange,
-        }"
-        :scroll="{ y: 590 }"
-        :pagination="tablePagination"
-        @change="pagTableChange"
-        :loading="tableLoading"
-        :columns="tableHeaders"
-        :dataSource="tableSourceData"
-      >
-        <!-- 序号 -->
-        <span slot="index" slot-scope="text, record, index">{{
-          (tablePagination.current - 1) * tablePagination.pageSize + index + 1
-        }}</span>
-        <template slot="评价人照片" slot-scope="text">
-          <a-avatar v-if="!text" shape="square" :size="40" icon="user" />
-          <img
-            v-else
-            :src="process.env.VUE_APP_API_BASE_URL + text"
-            alt=""
-            srcset=""
-          />
-        </template>
-        <template slot="操作" slot-scope="text, record">
-          <a-button
-            type="link"
-            style="color: #ff7370"
-            @click="showModal(record)"
-            >删除</a-button
-          >
-          <a-button type="link" @click="openHandlingDetails(record)"
-            >详情</a-button
-          >
-        </template>
-      </a-table>
-      <HandlingDetails ref="HandlingDetails" />
-      <a-modal v-model="visible" title="系统提示" @ok="togetEvaDetil()">
-        {{ content }}
-      </a-modal>
-    </div>
-  </div>
 </template>
 
 <script>
 import table from "@/mixins/table";
-import { export2Excel } from "@/utils/js/exportExcel";
 import HandlingDetails from "./components/HandlingDetails.vue";
-import {
-  getEvaList,
-  getEvaData,
-  getEvaDetil,
-  getQueEvaData,
-} from "@/api/dataAdmin";
+import { getOptonList, getEvaList, getEvaData, getEvaDetil, getQueEvaData } from "@/api/dataAdmin";
 
 export default {
-  mixins: [table],
-  name: "matterEvaluation",
-  data() {
-    return {
-      btnLoading: false,
-      tableHeaders: [
-        {
-          title: "序号",
-          width: "60px",
-          align: "center",
-          scopedSlots: {
-            customRender: "index",
-          },
-        },
-        {
-          title: "排队编号",
-          align: "center",
-          customRender: (text) => {
-            return text.flounum ? text.flounum : "--";
-          },
+    mixins: [table],
+    name: "matterEvaluation",
+    data() {
+        return {
+            tableHeaders: [
+                {
+                    title: "序号",
+                    dataIndex: "index",
+                    width: "60px",
+                    key: "index",
+                    align: "center",
+                    customRender: (text, record, index) => `${index + 1}`,
+                },
+                {
+                    title: "排队编号",
+                    align: "center",
+                    dataIndex: "flounum",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "评价选项",
+                    align: "center",
+                    dataIndex: "option_id",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "评价人",
+                    align: "center",
+                    dataIndex: "idcard_Name",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "身份证号",
+                    align: "center",
+                    dataIndex: "idcard_IDCardNo",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "手机号",
+                    align: "center",
+                    dataIndex: "phone",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "评价时间",
+                    align: "center",
+                    dataIndex: "create_time",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "评价来源",
+                    align: "center",
+                    dataIndex: "pjxt",
+                    customRender: (text, record, index) => {
+                        if(text == 1){
+                            return '窗口评价'
+                        }else if(text == 2){
+                            return '自助服务终端'
+                        }else if(text == 3){
+                            return '背靠背评价'
+                        }else if(text == 4){
+                            return '微官网'
+                        }else if(text == 5){
+                            return '好差评'
+                        }else if(text ==6 ){
+                            return '一体化评价'
+                        }else{
+                            return '--'
+                        }
+                    },
+                },
+                {
+                    title: "评价设备",
+                    align: "center",
+                    dataIndex: "source",
+                    customRender: (text, record, index) => {
+                        if(text == 1){
+                            return '安卓'
+                        }else if(text == 2){
+                            return '导视机'
+                        }else if(text == 3){
+                            return '微信'
+                        }else{
+                            return '--'
+                        }
+                    },
+                },
+                {
+                    title: "评价人照片",
+                    align: "center",
+                    dataIndex: "picture",
+                    scopedSlots: {
+                        customRender: "评价人照片",
+                    },
+                },
+                {
+                    title: "操作",
+                    align: "center",
+                    dataIndex: "操作",
+                    scopedSlots: {
+                        customRender: "操作",
+                    },
+                },
+            ],
+            BegindAndEndTime: [],
+            searchName: undefined,
+            //删除窗口判断
+            visible: false,
+            tableSourceData:[],
+            evaCount:0,//评价次数
+            evaChoose:[],//评价选项
+            evaFrom:[],// 评价来源
+            evaDates:[],// 评价日期
+            content:'此操作将删除该评价信息，是否继续？',
+            delId:null,//当前删除id
+            baseurl:'',
+            optonList:[]
+        };
+    },
+    components: {
+        HandlingDetails
+    },
+    mounted() {
+        this.setMoment();
+        // 设置默认时间为今天
+        this.evaDates=[this.$moment(new Date()).format("YYYY-MM-DD"),this.$moment(new Date()).format("YYYY-MM-DD")]
+        
+        this.togetevalist()
+
+        getOptonList().then(res=>{
+            console.log(res);
+            if(res.code==1){
+                this.optonList = res.data
+            }
+        })
+    },
+    methods: {
+        
+        clearnAllChoose(){
+            this.evaChoose = []
+            this.evaFrom = []
+            this.searchName = ''
         },
-        {
-          title: "评价选项",
-          align: "center",
-          dataIndex: "option_id",
+        //导出
+        toexportTable() {
+            let tableData = [];
+            // 拼接评价选项
+            let chooseStr = this.evaChoose.join(',')
+            // 要先拼接评价来源
+            let fromString = this.evaFrom.join(',')
+            if (this.tableSelectedRows.length == 0) {
+                getEvaList({
+                    page:1,
+                    size:-1,
+                    type:'phpj',
+                    option_id:chooseStr,
+                    pjxt:fromString,//传0代表全部
+                    time:this.evaDates,
+                    info:this.searchName
+                }).then((res)=>{
+                    const{code,data} = res;
+                    if(code == 1){
+                        tableData = JSON.parse(JSON.stringify(data.data.data));
+                        tableData.forEach((item)=>{
+                            item.pjxt = item.pjxt == 1?'窗口评价':item.pjxt == 2?'自助服务终端':item.pjxt == 3?'背靠背评价':item.pjxt == 4?'微官网':item.pjxt == 5?'好差评':'一体化评价'
+                            item.source = item.source == 1?'安卓': item.source == 2?'导视机':'微信'
+                        })
+                        let tableColumns = JSON.parse(JSON.stringify(this.tableHeaders));
+                        let newTableData = tableData.map(item => {
+                            let obj = {};
+                            for (let key in item) {
+                                obj[key] = item[key];
+                            }
+                            return obj;
+                        })
+                        let exprotExcelName = `${this.nowDay} / ${this.nowTime} / ${this.$route['meta']['title'] || '报表信息统计'}`;
+                        this.exportExcel(tableColumns, newTableData, exprotExcelName);
+                    }
+                })
+
+            } else {
+                tableData = JSON.parse(JSON.stringify(this.tableSelectedRows));
+                tableData.forEach((item)=>{
+                    item.pjxt = item.pjxt == 1?'窗口评价':item.pjxt == 2?'自助服务终端':item.pjxt == 3?'背靠背评价':item.pjxt == 4?'微官网':item.pjxt == 5?'好差评':'一体化评价'
+                    item.source = item.source == 1?'安卓': item.source == 2?'导视机':'微信'
+                })
+                let tableColumns = JSON.parse(JSON.stringify(this.tableHeaders));
+                let newTableData = tableData.map(item => {
+                    let obj = {};
+                    for (let key in item) {
+                        obj[key] = item[key];
+                    }
+                    return obj;
+                })
+                let exprotExcelName = `${this.nowDay} / ${this.nowTime} / ${this.$route['meta']['title'] || '报表信息统计'}`;
+                this.exportExcel(tableColumns, newTableData, exprotExcelName);
+            }
+
         },
-        {
-          title: "评价人",
-          align: "center",
-          customRender: (text) => {
-            return text.idcard_Name ? text.idcard_Name : "--";
-          },
+        delTable(){
+            this.visible = true;
+            if(!this.tableSelectedRows.length){
+                this.content = '一条评论都没有选中'
+            }else{
+                this.content = '此操作将删除这些评价信息，是否继续？'
+                let arr = []
+                this.tableSelectedRows.forEach(item => {
+                    arr.push(item.id)
+                });
+                this.delId = arr
+            }
         },
-        {
-          title: "身份证号",
-          align: "center",
-          customRender: (text) => {
-            return text.idcard_IDCardNo ? text.idcard_IDCardNo : "--";
-          },
+        togetEvaDetil(){
+            getEvaDetil({
+                id:this.delId
+            }).then(res=>{
+                {
+                    this.delId=null
+                    this.visible = false;
+                    // 要刷新页面
+                    this.togetevalist()
+                }
+            })
         },
-        {
-          title: "手机号",
-          align: "center",
-          customRender: (text) => {
-            return text.phone ? text.phone : "--";
-          },
+        togetQueEvaData(record){
+            getQueEvaData({
+                id:record.id
+            }).then(res=>{
+                console.log(res);
+                const {code,data} = res
+                if(code==1){
+                    this.$refs.HandlingDetails.queEvaData = data
+                }
+            })
         },
-        {
-          title: "评价时间",
-          align: "center",
-          dataIndex: "create_time",
+        togetEvaData(id){
+            getEvaData({
+                id:id
+            }).then(res=>{
+                console.log(res);
+                const {code,data} = res
+                if(code==1){
+                    this.$refs.HandlingDetails.queEvaData = data
+                }
+            })
         },
-        {
-          title: "评价来源",
-          align: "center",
-          dataIndex: "pjxt",
-          customRender: (text, record, index) => {
-            if (text == 1) {
-              return "窗口评价";
-            } else if (text == 2) {
-              return "自助服务终端";
-            } else if (text == 3) {
-              return "背靠背评价";
-            } else if (text == 4) {
-              return "微官网";
-            } else if (text == 5) {
-              return "好差评";
-            } else {
-              return "一体化评价";
-            }
-          },
+        togetevalist(){
+            // 拼接评价选项
+            let chooseStr = this.evaChoose.join(',')
+            // 要先拼接评价来源
+            let fromString = this.evaFrom.join(',')
+            getEvaList({
+                page:this.tablePagination.current,
+                size:this.tablePagination.pageSize,
+                type:'phpj',
+                option_id:chooseStr,
+                pjxt:fromString,//传0代表全部
+                time:this.evaDates,
+                info:this.searchName
+            }).then((res)=>{
+                console.log(11111,res);
+                const{code,data} = res;
+                if(code == 1){
+                    this.tableSourceData = data.data.data
+                    this.evaCount = data.count
+                    this.tablePagination.total = data.count
+                }
+            })
         },
-        {
-          title: "评价设备",
-          align: "center",
-          dataIndex: "source",
-          customRender: (text, record, index) => {
-            if (text == 1) {
-              return "安卓";
-            } else if (text == 2) {
-              return "导视机";
-            } else {
-              return "微信";
+        changeEvaFrom(val){
+            if(val.length){
+                this.evaFrom = val;
+            }else{
+                this.evaFrom = [0]
             }
-          },
         },
-        {
-          title: "评价人照片",
-          align: "center",
-          dataIndex: "picture",
-          scopedSlots: {
-            customRender: "评价人照片",
-          },
+        changeEvaChoose(val){
+            this.evaChoose = val
         },
-        {
-          title: "操作",
-          align: "center",
-          dataIndex: "操作",
-          scopedSlots: {
-            customRender: "操作",
-          },
+        rangePickerChange(val) {
+            this.evaDates = [this.$moment(val[0]).format("YYYY-MM-DD"),this.$moment(val[1]).format("YYYY-MM-DD")]
         },
-      ],
-      BegindAndEndTime: [
-        this.$moment(new Date()).format("YYYY-MM-DD"),
-        this.$moment(new Date()).format("YYYY-MM-DD"),
-      ],
-      searchName: undefined,
-      //删除窗口判断
-      visible: false,
-      tableSourceData: [],
-      evaCount: 0, //评价次数
-      evaChoose: [], //评价选项
-      evaFrom: [0], // 评价来源
-      evaDates: [], // 评价日期
-      content: "此操作将删除该评价信息，是否继续？",
-      delId: null, //当前删除id
-      tHeader: [
-        // 导出的表头名信息
-        "排队编号",
-        "评价选项",
-        "评价人",
-        "身份证号码",
-        "手机号",
-        "评价时间",
-        "评价来源",
-        "评价设备",
-      ],
-      filterVal: [
-        // 导出的表头字段名，需要导出表格字段名
-        "flounum",
-        "option_id",
-        "idcard_Name",
-        "idcard_IDCardNo",
-        "phone",
-        "create_time",
-        "pjxt",
-        "source",
-      ],
-      tableSelectedKeys: [],
-      tableSelectedRows: [],
-    };
-  },
-  components: {
-    HandlingDetails,
-  },
-  mounted() {
-    this.setMoment();
-    this.togetevalist();
-  },
-  methods: {
-    delTable() {
-      this.visible = true;
-      if (!this.tableSelectedRows.length) {
-        this.content = "一条评论都没有选中";
-      } else {
-        this.content = "此操作将删除这些评价信息，是否继续？";
-        let arr = [];
-        this.tableSelectedRows.forEach((item) => {
-          arr.push(item.id);
-        });
-        this.delId = arr;
-      }
-    },
-    togetEvaDetil() {
-      getEvaDetil({
-        id: this.delId,
-      }).then((res) => {
-        {
-          this.delId = null;
-          this.visible = false;
-          // 要刷新页面
-          this.togetevalist();
-        }
-      });
-    },
-    togetQueEvaData(record) {
-      getQueEvaData({
-        id: record.id,
-      }).then((res) => {
-        console.log(res);
-        const { code, data } = res;
-        if (code == 1) {
-          this.$refs.HandlingDetails.queEvaData = data;
-        }
-      });
-    },
-    togetEvaData(id) {
-      getEvaData({
-        id: id,
-      }).then((res) => {
-        const { code, data } = res;
-        if (code == 1) {
-          this.$refs.HandlingDetails.queEvaData = data;
-        }
-      });
-    },
-    // 搜索
-    handleSearch() {
-      this.tablePagination.current = 1;
-      this.tableSelectedKeys = [];
-      this.tableSelectedRows = [];
-      this.togetevalist();
-    },
-    //重置按钮
-    resetBtn() {
-      this.tablePagination.current = 1;
-      this.tableSelectedKeys = [];
-      this.tableSelectedRows = [];
-      this.BegindAndEndTime = [
-        this.$moment(new Date()).format("YYYY-MM-DD"),
-        this.$moment(new Date()).format("YYYY-MM-DD"),
-      ];
-      this.searchName = "";
-      this.togetevalist();
-    },
-    togetevalist() {
-      // 拼接评价选项
-      let chooseStr = this.evaChoose.join(",");
-      // 要先拼接评价来源
-      let fromString = this.evaFrom.join(",");
-      getEvaList({
-        page: this.tablePagination.current,
-        size: this.tablePagination.pageSize,
-        type: "phpj",
-        option_id: chooseStr,
-        pjxt: fromString, //传0代表全部
-        time: this.BegindAndEndTime,
-        info: this.searchName,
-      }).then((res) => {
-        const { code, data } = res;
-        if (code == 1) {
-          this.tableSourceData = data.data.data;
-          this.evaCount = data.count;
-          this.tablePagination.total = data.count;
-        }
-      });
-    },
-    changeEvaFrom(val) {
-      if (val.length) {
-        this.evaFrom = val;
-      } else {
-        this.evaFrom = [0];
-      }
-    },
-    changeEvaChoose(val) {
-      this.evaChoose = val;
-    },
-    QueueState(type) {
-      switch (type) {
-        case 0:
-          return "type1";
-        case 1:
-          return "type2";
 
-        default:
-          return "type0";
-      }
-    },
-    //详情模块
-    openHandlingDetails(record) {
-      // 判断为窗口屏或者其他状况，调用不同接口
-      // if(record.pjxt==1){
-      this.$refs.HandlingDetails.modalInfo.title = "办理明细";
-      this.$refs.HandlingDetails.modalInfo.show = 1;
-      this.togetQueEvaData(record);
-      // }else{
-      //     this.$refs.HandlingDetails.modalInfo.title = "评价详情";
-      //     this.$refs.HandlingDetails.modalInfo.show = 2;
-      //     this.togetEvaData(record.id)
-      // }
+        QueueState(type) {
+            switch (type) {
+                case 0:
+                    return "type1";
+                case 1:
+                    return "type2";
 
-      this.$refs.HandlingDetails.modalInfo.visible = true;
-    },
-    //删除模态框
-    showModal(record) {
-      this.visible = true;
-      this.delId = record.id;
-    },
-    // 选中
-    onSelectChange(keys, rows) {
-      this.tableSelectedKeys = keys;
-      const res = new Map();
-      this.tableSelectedRows = [...this.tableSelectedRows, ...rows]
-        .filter((v) => {
-          return !res.has(v.id) && res.set(v.id, 1);
-        })
-        .filter((v) => {
-          return this.tableSelectedKeys.some((val) => v.id == val);
-        });
-    },
-    // 导出
-    async handleExportTable() {
-      this.btnLoading = true;
-      let obj = {
-        1: "窗口评价",
-        2: "自助服务终端",
-        3: "背靠背评价",
-        4: "微官网",
-        5: "好差评",
-        6: "一体化评价",
-      };
-      if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
-        this.tableSelectedRows.forEach((item) => {
-          Object.keys(obj).forEach((keys) => {
-            if (item.pjxt == keys) {
-              item.pjxt = obj[keys];
+                default:
+                    return "type0";
             }
-          });
-        });
-        export2Excel(
-          this.tHeader,
-          this.filterVal,
-          this.tableSelectedRows,
-          "办理事项评价评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-        );
-      } else {
-        // 拼接评价选项
-        let chooseStr = this.evaChoose.join(",");
-        // 要先拼接评价来源
-        let fromString = this.evaFrom.join(",");
-        getEvaList({
-          page: 1,
-          size: -1,
-          type: "phpj",
-          option_id: chooseStr,
-          pjxt: fromString, //传0代表全部
-          time: this.BegindAndEndTime,
-          info: this.searchName,
-        }).then((res) => {
-          const { code, data } = res;
-          if (code == 1) {
-            if (!data.data.data.length) return;
-            for (let item of data.data.data) {
-              Object.keys(obj).forEach((key) => {
-                if (item.pjxt == key) {
-                  item.pjxt = obj[key];
-                }
-              });
-            }
-            export2Excel(
-              this.tHeader,
-              this.filterVal,
-              data.data.data,
-              "办理事项评价评价记录报表" +
-                this.$moment().format("YYYYMMDDHHmmss")
-            );
-          }
-        });
-      }
-      this.btnLoading = false;
+        },
+        //详情模块
+        openHandlingDetails(record) {
+            // 判断为窗口屏或者其他状况，调用不同接口
+            // if(record.pjxt==1){
+                this.$refs.HandlingDetails.modalInfo.title = "办理明细";
+                this.$refs.HandlingDetails.modalInfo.show = 1;
+                this.togetQueEvaData(record)
+            // }else{
+            //     this.$refs.HandlingDetails.modalInfo.title = "评价详情";
+            //     this.$refs.HandlingDetails.modalInfo.show = 2;
+            //     this.togetEvaData(record.id)
+            // }
+            
+            this.$refs.HandlingDetails.modalInfo.visible = true;
+        },
+        //删除模态框
+        showModal(record) {
+            this.visible = true;
+            this.delId = record.id
+        },
     },
-  },
-  watch: {
-    tablePagination() {
-      this.togetevalist();
+    watch:{
+        tablePagination(){
+            this.togetevalist()
+        }
     },
-  },
+    created(){
+        this.baseurl = process.env.VUE_APP_API_PHP_URL
+    }
 };
 </script>
 
 <style lang="less" scoped>
 /deep/.ant-spin-container {
-  display: block;
+    display: block;
 }
 
 .header_box {
-  padding-bottom: 1rem;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-
-  & > div {
+    padding-bottom: 1rem;
     display: flex;
-    justify-content: flex-start;
+    justify-content: space-between;
     align-items: center;
 
-    b {
-      font-style: normal;
-      font-weight: unset;
-      font-size: 16px;
-      margin-left: 20px;
+    &>div {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
 
-      i {
-        color: #0595fd;
-        font-style: normal;
-      }
-    }
+        b {
+            font-style: normal;
+            font-weight: unset;
+            font-size: 16px;
+            margin-left: 20px;
+
+            i {
+                color: #0595fd;
+                font-style: normal;
+            }
+        }
 
-    sub {
-      font-size: 14px;
-      font-style: normal;
-      bottom: unset;
-      margin-left: 20px;
+        sub {
+            font-size: 14px;
+            font-style: normal;
+            bottom: unset;
+            margin-left: 20px;
+        }
     }
-  }
 }
 </style>
 

portal-manager-ui/admin/src/views/dataAdmin/components/evaluationRecordReport/windowEvaluation.vue

 <template>
-  <div class="callRecord-Container">
-    <div class="header_box">
-      <div>
-        <a-button
-          type="success"
-          :loading="btnLoading"
-          @click="handleExportTable"
-        >
-          <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
-        </a-button>
-        <a-button type="danger" @click="delTable">
-          <span>批量删除</span>
-        </a-button>
-        <b
-          >评价次数：<i>{{ evaCount }}次</i></b
-        >
-        <sub
-          >统计时间段：{{ BegindAndEndTime[0] }}~{{ BegindAndEndTime[1] }}</sub
-        >
-      </div>
-      <span>
-        <a-space>
-          <a-select
-            placeholder="全部评价"
-            @change="changeEvaChoose"
-            mode="multiple"
-          >
-            <a-select-option value="非常满意"> 非常满意 </a-select-option>
-            <a-select-option value="基本满意"> 基本满意 </a-select-option>
-            <a-select-option value="满意"> 满意 </a-select-option>
-            <a-select-option value="不满意"> 不满意 </a-select-option>
-            <a-select-option value="非常不满意"> 非常不满意 </a-select-option>
-          </a-select>
-          <a-select
-            placeholder="全部来源"
-            @change="changeEvaFrom"
-            mode="multiple"
-          >
-            <a-select-option value="1"> 窗口评价 </a-select-option>
-            <a-select-option value="2"> 自助服务终端 </a-select-option>
-            <a-select-option value="3"> 背靠背评价 </a-select-option>
-            <a-select-option value="4"> 微官网 </a-select-option>
-            <a-select-option value="5"> 好差评 </a-select-option>
-            <a-select-option value="6"> 一体化评价 </a-select-option>
-          </a-select>
+    <div class="callRecord-Container">
+        <div class="header_box">
+            <div>
+                <a-button type="success" @click="toexportTable">
+                    <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
+                </a-button>
+                <a-button type="danger" @click="delTable">
+                    <span>批量删除</span>
+                </a-button>
+                <b>评价次数：<i>{{evaCount}}次</i></b>
+                <sub>统计时间段：{{evaDates[0]}}~{{evaDates[1]}}</sub>
+            </div>
+            <span>
+                <a-space>
+                    <a-select v-model="evaChoose" placeholder="全部评价" @change="changeEvaChoose" mode="multiple" style="max-width:140px">
+                    <a-select-option v-for="item in optonList" :key="item.id" :value="item.id">{{item.name}}</a-select-option>
+                </a-select>
+                <a-select v-model="evaFrom" placeholder="全部来源" @change="changeEvaFrom" mode="multiple" style="max-width:160px">
+                    <a-select-option value="1"> 窗口评价 </a-select-option>
+                    <a-select-option value="2"> 自助服务终端 </a-select-option>
+                    <a-select-option value="3"> 背靠背评价 </a-select-option>
+                    <a-select-option value="4"> 微官网 </a-select-option>
+                    <a-select-option value="5"> 好差评 </a-select-option>
+                    <a-select-option value="6"> 一体化评价 </a-select-option>
+                </a-select>
 
-          <a-range-picker
-            format="YYYY-MM-DD"
-            valueFormat="YYYY-MM-DD"
-            class="range_picker_style"
-            v-model="BegindAndEndTime"
-          >
-          </a-range-picker>
+                <a-range-picker :allowClear="false" format="YYYY年MM月DD日" class="range_picker_style" @change="rangePickerChange"
+                    v-model="BegindAndEndTime">
+                </a-range-picker>
 
-          <a-input v-model="searchName" placeholder="请输入内容搜索搜索">
-            <a-icon slot="prefix" type="search" />
-          </a-input>
-          <a-button type="primary" @click="handleSearch">搜索</a-button>
-          <a-button @click="resetBtn">重置</a-button>
-        </a-space>
-      </span>
+                <a-input v-model="searchName" placeholder="请输入评价人姓名或窗口编号搜索">
+                    <a-icon slot="prefix" type="search" />
+                </a-input>
+                <a-button type="primary" @click="togetevalist()">搜索</a-button>
+                <a-button @click="clearnAllChoose()">重置</a-button>
+                </a-space>
+            </span>
+        </div>
+        <div class="main">
+            <a-table size="small" bordered :row-key="(record) => record.id" :row-selection="{
+                selectedRowKeys: tableSelectedKeys,
+                onChange: onSelectChange,
+            }" :scroll="{ y: 590 }" :pagination="tablePagination" @change="pagTableChange" :loading="tableLoading"
+                :columns="tableHeaders" :dataSource="tableSourceData">
+                <template slot="评价人照片" slot-scope="text, record, index">
+                    <a-avatar v-if="!text || !baseurl" shape="square" :size="40" icon="user" />
+                    <img v-else :src="baseurl+'/'+text" alt="" srcset="" style="max-width: 100px; max-height: 100px;">
+                </template>
+                <template slot="操作" slot-scope="text, record, index">
+                    <a-button type="link" style="color:#FF7370;" @click="showModal(record)">删除</a-button>
+                    <a-button type="link" @click="openHandlingDetails(record)">详情</a-button>
+                </template>
+            </a-table>
+            <HandlingDetails ref="HandlingDetails" />
+            <a-modal v-model="visible" title="系统提示" @ok="togetEvaDetil()">
+                {{content}}
+            </a-modal>
+        </div>
     </div>
-    <div class="main">
-      <a-table
-        size="small"
-        bordered
-        :row-key="(record) => record.id"
-        :row-selection="{
-          selectedRowKeys: tableSelectedKeys,
-          onChange: onSelectChange,
-        }"
-        :scroll="{ y: 590 }"
-        :pagination="tablePagination"
-        @change="pagTableChange"
-        :loading="tableLoading"
-        :columns="tableHeaders"
-        :dataSource="tableSourceData"
-      >
-        <!-- 序号 -->
-        <span slot="index" slot-scope="text, record, index">{{
-          (tablePagination.current - 1) * tablePagination.pageSize + index + 1
-        }}</span>
-        <template slot="评价人照片" slot-scope="text">
-          <a-avatar v-if="!text" shape="square" :size="40" icon="user" />
-          <img
-            v-else
-            :src="process.env.VUE_APP_API_BASE_URL + text"
-            alt=""
-            srcset=""
-          />
-        </template>
-        <template slot="操作" slot-scope="text, record">
-          <a-button
-            type="link"
-            style="color: #ff7370"
-            @click="showModal(record)"
-            >删除</a-button
-          >
-          <a-button type="link" @click="openHandlingDetails(record)"
-            >详情</a-button
-          >
-        </template>
-      </a-table>
-      <HandlingDetails ref="HandlingDetails" />
-      <a-modal v-model="visible" title="系统提示" @ok="togetEvaDetil()">
-        {{ content }}
-      </a-modal>
-    </div>
-  </div>
 </template>
 
 <script>
 import table from "@/mixins/table";
-import { export2Excel } from "@/utils/js/exportExcel";
 import HandlingDetails from "./components/HandlingDetails.vue";
-import {
-  getEvaList,
-  getEvaData,
-  getEvaDetil,
-  getQueEvaData,
-} from "@/api/dataAdmin";
+import { getOptonList, getEvaList, getEvaData, getEvaDetil, getQueEvaData } from "@/api/dataAdmin";
 
 export default {
-  mixins: [table],
-  name: "windowsEvaluation",
-  data() {
-    return {
-      btnLoading: false,
-      tableHeaders: [
-        {
-          title: "序号",
-          width: "60px",
-          align: "center",
-          scopedSlots: {
-            customRender: "index",
-          },
-        },
-        {
-          title: "窗口编号",
-          align: "center",
-          dataIndex: "flounum",
+    mixins: [table],
+    name: "windowsEvaluation",
+    data() {
+        return {
+            tableHeaders: [
+                {
+                    title: "序号",
+                    dataIndex: "index",
+                    width: "60px",
+                    key: "index",
+                    align: "center",
+                    customRender: (text, record, index) => `${index + 1}`,
+                },
+                {
+                    title: "窗口编号",
+                    align: "center",
+                    dataIndex: "window",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "评价选项",
+                    align: "center",
+                    dataIndex: "option_id",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "评价人",
+                    align: "center",
+                    dataIndex: "idcard_Name",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "身份证号",
+                    align: "center",
+                    dataIndex: "idcard_IDCardNo",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "手机号",
+                    align: "center",
+                    dataIndex: "phone",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "评价时间",
+                    align: "center",
+                    dataIndex: "create_time",
+                    customRender: (text)=>{return text?text:'--'}
+                },
+                {
+                    title: "评价来源",
+                    align: "center",
+                    dataIndex: "pjxt",
+                    customRender: (text, record, index) => {
+                        if(text == 1){
+                            return '窗口评价'
+                        }else if(text == 2){
+                            return '自助服务终端'
+                        }else if(text == 3){
+                            return '背靠背评价'
+                        }else if(text == 4){
+                            return '微官网'
+                        }else if(text == 5){
+                            return '好差评'
+                        }else if(text == 6){
+                            return '一体化评价'
+                        }else{
+                            return '--'
+                        }
+                    },
+                },
+                {
+                    title: "评价设备",
+                    align: "center",
+                    dataIndex: "source",
+                    customRender: (text, record, index) => {
+                        if(text == 1){
+                            return '安卓'
+                        }else if(text == 2){
+                            return '导视机'
+                        }else if(text == 3){
+                            return '微信'
+                        }else{
+                            return '--'
+                        }
+                    },
+                },
+                {
+                    title: "评价人照片",
+                    align: "center",
+                    dataIndex: "picture",
+                    scopedSlots: {
+                        customRender: "评价人照片",
+                    },
+                },
+                {
+                    title: "操作",
+                    align: "center",
+                    dataIndex: "操作",
+                    scopedSlots: {
+                        customRender: "操作",
+                    },
+                },
+            ],
+            BegindAndEndTime: [],
+            searchName: undefined,// 搜索内容
+            //删除窗口判断
+            visible: false,
+            tableSourceData:[],
+            evaCount:0,//评价次数
+            evaChoose:[],//评价选项
+            evaFrom:[],// 评价来源
+            evaDates:[],// 评价日期
+            content:'此操作将删除该评价信息，是否继续？',
+            delId:null,//当前删除id
+            baseurl:'',
+            optonList:[]
+        };
+    },
+    components: {
+        HandlingDetails
+    },
+    mounted() {
+        this.setMoment();
+        // 设置默认时间为今天
+        this.evaDates=[this.$moment(new Date()).format("YYYY-MM-DD"),this.$moment(new Date()).format("YYYY-MM-DD")]
+        
+        this.togetevalist()
+
+        getOptonList().then(res=>{
+            if(res.code==1){
+                this.optonList = res.data
+            }
+        })
+    },
+    methods: {
+        clearnAllChoose(){
+            this.evaChoose = []
+            this.evaFrom = []
+            this.searchName = ''
         },
-        {
-          title: "评价选项",
-          align: "center",
-          dataIndex: "option_id",
+        //导出
+        toexportTable() {
+            let tableData = [];
+            // 拼接评价选项
+            let chooseStr = this.evaChoose.join(',')
+            // 要先拼接评价来源
+            let fromString = this.evaFrom.join(',')
+            if (this.tableSelectedRows.length == 0) {
+                getEvaList({
+                    page:1,
+                    size:-1,
+                    type:'ckpj',
+                    option_id:chooseStr,
+                    pjxt:fromString,//传0代表全部
+                    time:this.evaDates,
+                    info:this.searchName
+                }).then((res)=>{
+                    const{code,data} = res;
+                    if(code == 1){
+                        tableData = JSON.parse(JSON.stringify(data.data.data));
+                        tableData.forEach((item)=>{
+                            item.pjxt = item.pjxt == 1?'窗口评价':item.pjxt == 2?'自助服务终端':item.pjxt == 3?'背靠背评价':item.pjxt == 4?'微官网':item.pjxt == 5?'好差评':'一体化评价'
+                            item.source = item.source == 1?'安卓': item.source == 2?'导视机':'微信'
+                        })
+                        let tableColumns = JSON.parse(JSON.stringify(this.tableHeaders));
+                        let newTableData = tableData.map(item => {
+                            let obj = {};
+                            for (let key in item) {
+                                obj[key] = item[key];
+                            }
+                            return obj;
+                        })
+                        let exprotExcelName = `${this.nowDay} / ${this.nowTime} / ${this.$route['meta']['title'] || '报表信息统计'}`;
+                        this.exportExcel(tableColumns, newTableData, exprotExcelName);
+                    }
+                })
+
+            } else {
+                tableData = JSON.parse(JSON.stringify(this.tableSelectedRows));
+                tableData.forEach((item)=>{
+                    item.pjxt = item.pjxt == 1?'窗口评价':item.pjxt == 2?'自助服务终端':item.pjxt == 3?'背靠背评价':item.pjxt == 4?'微官网':item.pjxt == 5?'好差评':'一体化评价'
+                    item.source = item.source == 1?'安卓': item.source == 2?'导视机':'微信'
+                })
+                let tableColumns = JSON.parse(JSON.stringify(this.tableHeaders));
+                let newTableData = tableData.map(item => {
+                    let obj = {};
+                    for (let key in item) {
+                        obj[key] = item[key];
+                    }
+                    return obj;
+                })
+                let exprotExcelName = `${this.nowDay} / ${this.nowTime} / ${this.$route['meta']['title'] || '报表信息统计'}`;
+                this.exportExcel(tableColumns, newTableData, exprotExcelName);
+            }
+
         },
-        {
-          title: "评价人",
-          align: "center",
-          customRender: (text) => {
-            return text.idcard_Name ? text.idcard_Name : "--";
-          },
+        delTable(){
+            this.visible = true;
+            if(!this.tableSelectedRows.length){
+                this.content = '一条评论都没有选中'
+            }else{
+                this.content = '此操作将删除这些评价信息，是否继续？'
+                let arr = []
+                this.tableSelectedRows.forEach(item => {
+                    arr.push(item.id)
+                });
+                this.delId = arr
+            }
         },
-        {
-          title: "身份证号",
-          align: "center",
-          customRender: (text) => {
-            return text.idcard_IDCardNo ? text.idcard_IDCardNo : "--";
-          },
+        togetEvaDetil(){
+            getEvaDetil({
+                id:this.delId
+            }).then(res=>{
+                {
+                    this.delId=null
+                    this.visible = false;
+                    // 要刷新页面
+                    this.togetevalist()
+                }
+            })
         },
-        {
-          title: "手机号",
-          align: "center",
-          customRender: (text) => {
-            return text.phone ? text.phone : "--";
-          },
+        togetQueEvaData(record){
+            getQueEvaData({
+                id:record.id
+            }).then(res=>{
+                const {code,data} = res
+                if(code==1){
+                    this.$refs.HandlingDetails.queEvaData = data
+                }
+            })
         },
-        {
-          title: "评价时间",
-          align: "center",
-          dataIndex: "create_time",
+        togetEvaData(id){
+            getEvaData({
+                id:id
+            }).then(res=>{
+                const {code,data} = res
+                if(code==1){
+                    this.$refs.HandlingDetails.queEvaData = data
+                }
+            })
         },
-        {
-          title: "评价来源",
-          align: "center",
-          dataIndex: "pjxt",
-          customRender: (text, record, index) => {
-            if (text == 1) {
-              return "窗口评价";
-            } else if (text == 2) {
-              return "自助服务终端";
-            } else if (text == 3) {
-              return "背靠背评价";
-            } else if (text == 4) {
-              return "微官网";
-            } else if (text == 5) {
-              return "好差评";
-            } else {
-              return "一体化评价";
-            }
-          },
+        togetevalist(){
+            // 拼接评价选项
+            let chooseStr = this.evaChoose.join(',')
+            // 要先拼接评价来源
+            let fromString = this.evaFrom.join(',')
+            getEvaList({
+                page:this.tablePagination.current,
+                size:this.tablePagination.pageSize,
+                type:'ckpj',
+                option_id:chooseStr,
+                pjxt:fromString,//传0代表全部
+                time:this.evaDates,
+                info:this.searchName
+            }).then((res)=>{
+                const{code,data} = res;
+                if(code == 1){
+                    this.tableSourceData = data.data.data
+                    this.evaCount = data.count
+                    this.tablePagination.total = data.count
+                }
+            })
         },
-        {
-          title: "评价设备",
-          align: "center",
-          dataIndex: "source",
-          customRender: (text, record, index) => {
-            if (text == 1) {
-              return "安卓";
-            } else if (text == 2) {
-              return "导视机";
-            } else {
-              return "微信";
+        changeEvaFrom(val){
+            if(val.length){
+                this.evaFrom = val;
+            }else{
+                this.evaFrom = [0]
             }
-          },
         },
-        {
-          title: "评价人照片",
-          align: "center",
-          dataIndex: "picture",
-          scopedSlots: {
-            customRender: "评价人照片",
-          },
+        changeEvaChoose(val){
+            this.evaChoose = val
         },
-        {
-          title: "操作",
-          align: "center",
-          dataIndex: "操作",
-          scopedSlots: {
-            customRender: "操作",
-          },
+        rangePickerChange(val) {
+            this.evaDates = [this.$moment(val[0]).format("YYYY-MM-DD"),this.$moment(val[1]).format("YYYY-MM-DD")]
         },
-      ],
-      BegindAndEndTime: [
-        this.$moment(new Date()).format("YYYY-MM-DD"),
-        this.$moment(new Date()).format("YYYY-MM-DD"),
-      ], // 评价日期
-      searchName: undefined, // 搜索内容
-      //删除窗口判断
-      visible: false,
-      tableSourceData: [],
-      evaCount: 0, //评价次数
-      evaChoose: [], //评价选项
-      evaFrom: [0], // 评价来源
-      //   evaDates: [], // 评价日期
-      content: "此操作将删除该评价信息，是否继续？",
-      delId: null, //当前删除id
-      tableSelectedKeys: [],
-      tableSelectedRows: [],
-      tHeader: [
-        // 导出的表头名信息
-        "窗口编号",
-        "评价选项",
-        "评价人",
-        "身份证号码",
-        "手机号",
-        "评价时间",
-        "评价来源",
-        "评价设备",
-      ],
-      filterVal: [
-        // 导出的表头字段名，需要导出表格字段名
-        "flounum",
-        "option_id",
-        "idcard_Name",
-        "idcard_IDCardNo",
-        "phone",
-        "create_time",
-        "pjxt",
-        "source",
-      ],
-    };
-  },
-  components: {
-    HandlingDetails,
-  },
-  mounted() {
-    this.setMoment();
-    this.togetevalist();
-  },
-  methods: {
-    delTable() {
-      this.visible = true;
-      if (!this.tableSelectedRows.length) {
-        this.content = "一条评论都没有选中";
-      } else {
-        this.content = "此操作将删除这些评价信息，是否继续？";
-        let arr = [];
-        this.tableSelectedRows.forEach((item) => {
-          arr.push(item.id);
-        });
-        this.delId = arr;
-      }
-    },
-    togetEvaDetil() {
-      getEvaDetil({
-        id: this.delId,
-      }).then((res) => {
-        {
-          this.delId = null;
-          this.visible = false;
-          // 要刷新页面
-          this.togetevalist();
-        }
-      });
-    },
-    togetQueEvaData(record) {
-      getQueEvaData({
-        id: record.id,
-      }).then((res) => {
-        const { code, data } = res;
-        if (code == 1) {
-          this.$refs.HandlingDetails.queEvaData = data;
-        }
-      });
-    },
-    togetEvaData(id) {
-      getEvaData({
-        id: id,
-      }).then((res) => {
-        const { code, data } = res;
-        if (code == 1) {
-          this.$refs.HandlingDetails.queEvaData = data;
-        }
-      });
-    },
-    // 搜索
-    handleSearch() {
-      this.tablePagination.current = 1;
-      this.tableSelectedKeys = [];
-      this.tableSelectedRows = [];
-      this.togetevalist();
-    },
-    //重置按钮
-    resetBtn() {
-      this.tablePagination.current = 1;
-      this.tableSelectedKeys = [];
-      this.tableSelectedRows = [];
-      this.BegindAndEndTime = [
-        this.$moment(new Date()).format("YYYY-MM-DD"),
-        this.$moment(new Date()).format("YYYY-MM-DD"),
-      ];
-      this.searchName = "";
-      this.togetevalist();
-    },
-    togetevalist() {
-      // 拼接评价选项
-      let chooseStr = this.evaChoose.join(",");
-      // 要先拼接评价来源
-      let fromString = this.evaFrom.join(",");
-      getEvaList({
-        page: this.tablePagination.current,
-        size: this.tablePagination.pageSize,
-        type: "ckpj",
-        option_id: chooseStr,
-        pjxt: fromString, //传0代表全部
-        time: this.BegindAndEndTime,
-        info: this.searchName,
-      }).then((res) => {
-        const { code, data } = res;
-        if (code == 1) {
-          this.tableSourceData = data.data.data;
-          this.evaCount = data.count;
-          this.tablePagination.total = data.count;
-        }
-      });
-    },
-    changeEvaFrom(val) {
-      if (val.length) {
-        this.evaFrom = val;
-      } else {
-        this.evaFrom = [0];
-      }
-    },
-    changeEvaChoose(val) {
-      this.evaChoose = val;
-    },
-
-    QueueState(type) {
-      switch (type) {
-        case 0:
-          return "type1";
-        case 1:
-          return "type2";
 
-        default:
-          return "type0";
-      }
-    },
-    //详情模块
-    openHandlingDetails(record) {
-      // 判断为窗口屏或者其他状况，调用不同接口
-      if (record.pjxt == 1) {
-        this.$refs.HandlingDetails.modalInfo.title = "办理明细";
-        this.$refs.HandlingDetails.modalInfo.show = 1;
-        this.togetQueEvaData(record);
-      } else {
-        this.$refs.HandlingDetails.modalInfo.title = "评价详情";
-        this.$refs.HandlingDetails.modalInfo.show = 2;
-        this.togetEvaData(record.id);
-      }
+        QueueState(type) {
+            switch (type) {
+                case 0:
+                    return "type1";
+                case 1:
+                    return "type2";
 
-      this.$refs.HandlingDetails.modalInfo.visible = true;
-    },
-    //删除模态框
-    showModal(record) {
-      this.visible = true;
-      this.delId = record.id;
-    },
-    // 选中
-    onSelectChange(keys, rows) {
-      this.tableSelectedKeys = keys;
-      const res = new Map();
-      this.tableSelectedRows = [...this.tableSelectedRows, ...rows]
-        .filter((v) => {
-          return !res.has(v.id) && res.set(v.id, 1);
-        })
-        .filter((v) => {
-          return this.tableSelectedKeys.some((val) => v.id == val);
-        });
-    },
-    // 导出
-    async handleExportTable() {
-      this.btnLoading = true;
-      let obj = {
-        1: "窗口评价",
-        2: "自助服务终端",
-        3: "背靠背评价",
-        4: "微官网",
-        5: "好差评",
-        6: "一体化评价",
-      };
-      if (this.tableSelectedKeys.length && this.tableSelectedRows.length) {
-        this.tableSelectedRows.forEach((item) => {
-          Object.keys(obj).forEach((keys) => {
-            if (item.pjxt == keys) {
-              item.pjxt = obj[keys];
+                default:
+                    return "type0";
             }
-          });
-        });
-        export2Excel(
-          this.tHeader,
-          this.filterVal,
-          this.tableSelectedRows,
-          "窗口服务评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-        );
-      } else {
-        // 拼接评价选项
-        let chooseStr = this.evaChoose.join(",");
-        // 要先拼接评价来源
-        let fromString = this.evaFrom.join(",");
-        getEvaList({
-          page: 1,
-          size: -1,
-          type: "ckpj",
-          option_id: chooseStr,
-          pjxt: fromString, //传0代表全部
-          time: this.BegindAndEndTime,
-          info: this.searchName,
-        }).then((res) => {
-          const { code, data } = res;
-          if (code == 1) {
-            if (!data.data.data.length) return;
-            for (let item of data.data.data) {
-              Object.keys(obj).forEach((key) => {
-                if (item.pjxt == key) {
-                  item.pjxt = obj[key];
-                }
-              });
+        },
+        //详情模块
+        openHandlingDetails(record) {
+            // 判断为窗口屏或者其他状况，调用不同接口
+            if(record.pjxt==1){
+                this.$refs.HandlingDetails.modalInfo.title = "办理明细";
+                this.$refs.HandlingDetails.modalInfo.show = 1;
+                this.togetQueEvaData(record)
+            }else{
+                this.$refs.HandlingDetails.modalInfo.title = "评价详情";
+                this.$refs.HandlingDetails.modalInfo.show = 2;
+                this.togetEvaData(record.id)
             }
-            export2Excel(
-              this.tHeader,
-              this.filterVal,
-              data.data.data,
-              "窗口服务评价记录报表" + this.$moment().format("YYYYMMDDHHmmss")
-            );
-          }
-        });
-      }
-      this.btnLoading = false;
+            
+            this.$refs.HandlingDetails.modalInfo.visible = true;
+        },
+        //删除模态框
+        showModal(record) {
+            this.visible = true;
+            this.delId = record.id
+        },
     },
-  },
-  watch: {
-    tablePagination() {
-      this.togetevalist();
+    watch:{
+        tablePagination(){
+            this.togetevalist()
+        }
     },
-  },
+    created(){
+        this.baseurl = process.env.VUE_APP_API_PHP_URL
+    }
 };
 </script>
 
 <style lang="less" scoped>
 /deep/.ant-spin-container {
-  display: block;
+    display: block;
 }
 
 .header_box {
-  padding-bottom: 1rem;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-
-  & > div {
+    padding-bottom: 1rem;
     display: flex;
-    justify-content: flex-start;
+    justify-content: space-between;
     align-items: center;
 
-    b {
-      font-style: normal;
-      font-weight: unset;
-      font-size: 16px;
-      margin-left: 20px;
-
-      i {
-        color: #0595fd;
-        font-style: normal;
-      }
-    }
-
-    sub {
-      font-size: 14px;
-      font-style: normal;
-      bottom: unset;
-      margin-left: 20px;
+    &>div {
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
     }
-  }
 }
 </style>
 

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/callRecord.vue

@@ -264,10 +264,6 @@ export default {
       },
       //状态
       style: [
-        {
-          key: 0,
-          name: "排队中",
-        },
         {
           key: 1,
           name: "办理中",
@@ -280,7 +276,6 @@ export default {
       //Form数据列表
       tableList: [],
       obj: {
-        0: "排队中",
         1: "办理中",
         4: "办理完成",
       },
@@ -380,6 +375,7 @@ export default {
     //用户模态框
     async openDeclarant(item) {
       await getPeopleanalyse({
+        idcard: item.people_idcard,
         peopleid: item.peopleid,
         time: this.searchForm.time,
       }).then((res) => {

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/components/HandlingDetails.vue

@@ -107,7 +107,7 @@
               >
               <span
                 ><i class="lable">叫号设备：</i
-                >{{ dataList.window_fromnum || "--" }}</span
+                >{{ dataList.call_name || "--" }}</span
               >
             </div>
           </div>

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/components/businessInfo.vue

 <template>
   <div class="businessModal" ref="businessModal">
-    <a-modal :title="modalInfo.title" width="400px" :visible="modalInfo.visible"
-      :confirmLoading="modalInfo.confirmLoading" @cancel="modalClose" :centered="true" :destroyOnClose="true"
-      :getContainer="() => $refs.businessModal">
+    <a-modal :title="modalInfo.title" :visible="modalInfo.visible" :confirmLoading="modalInfo.confirmLoading"
+      @cancel="modalClose" :centered="true" :destroyOnClose="true" :getContainer="() => $refs.businessModal">
       <div class="content">
         <h1>{{ title }}</h1>
         <em v-if="dataList.matterlist">关联事项（{{ dataList.matterlist.length }}）</em>
         <p>
           <template v-for="item in dataList.matterlist">
-            <p>{{ item }}</p>
+            <p>*　{{ item }}</p>
           </template>
         </p>
         <h4>
           <span>受理次数<br /><i>{{ dataList.slcount }}</i></span>
           <span>办结次数<br /><i>{{ dataList.bjcount }}</i></span>
-          <span>好评率<br /><i>{{ dataList.hplv }}</i></span>
+          <span>好评率<br /><i>{{ dataList.hplv }}%</i></span>
         </h4>
       </div>
       <template slot="footer">
@@ -50,7 +49,7 @@ export default {
     h1 {
       font-size: 17px;
       color: #139bfd;
-      padding: 20px;
+      padding: 0 20px 20px 20px;
     }
 
     em {
@@ -64,10 +63,12 @@ export default {
     p {
       padding: 3px 20px;
       font-size: 16px;
-      width: 500px;
+      width: 100%;
       overflow: hidden;
       text-overflow: ellipsis;
-      white-space: nowrap;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
     }
 
     h4 {

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/components/userInfo.vue

 <template>
   <div class="userModal" ref="userModal">
-    <a-modal
-      :title="modalInfo.title"
-      :width="modalInfo.width"
-      :visible="modalInfo.visible"
-      :confirmLoading="modalInfo.confirmLoading"
-      @cancel="modalClose"
-      :centered="true"
-      :destroyOnClose="true"
-      :getContainer="() => $refs.userModal"
-    >
+    <a-modal :title="modalInfo.title" :width="modalInfo.width" :visible="modalInfo.visible"
+      :confirmLoading="modalInfo.confirmLoading" @cancel="modalClose" :centered="true" :destroyOnClose="true"
+      :getContainer="() => $refs.userModal">
       <div class="content">
-        <h1>{{ dataList.people_name}}</h1>
+        <h1>{{ dataList.people_name }}</h1>
         <p>
           <span>{{ dataList.people_sex }}</span>
-          <span>{{ dataList.age  }}</span>
+          <span>{{ dataList.age }}</span>
           <span>{{ dataList.people_phone }}</span>
         </p>
         <h2>
-          <span
-            >预约次数<br /><i>{{ dataList.ordernum }}</i></span
-          >
-          <span
-            >排队次数<br /><i>{{ dataList.quenum }}</i></span
-          >
-          <span
-            >关联业务<br /><i>{{ dataList.bus_num}}</i></span
-          >
+          <span>预约次数<br /><i>{{ dataList.ordernum }}</i></span>
+          <span>排队次数<br /><i>{{ dataList.quenum }}</i></span>
+          <span>关联业务<br /><i>{{ dataList.bus_num }}</i></span>
         </h2>
       </div>
       <template slot="footer">
         <a-button type="primary" ghost @click="openBlockchain">查看TA的数据画像</a-button>
-        <a-button type="primary" ghost @click="openBlockchain"
-          >区块链信息</a-button
-        >
+        <a-button type="primary" ghost @click="openBlockchain">区块链信息</a-button>
       </template>
     </a-modal>
     <Blockchain ref="Blockchain" />
@@ -48,14 +33,14 @@ export default {
   name: "PortalAdminVueUserInfo",
   data() {
     return {
-      dataList:[],
+      dataList: [],
     };
   },
   components: {
     Blockchain,
   },
 
-  mounted() {},
+  mounted() { },
   methods: {
     openBlockchain() {
       // this.$refs.Blockchain.modalInfo.visible = true;
@@ -69,30 +54,35 @@ export default {
 .userModal {
   .content {
     h1 {
-      padding: 20px;
+      padding: 0 20px;
       color: #3bacfd;
       font-size: 18px;
     }
+
     p {
       padding: 20px;
       display: flex;
       justify-content: flex-start;
       align-items: center;
+
       span {
-        & + span {
+        &+span {
           margin-left: 30px;
         }
       }
     }
+
     h2 {
       display: flex;
       justify-content: space-between;
       align-items: center;
       padding: 20px;
       background: #f3faff;
+
       span {
         font-size: 16px;
         text-align: center;
+
         i {
           color: #3bacfd;
           font-style: normal;
@@ -100,6 +90,7 @@ export default {
       }
     }
   }
+
   .ant-modal-body {
     padding: 0 !important;
     min-height: 300px !important;

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/components/workpeopleInfo.vue

 <template>
   <div class="workPeopleModal" ref="workPeopleModal">
-    <a-modal :title="modalInfo.title" width="500px" :visible="modalInfo.visible"
-      :confirmLoading="modalInfo.confirmLoading" @cancel="modalClose" :centered="true" :destroyOnClose="true"
-      :getContainer="() => $refs.workPeopleModal">
+    <a-modal :title="modalInfo.title" :visible="modalInfo.visible" :confirmLoading="modalInfo.confirmLoading"
+      @cancel="modalClose" :centered="true" :destroyOnClose="true" :getContainer="() => $refs.workPeopleModal">
       <div class="content">
         <div class="workInfo">
           <div class="left">
@@ -15,14 +14,14 @@
               <span><i class="lable">所属部门：</i>{{ infoData.deptName || "--" }}</span>
               <span><i class="lable">政治面貌：</i>{{ $codeMap.politicalStatus[infoData.politicalstatus] || "--" }}</span>
               <span><i class="lable">电话：</i>{{ infoData.mobile || "--" }}</span>
-              <span><i class="lable">星级：</i>{{ infoData.starlevel +'星' || "--" }} </span>
+              <span v-show="infoData.starlevel"><i class="lable">星级：</i>{{ infoData.starlevel + '星' || "--" }} </span>
             </div>
           </div>
         </div>
         <h2>
           <span>受理业务<br /><i>{{ infoData.slbusiness || "0" }}</i></span>
           <span>评价次数<br /><i>{{ infoData.pjnum || "0" }}</i></span>
-          <span>好评率<br /><i>{{ infoData.hplv || "0" }}</i></span>
+          <span>好评率<br /><i>{{ infoData.hplv + '%' || "--" }}</i></span>
         </h2>
       </div>
       <template slot="footer">
@@ -72,6 +71,7 @@ export default {
         width: 100px;
         padding: 0 10px;
 
+
         img {
           max-height: 120px;
           width: 100%;
@@ -94,6 +94,9 @@ export default {
             display: inline-block;
             width: 49%;
             padding: 2px 0;
+            overflow: hidden; // 溢出部分隐藏 
+            white-space: nowrap; // 文字不换行
+            text-overflow: ellipsis; // 显示省略号
 
             .lable {
               display: inline-block;

portal-manager-ui/admin/src/views/dataAdmin/components/queueCall/queueRecord.vue

@@ -2,27 +2,17 @@
   <div class="queueRecord-Container">
     <div class="header_box">
       <div>
-        <a-button
-          :loading="btnLoading"
-          type="success"
-          @click="handleExportTable"
-        >
+        <a-button :loading="btnLoading" type="success" @click="handleExportTable">
           <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
         </a-button>
-        <b
-          >叫号次数：<i>{{ tablePagination.total }}</i> 次</b
-        >
+        <b>取号次数：<i>{{ tablePagination.total }}</i> 次</b>
         <sub>统计时间段：{{ searchForm.time[0] }}~{{ searchForm.time[1] }}</sub>
       </div>
       <span>
         <a-space>
           <a-select v-model="searchForm.id" style="width: 120px">
             <a-select-option value=""> 全部设备 </a-select-option>
-            <a-select-option
-              v-for="item in deviceData"
-              :key="item.id"
-              :value="item.id"
-            >
+            <a-select-option v-for="item in deviceData" :key="item.id" :value="item.id">
               {{ item.name }}
             </a-select-option>
           </a-select>
@@ -34,10 +24,7 @@
           </a-select>
           <a-range-picker valueFormat="YYYY-MM-DD" v-model="searchForm.time">
           </a-range-picker>
-          <a-input
-            v-model="searchForm.flownum"
-            placeholder="请输入排队编号搜索"
-          >
+          <a-input v-model="searchForm.flownum" placeholder="请输入排队编号搜索">
             <a-icon slot="prefix" type="search" />
           </a-input>
           <a-button type="primary" @click="handleSearch">搜索</a-button>
@@ -46,21 +33,11 @@
       </span>
     </div>
     <div class="main">
-      <a-table
-        size="small"
-        bordered
-        :row-key="(record) => record.id"
-        :row-selection="{
-          selectedRowKeys: tableSelectedKeys,
-          onChange: onSelectChange,
-        }"
-        :scroll="{ y: 590 }"
-        :pagination="tablePagination"
-        @change="changeTablePage"
-        :loading="tableLoading"
-        :columns="tableHeaders"
-        :dataSource="tableList"
-      >
+      <a-table size="small" bordered :row-key="(record) => record.id" :row-selection="{
+        selectedRowKeys: tableSelectedKeys,
+        onChange: onSelectChange,
+      }" :scroll="{ y: 590 }" :pagination="tablePagination" @change="changeTablePage" :loading="tableLoading"
+        :columns="tableHeaders" :dataSource="tableList">
         <!-- 序号 -->
         <span slot="num" slot-scope="text, record, index">{{
           (tablePagination.current - 1) * tablePagination.pageSize + index + 1
@@ -82,11 +59,7 @@
         </template>
         <!-- 办理业务 -->
         <template slot="business" slot-scope="text">
-          <a
-            v-if="text.business"
-            @click="openBusiness(text.business, text.businessid)"
-            >{{ text.business }}</a
-          >
+          <a v-if="text.business" @click="openBusiness(text.business, text.businessid)">{{ text.business }}</a>
           <span v-else>--</span>
         </template>
         <!-- 办理开始时间 -->
@@ -97,8 +70,8 @@
         <template slot="window_name" slot-scope="text">
           {{
             text.window_name
-              ? text.window_name + "-" + text.window_fromnum
-              : "--"
+            ? text.window_name + "-" + text.window_fromnum
+            : "--"
           }}
         </template>
         <!-- 工作人员 -->
@@ -118,13 +91,11 @@
         </template>
         <!-- 状态 -->
         <template slot="style" slot-scope="text">
-          <span
-            :class="{
-              'stand-line': text.style === 0,
-              'on-transact': text.style === 1,
-              'on-end': text.style === 4,
-            }"
-          >
+          <span :class="{
+            'stand-line': text.style === 0,
+            'on-transact': text.style === 1,
+            'on-end': text.style === 4,
+          }">
             {{ $codeMap.queueState[text.style] }}
           </span>
         </template>
@@ -381,6 +352,7 @@ export default {
     //用户模态框
     async openDeclarant(item) {
       await getPeopleanalyse({
+        idcard: item.people_idcard,
         peopleid: item.peopleid,
         time: this.searchForm.time,
       }).then((res) => {