Merge branch 'master' of https://gitee.com/dmc_qq/etc-project

package.json

@@ -12,6 +12,7 @@
     "@element-plus/icons-vue": "^1.1.4",
     "axios": "^0.27.2",
     "element-plus": "^2.1.7",
+    "file-saver": "^2.0.5",
     "fuse.js": "^6.5.3",
     "js-cookie": "^3.0.1",
     "jsencrypt": "^3.2.1",
@@ -20,7 +21,8 @@
     "vue": "^3.2.2",
     "vue-fragment": "^1.5.2",
     "vue-router": "4",
-    "vuex": "^4.0.2"
+    "vuex": "^4.0.2",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@babel/types": "^7.16.0",
@@ -39,6 +41,7 @@
     "postcss": "^8.4.4",
     "prettier": "^2.4.1",
     "sass": "^1.44.0",
+    "script-loader": "^0.7.2",
     "typescript": "^4.5.2",
     "vite": "^2.4.2",
     "vite-plugin-compression": "^0.3.6",

src/components/SlidingBlockVerifyTwo/SlidingBlockVerifyTwo.vue

@@ -24,9 +24,9 @@
             <div style="max-height: 200px;margin-bottom: 10px;">
                 <!-- 图片 -->
                 <img :src="SlideImgThreePng" class="as-radius-5px" style="height: 200px;width: 300px;">
-                <!-- 裁剪部分 -->
-                <canvas class="as-radius-5px" id="canvas-cut" :width="canWidth * 2" :height="canHeight * 2" style="position: relative;
-                    background-color: #3FC0FC;z-index: 10;top: 0px;box-shadow: 1px 1px 2.5px #333;"
+                <!-- 裁剪部分 background-color: #3FC0FC; -->
+                <canvas class="as-radius-5px" id="canvas-cut" :width="canWidth * 2" :height="canHeight * 2"
+                    style="position: relative;z-index: 10;top: 0px;box-shadow: 1px 1px 2.5px #333;"
                     :style="`left:${canLeft}px;top:${initTop}px;width: ${canWidth}px;height: ${canHeight}px;`">
                 </canvas>
                 <!-- 阴影部分 -->

src/crud/index.vue

@@ -43,7 +43,7 @@
                 <!-- 系统内容 -->
                 <el-form ref="ruleFormRef" :rules="rules" :model="form">
                     <el-form-item v-for="(item,index) in tableFrom.field" :label="item.label" :prop="item.prop"
-                        :label-width="formLabelWidth">
+                        :label-width="formLabelWidth" >
                         <!-- 输入框 -->
                         <div style="width: 100%;" v-if="item.form.type === 'input'">
                             <el-input v-model="form[item.prop]" :type="item.itemType"

src/views/fancongcong/addsupplyCardBalance/addsupplyCardBalance.vue

@@ -14,7 +14,7 @@
 		<el-table :data="tableData" border style="width: 100%" class="table_box" scrollbar-always-on="true" stripe >
 			<el-table-column prop="date" label="卡号" width="100px"/>
 			<el-table-column prop="name" label="需要补交的金额" />
-			<el-table-column prop="address" label="卡账生成时间" />
+			<el-table-column prop="regtime" label="卡账生成时间" />
 			<el-table-column prop="number" label="卡片所属渠道" />
 			<el-table-column label="操作" class="table_btn" width="150px" align="center">
 				<el-tooltip content="详细" placement="top">
@@ -27,8 +27,8 @@
 			<el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="1000" />
 		</div>
 
-		<el-dialog v-model="dialogFormVisible" :title="title">
-			<el-form :model="form" v-if="delivery">
+		<el-dialog v-model="dialogFormVisible" title="补交详细">
+			<el-form :model="form">
 				<el-form-item label="手机号" :label-width="formLabelWidth">
 					<el-input v-model="form.phone" autocomplete="off" disabled />
 				</el-form-item>
@@ -36,15 +36,6 @@
 					<el-input v-model="form.region" autocomplete="off" />
 				</el-form-item>
 			</el-form>
-			
-			<el-form :model="form" v-else>
-				<el-form-item label="对公账户资金账户编号" :label-width="formLabelWidth">
-					<el-input v-model="form.number" autocomplete="off" disabled />
-				</el-form-item>
-				<el-form-item label="验证码" :label-width="formLabelWidth">
-					<el-input v-model="form.region" autocomplete="off" />
-				</el-form-item>
-			</el-form>
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="dialogFormVisible = false">确定</el-button>
@@ -164,30 +155,10 @@
 	]
 
 	const tableData = [{
-			date: '01',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '02',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '03',
-			name: 'Liu461185',
+			date: '52011750220200003674',
+			name: '100.00',
 			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
+			number: "黔通",
 			time: "2021-06-22T12:52:17",
 			type: "已启用",
 			regname: "xn18096012008",

src/views/fancongcong/advancepaymentaccount/advancepaymentaccount.vue

@@ -4,13 +4,13 @@
 			<el-form :inline="true" :model="formInline" class="demo-form-inline">
 				<el-form-item label="导入时间">
 					<div class="block">
-						<el-date-picker v-model="value1" type="datetime" placeholder="" />
+						<el-date-picker v-model="value1" type="datetime" placeholder="请选择申请开始时间" />
 					</div>
 					<el-icon>
 						<semi-select />
 					</el-icon>
 					<div class="block">
-						<el-date-picker v-model="value2" type="datetime" placeholder="" />
+						<el-date-picker v-model="value2" type="datetime" placeholder="请选择申请结束时间" />
 					</div>
 				</el-form-item>
 				<el-form-item label="对方账号">
@@ -32,17 +32,17 @@
 			</el-form>
 		</div>
 		<el-table :data="tableData" border style="width: 100%" class="table_box" scrollbar-always-on="true" stripe >
-			<el-table-column prop="date" label="交易流水号" width="100px"/>
-			<el-table-column prop="name" label="交易时间" />
-			<el-table-column prop="address" label="支出金额" />
-			<el-table-column prop="number" label="收入金额" />
-			<el-table-column prop="time" label="对方账号" />
-			<el-table-column prop="type" label="对方户名" />
-			<el-table-column prop="regname" label="对方行名" />
-			<el-table-column prop="regtime" label="对公账户账号" />
-			<el-table-column prop="type" label="用途" />
-			<el-table-column prop="regname" label="附言" />
-			<el-table-column prop="regtime" label="摘要" />
+			<el-table-column prop="date" label="交易流水号" width="200px"/>
+			<el-table-column prop="name" label="交易时间" width="200px"/>
+			<el-table-column prop="address" label="支出金额" width="200px"/>
+			<el-table-column prop="number" label="收入金额" width="200px"/>
+			<el-table-column prop="time" label="对方账号" width="200px"/>
+			<el-table-column prop="type" label="对方户名" width="200px"/>
+			<el-table-column prop="regname" label="对方行名" width="200px"/>
+			<el-table-column prop="nonumber" label="对公账户账号" width="200px"/>
+			<el-table-column prop="use" label="用途" width="200px"/>
+			<el-table-column prop="nonumbers" label="附言" width="200px"/>
+			<el-table-column prop="usetype" label="摘要" width="200px"/>
 			<el-table-column label="操作" class="table_btn" width="150px" align="center">
 				<el-tooltip content="详细" placement="top">
 					<el-button type="warning" disabled>已同意</el-button>
@@ -55,7 +55,7 @@
 		</div>
 
 		<el-dialog v-model="dialogFormVisible" :title="title">
-			<el-form :model="form" v-if="delivery">
+			<el-form :model="form">
 				<el-form-item label="手机号" :label-width="formLabelWidth">
 					<el-input v-model="form.phone" autocomplete="off" disabled />
 				</el-form-item>
@@ -63,22 +63,10 @@
 					<el-input v-model="form.region" autocomplete="off" />
 				</el-form-item>
 			</el-form>
-			
-			<el-form :model="form" v-else>
-				<el-form-item label="对公账户资金账户编号" :label-width="formLabelWidth">
-					<el-input v-model="form.number" autocomplete="off" disabled />
-				</el-form-item>
-				<el-form-item label="验证码" :label-width="formLabelWidth">
-					<el-input v-model="form.region" autocomplete="off" />
-				</el-form-item>
-			</el-form>
-			<template #footer>
-				<span class="dialog-footer">
+			<!-- <span class="dialog-footer">
 					<el-button @click="dialogFormVisible = false">确定</el-button>
 					<el-button type="primary" @click="dialogFormVisible = false">关闭</el-button>
-				</span>
-			</template>
-			
+			</span> -->
 		</el-dialog>
 	</div>
 </template>
@@ -190,35 +178,20 @@
 		},
 	]
 
-	const tableData = [{
-			date: '01',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '02',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
+	const tableData = [
 		{
-			date: '03',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
+			date: '34625032',
+			name: '2022-05-07',
+			address: '0.0',
+			number: "5000.0",
 			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
+			type: "23921001040002085",
+			regname: "贵州省黔西南州水文水资源局",
+			regtime: "中国农业银行股份有限公司兴义南盘江支行",
+			nonumber:"szm123456",
+			nonumbers:"贵E15389充ETC",
+			use:"测试",
+			usetype:"小额来账自动入账"
 		}
 	]
 </script>

src/views/fancongcong/cardrechargefix/cardrechargefix.vue

@@ -7,16 +7,16 @@
 				</el-form-item>
 				<el-form-item>
 					<el-button type="primary">读卡</el-button>
-					<el-button :icon="Search" type="primary">查询</el-button>	
+					<el-button :icon="Search" type="primary">查询</el-button>
 				</el-form-item>
 			</el-form>
 		</div>
-		<el-table :data="tableData" border style="width: 100%" class="table_box" scrollbar-always-on="true" stripe >
+		<el-table :data="tableData" border style="width: 100%" class="table_box" scrollbar-always-on="true" stripe>
 			<el-table-column prop="name" label="黔通卡号" />
 			<el-table-column prop="address" label="充值前余额(元)" />
 			<el-table-column prop="number" label="充值金额(元)" />
-			<el-table-column prop="time" label="充值后余额(元)<" />
-			<el-table-column prop="type" label="充值时间" />
+			<el-table-column prop="time" label="充值后余额(元)" />
+			<el-table-column prop="regtime" label="充值时间" />
 			<el-table-column label="操作" class="table_btn" width="150px" align="center">
 				<el-tooltip content="详细" placement="top">
 					<el-button type="warning" @click="dialogFormVisible = true">查看详细</el-button>
@@ -37,7 +37,7 @@
 					<el-input v-model="form.region" autocomplete="off" />
 				</el-form-item>
 			</el-form>
-			
+
 			<el-form :model="form" v-else>
 				<el-form-item label="对公账户资金账户编号" :label-width="formLabelWidth">
 					<el-input v-model="form.number" autocomplete="off" disabled />
@@ -52,7 +52,7 @@
 					<el-button type="primary" @click="dialogFormVisible = false">关闭</el-button>
 				</span>
 			</template>
-			
+
 		</el-dialog>
 	</div>
 </template>
@@ -75,7 +75,7 @@
 	const onSubmit = () => {
 		console.log('submit!')
 	}
-	
+
 	let title = ref("对公账户信息")
 
 	const options = [{
@@ -104,20 +104,20 @@
 	const value2 = ref('')
 	const value3 = ref('')
 	const value4 = ref('')
-	
+
 	const dialogTableVisible = ref(false)
 	const dialogFormVisible = ref(false)
 	const formLabelWidth = '140px'
-	
+
 	const form = reactive({
-	  phone: '13078580843',//手机号
-	  region: '',//验证码
-	  delivery: false,//是否展示详细
-	  number:''//对公账户资金账户编号
-	  
+		phone: '13078580843', //手机号
+		region: '', //验证码
+		delivery: false, //是否展示详细
+		number: '' //对公账户资金账户编号
+
 	})
-	
-	
+
+
 	const optiones = [{
 			value: '2',
 			label: '2',
@@ -166,30 +166,10 @@
 
 	const tableData = [{
 			date: '01',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '02',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '03',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
+			name: '52011750220200003674',
+			address: '0.06',
+			number: "100.00",
+			time: "100.06",
 			type: "已启用",
 			regname: "xn18096012008",
 			regtime: "2021-06-23T15:08:39"
@@ -205,7 +185,8 @@
 
 		.table_box {
 			margin-top: 25px;
-			.table_btn{
+
+			.table_btn {
 				display: flex;
 				flex-direction: column;
 				align-self: stretch;

src/views/fancongcong/cardrefundcostManage/cardrefundcostManage.vue

@@ -12,13 +12,14 @@
 			</el-form>
 		</div>
 		<el-table :data="tableData" border style="width: 100%" class="table_box" scrollbar-always-on="true" stripe >
-			<el-table-column prop="name" label="序号" />
+			<el-table-column prop="date" label="序号" />
 			<el-table-column prop="name" label="卡号" />
-			<el-table-column prop="address" label="用户名" />
-			<el-table-column prop="number" label="证件号" />
-			<el-table-column prop="time" label="注销时间" />
 			<el-table-column prop="type" label="退款状态" />
-			<el-table-column prop="type" label="退费金额(元)"/>
+			<el-table-column prop="regtime" label="注销时间" />
+			<el-table-column prop="numbers" label="卡账余额(元)" />
+			<el-table-column prop="number" label="卡内余额(元)" />
+			<el-table-column prop="numbers" label="交易后余额(元)"/>
+			<el-table-column prop="numbers" label="退费金额(元)"/>
 			<el-table-column label="操作" class="table_btn" width="150px" align="center">
 				<el-tooltip content="详细" placement="top">
 					<el-button type="warning" @click="dialogFormVisible = true">查看详细</el-button>
@@ -30,8 +31,8 @@
 			<el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="1000" />
 		</div>
 
-		<el-dialog v-model="dialogFormVisible" :title="title">
-			<el-form :model="form" v-if="delivery">
+		<el-dialog v-model="dialogFormVisible" title="退款详细">
+			<el-form :model="form">
 				<el-form-item label="手机号" :label-width="formLabelWidth">
 					<el-input v-model="form.phone" autocomplete="off" disabled />
 				</el-form-item>
@@ -39,15 +40,6 @@
 					<el-input v-model="form.region" autocomplete="off" />
 				</el-form-item>
 			</el-form>
-			
-			<el-form :model="form" v-else>
-				<el-form-item label="对公账户资金账户编号" :label-width="formLabelWidth">
-					<el-input v-model="form.number" autocomplete="off" disabled />
-				</el-form-item>
-				<el-form-item label="验证码" :label-width="formLabelWidth">
-					<el-input v-model="form.region" autocomplete="off" />
-				</el-form-item>
-			</el-form>
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="dialogFormVisible = false">确定</el-button>
@@ -168,33 +160,15 @@
 
 	const tableData = [{
 			date: '01',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '02',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '03',
-			name: 'Liu461185',
+			name: '52011750220200003674',
 			address: '安顺市顺安防雷安全检测站平坝分站',
 			number: "91520421MA6EBM14XC",
 			time: "2021-06-22T12:52:17",
-			type: "已启用",
+			type: "已退款",
 			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
+			regtime: "2021-06-23T15:08:39",
+			number:"0.00",
+			numbers:"0.00"
 		}
 	]
 </script>

src/views/fancongcong/corporateaccountManage/corporateaccountManage.vue

@@ -4,13 +4,13 @@
 			<el-form :inline="true" :model="formInline" class="demo-form-inline">
 				<el-form-item label="申请时间">
 					<div class="block">
-						<el-date-picker v-model="start_time" type="datetime" placeholder="" />
+						<el-date-picker v-model="start_time" type="datetime" placeholder="请选择申请开始时间" />
 					</div>
 					<el-icon>
 						<semi-select />
 					</el-icon>
 					<div class="block">
-						<el-date-picker v-model="end_time" type="datetime" placeholder="" />
+						<el-date-picker v-model="end_time" type="datetime" placeholder="请选择申请结束时间" />
 					</div>
 				</el-form-item>
 				<el-form-item label="账号状态">
@@ -80,8 +80,8 @@
 			</el-form>
 			<template #footer>
 				<span class="dialog-footer">
-					<el-button type="primary">取消</el-button>
-					<el-button type="primary" @click="dialogFormVisibles">确定</el-button>
+					<el-button type="primary" @click="dialogFormVisible = false">取消</el-button>
+					<el-button type="primary" @click="dialogFormVisible = false">确定</el-button>
 				</span>
 			</template>
 		</el-dialog>

src/views/fancongcong/supplyCardBalance/supplyCardBalance.vue

@@ -10,7 +10,6 @@
 					<el-button :icon="Search" type="primary">查询</el-button>
 					<el-button type="info">重置</el-button>
 					<el-button :icon="download" type="primary">人工录入</el-button>
-					
 				</el-form-item>
 			</el-form>
 		</div>
@@ -19,9 +18,9 @@
 			<el-table-column prop="name" label="卡号" />
 			<el-table-column prop="address" label="客户名称" />
 			<el-table-column prop="number" label="车牌号码" />
-			<el-table-column prop="time" label="车牌颜色" />
+			<el-table-column prop="regtime" label="车牌颜色" />
 			<el-table-column prop="type" label="补卡金额" />
-			<el-table-column prop="regname" label="录入时间" />
+			<el-table-column prop="regtime" label="录入时间" />
 			<el-table-column label="操作" class="table_btn" width="150px" align="center">
 				<el-tooltip content="详细" placement="top">
 					<el-button type="warning" @click="dialogFormVisible = true">查看详细</el-button>
@@ -33,8 +32,8 @@
 			<el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="1000" />
 		</div>
 
-		<el-dialog v-model="dialogFormVisible" :title="title">
-			<el-form :model="form" v-if="delivery">
+		<el-dialog v-model="dialogFormVisible" title="补卡详细">
+			<el-form :model="form">
 				<el-form-item label="手机号" :label-width="formLabelWidth">
 					<el-input v-model="form.phone" autocomplete="off" disabled />
 				</el-form-item>
@@ -42,15 +41,6 @@
 					<el-input v-model="form.region" autocomplete="off" />
 				</el-form-item>
 			</el-form>
-			
-			<el-form :model="form" v-else>
-				<el-form-item label="对公账户资金账户编号" :label-width="formLabelWidth">
-					<el-input v-model="form.number" autocomplete="off" disabled />
-				</el-form-item>
-				<el-form-item label="验证码" :label-width="formLabelWidth">
-					<el-input v-model="form.region" autocomplete="off" />
-				</el-form-item>
-			</el-form>
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="dialogFormVisible = false">确定</el-button>
@@ -171,33 +161,13 @@
 
 	const tableData = [{
 			date: '01',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '02',
-			name: 'Liu461185',
-			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
-			time: "2021-06-22T12:52:17",
-			type: "已启用",
-			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
-		},
-		{
-			date: '03',
-			name: 'Liu461185',
+			name: '52011750220200003674',
 			address: '安顺市顺安防雷安全检测站平坝分站',
-			number: "91520421MA6EBM14XC",
+			number: "贵AC0263",
 			time: "2021-06-22T12:52:17",
-			type: "已启用",
+			type: "100.00",
 			regname: "xn18096012008",
-			regtime: "2021-06-23T15:08:39"
+			regtime: "蓝色"
 		}
 	]
 </script>

src/views/shengbo/blacklistQuery/blacklistQuery.vue

@@ -40,12 +40,12 @@
       <el-button v-model="input4" type="success" :icon="Search" @click="search">搜索</el-button>
       <el-button type="warning" :icon="Refresh" @click="reset">重置</el-button>
       <el-button type="primary" :icon="Plus" @click="dialogFormVisible = true">添加</el-button>
-      <el-dialog v-model="dialogFormVisible" title="卡黑名单-操作(下黑反白)">
+      <el-dialog v-model="dialogFormVisible" title="卡黑名单-操作(下黑反白)" class="as-gravity-center">
         <el-form :model="form">
-          <el-form-item label="卡号：" :label-width="150">
+          <el-form-item label="卡号：" :label-width="100">
             <el-input v-model="form.name" style="width: 215px" />
           </el-form-item>
-          <el-form-item label="黑名单类型：" :label-width="150">
+          <el-form-item label="黑名单类型：" :label-width="100">
             <el-select v-model="form.region" placeholder="请选择黑名单类型">
               <el-option label="卡挂失" value="shanghai" />
               <el-option label="无卡挂起" value="beijing" />
@@ -56,13 +56,13 @@
               <el-option label="储值卡余额不足" value="shanghai" />
             </el-select>
           </el-form-item>
-          <el-form-item label="状态类型：" :label-width="150">
+          <el-form-item label="状态类型：" :label-width="100">
             <el-select v-model="form.region" placeholder="请选择状态类型">
               <el-option label="下黑" value="shanghai" />
               <el-option label="反白" value="beijing" />
             </el-select>
           </el-form-item>
-          <el-form-item label="原因：" :label-width="150">
+          <el-form-item label="原因：" :label-width="100">
             <el-input v-model="form.desc" type="textarea" />
           </el-form-item>
         </el-form>
@@ -91,42 +91,42 @@
         <el-button @click="dialogFormVisible1 = true" style="border-style: none">详情</el-button>
       </el-table-column>
     </el-table>
-    <el-dialog v-model="dialogFormVisible1">
+    <el-dialog v-model="dialogFormVisible1" class="as-gravity-center">
             <span class="as-gravity-center" style="font-size: 22px">基本信息</span>
             <el-form :model="form1" style="padding-top: 12px">
-              <el-form-item label="卡号：" :label-width="150">
+              <el-form-item label="卡号：" :label-width="100">
                 <el-input v-model="form1.data" style="width: 215px" disabled />
               </el-form-item>
             </el-form>
             <el-form :model="form1">
-              <el-form-item label="车辆号：" :label-width="150">
+              <el-form-item label="车辆号：" :label-width="100">
                 <el-input v-model="form1.data1" style="width: 215px" disabled />
               </el-form-item>
             </el-form>
             <el-form :model="form1">
-              <el-form-item label="机构名称：" :label-width="150">
+              <el-form-item label="机构名称：" :label-width="100">
                 <el-input v-model="form1.data2" style="width: 215px" disabled />
               </el-form-item>
             </el-form>
             <el-form :model="form1">
-              <el-form-item label="黑名单类型：" :label-width="150">
+              <el-form-item label="黑名单类型：" :label-width="100">
                 <el-input v-model="form1.data3" style="width: 215px" disabled />
               </el-form-item>
             </el-form>
             <span class="as-gravity-center" style="font-size: 22px">黑名单上传日志</span>
             <el-form :model="form1" style="padding-top: 12px">
-              <el-form-item label="上传日志：" :label-width="150" style="color: rgb(209, 65, 65)">
+              <el-form-item label="上传日志：" :label-width="100" style="color: rgb(209, 65, 65)">
                 <el-input v-model="form1.data4" type="textarea" disabled />
               </el-form-item>
             </el-form>
             <span class="as-gravity-center" style="font-size: 22px">渠道下黑原因</span>
             <el-form :model="form1" style="padding-top: 12px">
-              <el-form-item label="查询结果：" :label-width="150" style="color: rgb(209, 65, 65)">
+              <el-form-item label="查询结果：" :label-width="100" style="color: rgb(209, 65, 65)">
                 <el-input v-model="form1.data5" style="width: 215px" disabled />
               </el-form-item>
             </el-form>
             <el-form :model="form1">
-              <el-form-item label="下黑原因：" :label-width="150" style="color: rgb(209, 65, 65)">
+              <el-form-item label="下黑原因：" :label-width="100" style="color: rgb(209, 65, 65)">
                 <el-input v-model="form1.data6" type="textarea" disabled />
               </el-form-item>
             </el-form>

src/views/shengbo/trafficFlow/trafficFlow.vue

@@ -31,8 +31,8 @@
     <div class="topstyle">
       <el-button v-model="input4" type="success" :icon="Search" @click="search">搜索</el-button>
       <el-button type="warning" :icon="Refresh" @click="reset">重置</el-button>
-      <el-button type="primary" plain @click="exportCurrentPage">导出当前页</el-button>
-      <el-button type="primary" plain  @click="exportAll">导出所有</el-button>
+      <el-button type="primary" plain  @click="excelExport()">导出当前页</el-button>
+      <el-button type="primary" plain   @click="excelExport()">导出所有</el-button>
     </div>
   </div>
   <div style="padding-top: 12px">
@@ -97,14 +97,33 @@ const setCurrent = (row?: User) => {
 const handleCurrentChange = (val: User | undefined) => {
   currentRow.value = val
 }
-// const objectService = {
-//   url: 'http://localhost:8888/list2',
-// }
-
-// const { data } = useRequest(objectService)
-// console.log(data.value);
-
-// const tableData = data
+//点击导出
+function excelExport(){
+  import('@/vendor/Export2Excel').then(excel => {
+    const tHeader = ['用户名称', '账号', '手机号', '所属公司','用户角色','创建者','部门名称','创建时间','最近登录时间']
+    const filterVal = ['userName', 'email', 'phonenumber', 'orgName','roleName','createBy','deptName','createTime','loginTime']
+    const list = this.list
+    const data = this.formatJson(filterVal, list)
+    excel.export_json_to_excel({
+      header: tHeader,
+      data,
+      filename: "账号列表",
+      // filename: this.filename,
+      autoWidth: this.autoWidth,
+      bookType: this.bookType
+    })
+    this.downloadLoading = false
+  })
+}
+function formatJson(filterVal, jsonData) {
+  return this.dataList.map(v => filterVal.map(j => {
+    if (j === 'timestamp') {
+      return parseTime(v[j])
+    } else {
+      return v[j]
+    }
+  }))
+}
 const tableData: User[] = [
   {
     date1: '1',