Merge remote-tracking branch 'origin/master'

portal-manager-ui/admin/src/assets/css/common.less

@@ -351,6 +351,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+  flex-wrap: wrap;
   & > div {
     display: flex;
     justify-content: flex-start;

portal-manager-ui/admin/src/views/dataAdmin/components/AIEfficiency/reportForm.vue

@@ -2,7 +2,7 @@
 	<div class="reportForm-Container">
 		<div class="header_box">
 			<div>
-				<a-button type="success" @click="handleExportTable">
+				<a-button type="primary" @click="handleExportTable">
 					<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
 				</a-button>
 			</div>

portal-manager-ui/admin/src/views/dataAdmin/components/IOT/alerting.vue

@@ -2,7 +2,7 @@
   <div class="PoliticsShow-Container">
     <div class="header_box">
       <div>
-        <a-button type="success" @click="exportTable">
+        <a-button type="primary" @click="exportTable">
           <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
         </a-button>
         <span>告警次数:<i>256次</i></span>

portal-manager-ui/admin/src/views/dataAdmin/components/Impossible/index.vue

@@ -2,7 +2,7 @@
 	<div class="ff p15">
 		<div class="form-box">
 			<div class="num-dv">
-				<a-button :loading="btnLoading" type="success" @click="handleExportTable">
+				<a-button :loading="btnLoading" type="primary" @click="handleExportTable">
 					<span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
 				</a-button>
 				<div class="ml20">提交总次数：<span style="color:#1890ff;font-weight: bold;">{{ numObj ? numObj.count : 0 }}次</span></div>

portal-manager-ui/admin/src/views/dataAdmin/components/SMS/SMSRecord.vue

@@ -4,7 +4,7 @@
       <div>
         <a-button
           :loading="btnLoading"
-          type="success"
+          type="primary"
           @click="handleExportTable"
         >
           <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>

portal-manager-ui/admin/src/views/dataAdmin/components/easyPoliticsShow/PoliticsShow.vue

@@ -4,7 +4,7 @@
 			<div>
 				<a-button
 				  :loading="btnLoading"
-				  type="success"
+				  type="primary"
 				  @click="handleExportTable"
 				>
 				  <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>

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

@@ -2,40 +2,21 @@
   <div class="callRecord-Container">
     <div class="header_box">
       <div>
-        <a-button type="success" @click="handleExportTable">
+        <a-button type="primary" @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
-        >
+        <b>评价次数：<i>{{ evaCount }}次</i></b>
+        <sub>统计时间段：{{ BegindAndEndTime[0] }}~{{ BegindAndEndTime[1] }}</sub>
       </div>
       <span>
         <a-space>
-          <a-select
-            v-model="evaChoose"
-            placeholder="全部评价"
-            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 v-model="evaChoose" placeholder="全部评价" mode="multiple">
+            <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="全部来源"
-            mode="multiple"
-            style="max-width: 160px"
-          >
+          <a-select v-model="evaFrom" placeholder="全部来源" 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>
@@ -44,21 +25,11 @@
             <a-select-option value="6"> 一体化评价 </a-select-option>
           </a-select>
 
-          <a-range-picker
-            :allowClear="false"
-            valueFormat="YYYY-MM-DD"
-            style="width: 200px"
-            class="range_picker_style"
-            v-model="BegindAndEndTime"
-          >
+          <a-range-picker :allowClear="false" valueFormat="YYYY-MM-DD" style="width: 200px" class="range_picker_style"
+            v-model="BegindAndEndTime">
           </a-range-picker>
 
-          <a-input
-            style="width: 280px"
-            v-model="searchName"
-            placeholder="请输入评价人姓名或部门名称搜索"
-            @pressEnter="handleSearch"
-          >
+          <a-input style="width: 280px" v-model="searchName" placeholder="请输入评价人姓名或部门名称搜索" @pressEnter="handleSearch">
             <a-icon slot="prefix" type="search" />
           </a-input>
           <a-button type="primary" @click="handleSearch">搜索</a-button>
@@ -67,46 +38,18 @@
       </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="tableSourceData"
-      >
+      <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="tableSourceData">
         <template slot="评价人照片" slot-scope="text">
-          <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"
-          />
+          <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">
-          <a-button
-            type="link"
-            style="color: #ff7370"
-            @click="handleDel(record.id)"
-            >删除</a-button
-          >
-          <a-button type="link" @click="openHandlingDetails(record)"
-            >详情</a-button
-          >
+          <a-button type="link" style="color: #ff7370" @click="handleDel(record.id)">删除</a-button>
+          <a-button type="link" @click="openHandlingDetails(record)">详情</a-button>
         </template>
       </a-table>
       <HandlingDetails ref="HandlingDetails" />
@@ -483,7 +426,7 @@ export default {
   justify-content: space-between;
   align-items: center;
 
-  & > div {
+  &>div {
     display: flex;
     justify-content: flex-start;
     align-items: center;

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

@@ -2,40 +2,21 @@
   <div class="callRecord-Container">
     <div class="header_box">
       <div>
-        <a-button type="success" @click="handleExportTable">
+        <a-button type="primary" @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
-        >
+        <b>评价次数：<i>{{ evaCount }}次</i></b>
+        <sub>统计时间段：{{ BegindAndEndTime[0] }}~{{ BegindAndEndTime[1] }}</sub>
       </div>
       <span>
         <a-space>
-          <a-select
-            v-model="evaChoose"
-            placeholder="全部评价"
-            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 v-model="evaChoose" placeholder="全部评价" mode="multiple">
+            <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="全部来源"
-            mode="multiple"
-            style="max-width: 160px"
-          >
+          <a-select v-model="evaFrom" placeholder="全部来源" 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>
@@ -44,21 +25,11 @@
             <a-select-option value="6"> 一体化评价 </a-select-option>
           </a-select>
 
-          <a-range-picker
-            :allowClear="false"
-            valueFormat="YYYY-MM-DD"
-            style="width: 200px"
-            class="range_picker_style"
-            v-model="BegindAndEndTime"
-          >
+          <a-range-picker :allowClear="false" valueFormat="YYYY-MM-DD" style="width: 200px" class="range_picker_style"
+            v-model="BegindAndEndTime">
           </a-range-picker>
 
-          <a-input
-            style="width: 280px"
-            v-model="searchName"
-            placeholder="请输入评价人姓名或排号编号搜索"
-            @pressEnter="handleSearch"
-          >
+          <a-input style="width: 280px" v-model="searchName" placeholder="请输入评价人姓名或排号编号搜索" @pressEnter="handleSearch">
             <a-icon slot="prefix" type="search" />
           </a-input>
           <a-button type="primary" @click="handleSearch">搜索</a-button>
@@ -67,46 +38,18 @@
       </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="tableSourceData"
-      >
+      <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="tableSourceData">
         <template slot="评价人照片" slot-scope="text">
-          <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"
-          />
+          <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">
-          <a-button
-            type="link"
-            style="color: #ff7370"
-            @click="handleDel(record.id)"
-            >删除</a-button
-          >
-          <a-button type="link" @click="openHandlingDetails(record)"
-            >详情</a-button
-          >
+          <a-button type="link" style="color: #ff7370" @click="handleDel(record.id)">删除</a-button>
+          <a-button type="link" @click="openHandlingDetails(record)">详情</a-button>
         </template>
       </a-table>
       <HandlingDetails ref="HandlingDetails" />
@@ -486,7 +429,7 @@ export default {
   justify-content: space-between;
   align-items: center;
 
-  & > div {
+  &>div {
     display: flex;
     justify-content: flex-start;
     align-items: center;

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

@@ -2,40 +2,21 @@
   <div class="callRecord-Container">
     <div class="header_box">
       <div>
-        <a-button type="success" @click="handleExportTable">
+        <a-button type="primary" @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
-        >
+        <b>评价次数：<i>{{ evaCount }}次</i></b>
+        <sub>统计时间段：{{ BegindAndEndTime[0] }}~{{ BegindAndEndTime[1] }}</sub>
       </div>
       <span>
         <a-space>
-          <a-select
-            v-model="evaChoose"
-            placeholder="全部评价"
-            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 v-model="evaChoose" placeholder="全部评价" mode="multiple">
+            <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="全部来源"
-            mode="multiple"
-            style="max-width: 160px"
-          >
+          <a-select v-model="evaFrom" placeholder="全部来源" 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>
@@ -44,21 +25,11 @@
             <a-select-option value="6"> 一体化评价 </a-select-option>
           </a-select>
 
-          <a-range-picker
-            style="width: 200px"
-            :allowClear="false"
-            valueFormat="YYYY-MM-DD"
-            class="range_picker_style"
-            v-model="BegindAndEndTime"
-          >
+          <a-range-picker style="width: 200px" :allowClear="false" valueFormat="YYYY-MM-DD" class="range_picker_style"
+            v-model="BegindAndEndTime">
           </a-range-picker>
 
-          <a-input
-            style="width: 280px"
-            v-model="searchName"
-            placeholder="请输入评价人姓名或窗口编号搜索"
-            @pressEnter="handleSearch"
-          >
+          <a-input style="width: 280px" v-model="searchName" placeholder="请输入评价人姓名或窗口编号搜索" @pressEnter="handleSearch">
             <a-icon slot="prefix" type="search" />
           </a-input>
           <a-button type="primary" @click="handleSearch">搜索</a-button>
@@ -67,44 +38,18 @@
       </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="tableSourceData"
-      >
+      <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="tableSourceData">
         <template slot="评价人照片" slot-scope="text">
-          <a-avatar
-            v-if="!text || !baseurl"
-            shape="square"
-            :size="40"
-            icon="user"
-          />
-          <img
-            v-else
-            :src="baseurl + '/' + text"
-            style="max-width: 100px; max-height: 100px"
-          />
+          <a-avatar v-if="!text || !baseurl" shape="square" :size="40" icon="user" />
+          <img v-else :src="baseurl + '/' + text" style="max-width: 100px; max-height: 100px" />
         </template>
         <template slot="操作" slot-scope="text, record">
-          <a-button
-            type="link"
-            style="color: #ff7370"
-            @click="handleDel(record.id)"
-            >删除</a-button
-          >
-          <a-button type="link" @click="openHandlingDetails(record)"
-            >详情</a-button
-          >
+          <a-button type="link" style="color: #ff7370" @click="handleDel(record.id)">删除</a-button>
+          <a-button type="link" @click="openHandlingDetails(record)">详情</a-button>
         </template>
       </a-table>
       <HandlingDetails ref="HandlingDetails" />
@@ -489,7 +434,7 @@ export default {
   justify-content: space-between;
   align-items: center;
 
-  & > div {
+  &>div {
     display: flex;
     justify-content: flex-start;
     align-items: center;

portal-manager-ui/admin/src/views/dataAdmin/components/fillRecordReport/fillForm.vue

@@ -4,7 +4,7 @@
       <div>
         <a-button
           :loading="btnLoading"
-          type="success"
+          type="primary"
           @click="handleExportTable"
         >
           <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>

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

@@ -4,7 +4,7 @@
       <div>
         <a-button
           :loading="btnLoading"
-          type="success"
+          type="primary"
           @click="handleExportTable"
         >
           <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>

portal-manager-ui/admin/src/views/dataAdmin/components/makeRecordReport/recordReportdetails.vue

 <template>
   <div class="Container">
     <div class="header">
-      <a-button type="success" @click="$router.go(-1)">返回上一级</a-button>
+      <a-button type="primary" @click="$router.go(-1)">返回上一级</a-button>
     </div>
     <div class="main">
       <div class="left_">

portal-manager-ui/admin/src/views/dataAdmin/components/microOfficialWebsite/microForm.vue

@@ -4,7 +4,7 @@
       <div>
         <a-button
           :loading="btnLoading"
-          type="success"
+          type="primary"
           @click="handleExportTable"
         >
           <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>

portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/callRecordForm.vue

@@ -2,7 +2,7 @@
     <div class="callRecord-Container">
         <div class="header_box">
             <div>
-                <a-button :loading="btnLoading" type="success" @click="handleExportTable">
+                <a-button :loading="btnLoading" type="primary" @click="handleExportTable">
                     <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
                 </a-button>
                 <b>拨打次数：<i>{{total}}次</i></b>
@@ -28,8 +28,8 @@
 <script>
 import table from "@/mixins/table";
 import {getSys12345} from "@/api/dataAdmin"
-import {
-		export2Excel
+import {
+		export2Excel
 } from "@/utils/js/exportExcel";
 export default {
     mixins: [table],

portal-manager-ui/admin/src/views/dataAdmin/components/networkGovernance/networkForm.vue

@@ -2,7 +2,7 @@
     <div class="callRecord-Container">
         <div class="header_box">
             <div>
-                <a-button type="success" @click="handleExportTable" :loading="btnLoading">
+                <a-button type="primary" @click="handleExportTable" :loading="btnLoading">
                     <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
                 </a-button>
                 <b>建议次数：<i>{{JYCount}}次</i></b>

portal-manager-ui/admin/src/views/dataAdmin/components/oneYardPass/reportForm.vue

@@ -2,7 +2,7 @@
   <div class="reportForm-Container">
     <div class="header_box">
       <div>
-        <a-button type="success" @click="exportTable">
+        <a-button type="primary" @click="exportTable">
           <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>
         </a-button>
       </div>

portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/depositRecord.vue

@@ -4,7 +4,7 @@
       <div>
         <a-button
           :loading="btnLoading"
-          type="success"
+          type="primary"
           @click="handleExportTable"
         >
           <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>

portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/otherRecord.vue

@@ -4,7 +4,7 @@
       <div>
         <a-button
           :loading="btnLoading"
-          type="success"
+          type="primary"
           @click="handleExportTable"
         >
           <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>

portal-manager-ui/admin/src/views/dataAdmin/components/pickUp/pickUpRecord.vue

@@ -4,7 +4,7 @@
       <div>
         <a-button
           :loading="btnLoading"
-          type="success"
+          type="primary"
           @click="handleExportTable"
         >
           <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>

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

@@ -2,31 +2,21 @@
   <div class="callRecord-Container">
     <div class="header_box">
       <div>
-        <a-button
-          type="success"
-          @click="handleExportTable"
-          :loading="btnLoading"
-        >
+        <a-button type="primary" @click="handleExportTable" :loading="btnLoading">
           <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 v-model="searchForm.id">
             <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>
-          <a-select v-model="searchForm.style" style="width: 120px">
+          <a-select v-model="searchForm.style">
             <a-select-option value=""> 全部状态 </a-select-option>
             <a-select-option v-for="v in style" :key="v.key" :value="v.key">{{
               v.name
@@ -34,11 +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="请输入排队编号搜索"
-            @pressEnter="handleSearch"
-          >
+          <a-input v-model="searchForm.flownum" placeholder="请输入排队编号搜索" @pressEnter="handleSearch">
             <a-icon slot="prefix" type="search" />
           </a-input>
           <a-button type="primary" @click="handleSearch">搜索</a-button>
@@ -47,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
@@ -83,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>
         <!-- 办理开始时间 -->
@@ -98,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>
         <!-- 工作人员 -->
@@ -119,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>
@@ -323,7 +293,7 @@ export default {
     this.getCalllistArr();
     this.getCallQueListArr();
   },
-  mounted() {},
+  mounted() { },
   methods: {
     //重置按钮
     resetBtn() {
@@ -501,6 +471,7 @@ export default {
 /deep/.ant-spin-container {
   display: block !important;
 }
+
 .stand-line {
   color: #f23a3a;
 }

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

@@ -2,31 +2,21 @@
   <div class="queueRecord-Container">
     <div class="header_box">
       <div>
-        <a-button
-          :loading="btnLoading"
-          type="success"
-          @click="handleExportTable"
-        >
+        <a-button :loading="btnLoading" type="primary" @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 v-model="searchForm.id">
             <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>
-          <a-select v-model="searchForm.style" style="width: 120px">
+          <a-select v-model="searchForm.style">
             <a-select-option value=""> 全部状态 </a-select-option>
             <a-select-option v-for="v in style" :key="v.key" :value="v.key">{{
               v.name
@@ -34,11 +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="请输入排队编号搜索"
-            @pressEnter="handleSearch"
-          >
+          <a-input v-model="searchForm.flownum" placeholder="请输入排队编号搜索" @pressEnter="handleSearch">
             <a-icon slot="prefix" type="search" />
           </a-input>
           <a-button type="primary" @click="handleSearch">搜索</a-button>
@@ -47,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
@@ -83,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>
         <!-- 办理开始时间 -->
@@ -98,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>
         <!-- 工作人员 -->
@@ -119,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>
@@ -329,7 +299,7 @@ export default {
     this.getTaskListArr();
     this.getQueueDataArr();
   },
-  mounted() {},
+  mounted() { },
   methods: {
     //重置按钮
     resetBtn() {

portal-manager-ui/admin/src/views/dataAdmin/components/sampleRecordReport/sampleForm.vue

@@ -4,7 +4,7 @@
       <div>
         <a-button
           :loading="btnLoading"
-          type="success"
+          type="primary"
           @click="handleExportTable"
         >
           <span>{{ tableSelectedRows.length ? "导出" : "导出全部" }}</span>

portal-manager-ui/admin/src/views/home/home.vue

@@ -201,7 +201,7 @@ export default {
       .title {
         font-style: normal;
         font-weight: bold;
-        font-size: 1.5rem;
+        font-size: 20px;
         color: #fff;
         margin-right: 1rem;
       }
@@ -246,7 +246,7 @@ export default {
         line-height: 1.4;
         cursor: pointer;
         margin: 0 0.7rem;
-        font-size: 0.5rem;
+        font-size: 14px;
         display: flex;
         flex-flow: column;
         align-items: center;
@@ -276,7 +276,7 @@ export default {
   .ant-layout-header {
     height: @headerH !important;
     padding: 0 1.2rem !important;
-    background-color: rgba(255, 255, 255, 0.15) !important;
+    background: linear-gradient(90deg, #1845c6 0%, #2999ff 100%);
   }
   .ant-dropdown-link {
     color: #fff;