From 310ebbbc42e94e947484ec7f4014ddbe9a5612f2 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 08 一月 2024 09:22:14 +0800
Subject: [PATCH] 修订版本1.0

---
 src/components/view/registrant-count.vue |    2 
 src/components/tool/value-table.vue      |  146 +++++++++++++++++++++++++++--
 src/components/view/custom-enum.vue      |    5 
 src/components/view/finance-submit.vue   |    2 
 src/components/view/person-manage.vue    |    4 
 src/assets/api/controller.js             |    2 
 src/view/enter.vue                       |   10 +-
 src/components/view/product-count.vue    |   15 +++
 src/main.js                              |    8 
 src/components/view/fans-submit.vue      |   62 ++++++++----
 src/components/view/data-reporting.vue   |   36 ++++++-
 src/components/view/index-index.vue      |    2 
 src/components/view/product-enum.vue     |    5 
 13 files changed, 250 insertions(+), 49 deletions(-)

diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 8471639..6fa02e0 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -35,6 +35,8 @@
 	downDataReportingFile: "/dataReporting/downDataReportingFile", //瀵煎嚭鏁版嵁涓婃姤
 	downProductCountFile: "/dataReporting/downProductCountFile", //瀵煎嚭椤圭洰鏁版嵁缁熻
 	downRegistrantCountFile: "/dataReporting/downRegistrantCountFile", //瀵煎嚭鍛樺伐鏁版嵁缁熻
+	downFansSubmitFile: "/dataReporting/downFansSubmitFile", //瀵煎嚭杩涚矇涓婃姤
+	inputFansSubmitCsv: "/dataReporting/inputFansSubmitCsv", //瀵煎叆杩涚矇涓婃姤
 	
 	selectFansSubmitList: "/dataReporting/selectFansSubmitList", //鑾峰彇杩涚矇涓婃姤鍒楄〃
 	delFansSubmit: "/dataReporting/delFansSubmit", //鍒犻櫎杩涚矇涓婃姤淇℃伅
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index e787e0b..fadc898 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -31,6 +31,15 @@
 		justify-content: center;
 	}
 </style>
+<style>
+	.value-table .el-upload {
+		width: 100%;
+	}
+	
+	.value-table .el-upload-dragger {
+		width: 100%;
+	}
+</style>
 
 <template>
 	<div class="value-table">
@@ -43,7 +52,7 @@
 				<el-table-column align="center" type="index" label="搴忓彿" width="70" v-if="data.isIndex">
 				</el-table-column>
 				<el-table-column :prop="a.label" :label="a.value" sortable="custom" v-for="(a, ai) in tableHead" :key="ai"
-					show-overflow-tooltip min-width="145">
+					show-overflow-tooltip min-width="160">
 					<template slot-scope="scope">
 						<div v-if="showType(a.label, data.tagField) != null">
 							<el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="b.value == scope.row[a.label]"
@@ -70,12 +79,14 @@
 		<el-dialog title="缂栬緫" :visible.sync="upDia" width="500px">
 			<div class="body" v-if="upDia">
 				<el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
-					<el-col :span="5" style="text-align: right;">{{a.value}}锛�</el-col>
-					<el-col :span="17" :offset="1">
-						<el-input v-model="upData[a.label]" size="small" clearable
-							v-if="showType(a.label, data.selectField) == null"></el-input>
+					<el-col :span="6" style="text-align: right;">
+						<span class="required-span" v-if="showUpReq(a.label)">* </span>{{a.value}}锛�
+					</el-col>
+					<el-col :span="16" :offset="1">
+						<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
+							v-if="showType(a.label, data.selectField) == null" :disabled="isDisabled(a.label)"></el-input>
 						<el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null"
-							style="width: 100%;">
+							style="width: 100%;" :disabled="isDisabled(a.label)">
 							<el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value"
 								:label="b.label"></el-option>
 						</el-select>
@@ -88,9 +99,9 @@
 			</span>
 		</el-dialog>
 		<el-dialog title="鏂板" :visible.sync="addDia" width="500px">
-			<div class="body" v-if="addDia" style="max-height: 600px;overflow-y: auto;">
+			<div class="body" v-if="addDia" style="max-height: 600px;overflow-y: auto;padding: 5px 0;">
 				<el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;">
-					<el-col :span="6" style="text-align: right;">{{a.value}}锛�</el-col>
+					<el-col :span="6" style="text-align: right;"><span class="required-span" v-if="showAddReq(a.label)">* </span>{{a.value}}锛�</el-col>
 					<el-col :span="16" :offset="1">
 						<el-input v-model="upData[a.label]" size="small" clearable :placeholder="`璇疯緭鍏�${a.value}`"
 							v-if="showType(a.label, data.selectField) == null"></el-input>
@@ -117,6 +128,20 @@
 				</div>
 			</div>
 		</el-dialog>
+		<el-dialog title="鏁版嵁瀵煎叆" :visible.sync="uploadDia" width="500px">
+			<div style="margin: 0 auto;">
+				<el-upload ref="upload" drag :action="javaApi + inputUrl" :headers="token"
+					:file-list="fileList" name="file" :auto-upload="false" accept=".csv" :limit="1" :on-change="beforeUpload"
+					:on-success="onSuccess" :on-error="onError">
+					<i class="el-icon-upload"></i>
+					<div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
+				</el-upload>
+			</div>
+			<span slot="footer" class="dialog-footer">
+				<el-button @click="uploadDia = false">鍙� 娑�</el-button>
+				<el-button type="primary" @click="submitUpload()">涓� 浼�</el-button>
+			</span>
+		</el-dialog>
 	</div>
 </template>
 
@@ -139,6 +164,10 @@
 				default: () => null
 			},
 			downUrl: {
+				type: String,
+				default: () => null
+			},
+			inputUrl: {
 				type: String,
 				default: () => null
 			},
@@ -219,7 +248,10 @@
 				addUrl: null,
 				addLoad: false,
 				dataCopy: {},
-				downDia: false
+				downDia: false,
+				uploadDia: false,
+				token: null,
+				fileList: [],
 			}
 		},
 		watch: {
@@ -236,6 +268,9 @@
 			this.data = this.componentData
 			this.dataCopy = this.HaveJson(this.componentData)
 			this.selectList()
+			this.token = {
+				'token': sessionStorage.getItem('token')
+			}
 		},
 		methods: {
 			selectChange(val) {
@@ -308,12 +343,34 @@
 				var str = ob[val]
 				return str == undefined ? null : ob[val].select
 			},
+			showAddReq(label){
+				if(this.data.requiredAdd==undefined){
+					return
+				}
+				for (var i = 0; i < this.data.requiredAdd.length; i++) {
+					if(label == this.data.requiredAdd[i]){
+						return true
+					}
+				}
+				return false
+			},
+			showUpReq(label){
+				if(this.data.requiredUp==undefined){
+					return
+				}
+				for (var i = 0; i < this.data.requiredUp.length; i++) {
+					if(label == this.data.requiredUp[i]){
+						return true
+					}
+				}
+				return false
+			},
 			main(row, val) {
 				if (val.method == undefined) return
 				else if (val.method == 'doDiy') {
 					if (val.id == 'update') {
 						this.upDia = true,
-							this.upData = this.HaveJson(row)
+						this.upData = this.HaveJson(row)
 						this.upHead = this.HaveJson(this.tableHead)
 						this.upHead = this.upHead.filter(a => a.label != 'createTime' && a.label != 'updateTime')
 						delete this.upData.orderBy
@@ -370,6 +427,16 @@
 				if (this.upUrl == null) {
 					this.$message.error('璇风粰淇敼璇锋眰鍦板潃')
 					return
+				}
+				for (var i = 0; i < this.data.requiredUp.length; i++) {
+					if(this.upData[this.data.requiredUp[i]]==null||this.upData[this.data.requiredUp[i]]==''){
+						var list = this.upHead.filter(a=>{
+							if(a.label == this.data.requiredUp[i]) return a
+						})
+						if(list[0].value == undefined) continue
+						this.$message.error(list[0].value + '鏄繀濉」')
+						return
+					}
 				}
 				this.upLoad = true
 				this.$axios.post(this.upUrl, this.upData, {
@@ -432,6 +499,16 @@
 					this.$message.error('璇风粰娣诲姞璇锋眰鍦板潃')
 					return
 				}
+				for (var i = 0; i < this.data.requiredAdd.length; i++) {
+					if(this.upData[this.data.requiredAdd[i]]==null||this.upData[this.data.requiredAdd[i]]==''){
+						var list = this.upHead.filter(a=>{
+							if(a.label == this.data.requiredAdd[i]) return a
+						})
+						if(list[0].value == undefined) continue
+						this.$message.error(list[0].value + '鏄繀濉」')
+						return
+					}
+				}
 				this.addLoad = true
 				this.$axios.post(this.addUrl, this.upData, {
 					headers: {
@@ -492,6 +569,55 @@
 					this.loading = false
 					this.$message.error('璇峰埛鏂伴〉闈㈠啀灏濊瘯')
 				})
+			},
+			openUpload() {
+				if (this.inputUrl == null) {
+					this.$message.error('璇风粰瀵煎叆璇锋眰鍦板潃')
+					return
+				}
+				this.uploadDia = true
+			},
+			beforeUpload(file, fileList) {
+				if (file.raw.type != 'text/csv') {
+					this.$message.error('涓婁紶鏂囦欢鏍煎紡涓嶆纭�');
+					this.$refs.upload.clearFiles()
+					return false;
+				}
+			},
+			submitUpload() {
+				if (this.$refs.upload.uploadFiles.length == 0) {
+					this.$message.error('鏈�夋嫨鏂囦欢')
+					return
+				}
+				this.uploading = true
+				this.$refs.upload.submit();
+			},
+			onSuccess(response, file, fileList) {
+				this.$refs.upload.clearFiles()
+				this.uploadDia = false
+				this.uploading = false
+				if(response.code==201){
+					this.$message.error(response.message)
+					return
+				}
+				this.$message.success('涓婁紶鎴愬姛')
+				this.selectList()
+			},
+			onError(err, file, fileList) {
+				this.$message.error('涓婁紶澶辫触')
+				this.$refs.upload.clearFiles()
+				this.uploading = false
+			},
+			isDisabled(label){
+				if(this.data.disabledUp==undefined){
+					return
+				}
+				for (var i = 0; i < this.data.disabledUp.length; i++) {
+					if(label == this.data.disabledUp[i]){
+						return true
+					}
+				}
+				return false
 			}
 		}
 	}
diff --git a/src/components/view/custom-enum.vue b/src/components/view/custom-enum.vue
index 0129d20..fe6d9c4 100644
--- a/src/components/view/custom-enum.vue
+++ b/src/components/view/custom-enum.vue
@@ -100,7 +100,10 @@
 						type: 'text',
 						method: 'doDiy'
 					}],
-					tagField: {}
+					tagField: {},
+					selectField: {},
+					requiredAdd:['company','name'],
+					requiredUp:['company','name']
 				},
 				entityCopy: {},
 				upIndex: 0,
diff --git a/src/components/view/data-reporting.vue b/src/components/view/data-reporting.vue
index 95beb34..5db24a8 100644
--- a/src/components/view/data-reporting.vue
+++ b/src/components/view/data-reporting.vue
@@ -71,7 +71,7 @@
 			<div class="search_thing">
 				<div class="search_label">绯荤粺鏃ユ湡锛�</div>
 				<div class="search_input">
-					<el-date-picker size="small" v-model="componentData.entity.updateTime" type="date" placeholder="閫夋嫨鏃ユ湡"
+					<el-date-picker size="small" v-model="componentData.entity.createTime" type="date" placeholder="閫夋嫨鏃ユ湡"
 						value-format="yyyy-MM-dd HH:mm:ss" clearable></el-date-picker>
 				</div>
 			</div>
@@ -133,6 +133,16 @@
 					</el-col>
 				</el-row>
 				<el-row style="line-height: 50px;">
+					<el-col :span="4" style="text-align: right;padding-right: 8px;">濮撳悕</el-col>
+					<el-col :span="7">
+						<el-input v-model="upData.name2" size="small" disabled></el-input>
+					</el-col>
+					<el-col :span="4" style="text-align: right;padding-right: 8px;">浠g悊</el-col>
+					<el-col :span="7">
+						<el-input v-model="upData.agent" size="small" disabled></el-input>
+					</el-col>
+				</el-row>
+				<el-row style="line-height: 50px;">
 					<el-col :span="4" style="text-align: right;padding-right: 8px;">灞曠幇閲�</el-col>
 					<el-col :span="7">
 						<el-input v-model="upData.showNum" size="small" disabled></el-input>
@@ -177,7 +187,7 @@
 					<el-col :span="7">
 						<el-input v-model="upData.profit" size="small" disabled></el-input>
 					</el-col>
-					<el-col :span="4" style="text-align: right;padding-right: 8px;">浠g悊杩旂偣</el-col>
+					<el-col :span="4" style="text-align: right;padding-right: 8px;">鍛樺伐浠g悊杩旂偣</el-col>
 					<el-col :span="7">
 						<el-input v-model="upData.agentRebate" size="small" disabled></el-input>
 					</el-col>
@@ -235,7 +245,7 @@
 			return {
 				componentData: {
 					entity: {
-						updateTime: null,
+						createTime: null,
 						registrant: null,
 						product: null,
 						orderBy: {
@@ -252,7 +262,7 @@
 						type: 'text',
 						method: 'upRole',
 						field: ['createUserName', 'updateUserName', 'registrant', 'department', 'consumption',
-							'rebateConsumption', 'discountedConsumption', 'profit', 'remark', 'actualCost'
+							'rebateConsumption', 'discountedConsumption', 'profit', 'remark', 'actualCost', 'fansAdd', 'agentRebate'
 						]
 					}, {
 						id: 'delete',
@@ -261,7 +271,8 @@
 						method: 'doDiy'
 					}],
 					tagField: {},
-					selectField: {}
+					selectField: {},
+					requiredAdd:['name2','agent','channel','product','showNum','click','accountConsumption'],
 				},
 				entityCopy: {},
 				upIndex: 0,
@@ -279,6 +290,21 @@
 				outPower: true
 			}
 		},
+		created() {
+			var today = new Date();
+			var yesterday = new Date(today);
+			yesterday.setDate(today.getDate() - 1);
+			var yyyy = yesterday.getFullYear();
+			var mm = yesterday.getMonth() + 1;
+			var dd = yesterday.getDate()
+			if (dd < 10) {
+				dd = "0" + dd;
+			}
+			if (mm < 10) {
+				mm = "0" + mm;
+			}
+			this.componentData.entity.createTime = this.HaveJson(`${yyyy}-${mm}-${dd} 00:00:00`)
+		},
 		mounted() {
 			this.entityCopy = this.HaveJson(this.componentData.entity)
 			this.selectProductEnumList()
diff --git a/src/components/view/fans-submit.vue b/src/components/view/fans-submit.vue
index a56f93d..5013b5d 100644
--- a/src/components/view/fans-submit.vue
+++ b/src/components/view/fans-submit.vue
@@ -42,6 +42,14 @@
 			<el-row class="title">
 				<el-col :span="12" style="padding-left: 20px;">杩涚矇涓婃姤</el-col>
 				<el-col :span="12" style="text-align: right;">
+					<el-button size="medium" @click="$refs.ValueTable.openUpload()" v-if="inPower">
+						<i class="el-icon-upload2" style="color: #3A7BFA;"></i>
+						<span style="color: #3A7BFA;">瀵煎叆</span>
+					</el-button>
+					<el-button size="medium" @click="$refs.ValueTable.openDownDia()" v-if="outPower">
+						<i class="el-icon-download" style="color: #3A7BFA;"></i>
+						<span style="color: #3A7BFA;">瀵煎嚭</span>
+					</el-button>
 					<el-button size="medium" type="primary" @click="openAdd" v-if="addPower">鏂板</el-button>
 				</el-col>
 			</el-row>
@@ -50,7 +58,8 @@
 			<div class="search_thing">
 				<div class="search_label">绯荤粺鏃ユ湡锛�</div>
 				<div class="search_input">
-					<el-date-picker size="small" v-model="componentData.entity.createTime" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd HH:mm:ss" clearable></el-date-picker>
+					<el-date-picker size="small" v-model="componentData.entity.createTime" type="date" placeholder="閫夋嫨鏃ユ湡"
+						value-format="yyyy-MM-dd HH:mm:ss" clearable></el-date-picker>
 				</div>
 			</div>
 			<div class="search_thing">
@@ -74,7 +83,8 @@
 			<div class="search_thing">
 				<div class="search_label">鐧昏浜猴細</div>
 				<div class="search_input">
-					<el-input size="small" v-model="componentData.entity.createUserName" clearable placeholder="鐧昏浜�" @keyup.enter.native="refreshTable()"></el-input>
+					<el-input size="small" v-model="componentData.entity.createUserName" clearable placeholder="鐧昏浜�"
+						@keyup.enter.native="refreshTable()"></el-input>
 				</div>
 			</div>
 			<div class="search_thing" style="padding-left: 30px;">
@@ -83,7 +93,9 @@
 			</div>
 		</div>
 		<div class="table">
-			<ValueTable ref="ValueTable" :url="$api.dataReporting.selectFansSubmitList" :upUrl="$api.dataReporting.updateFansSubmit" :delUrl="$api.dataReporting.delFansSubmit" :componentData="componentData" :key="upIndex"/>
+			<ValueTable ref="ValueTable" :url="$api.dataReporting.selectFansSubmitList"
+				:upUrl="$api.dataReporting.updateFansSubmit" :delUrl="$api.dataReporting.delFansSubmit"
+				:componentData="componentData" :key="upIndex" :downUrl="$api.dataReporting.downFansSubmitFile" :inputUrl="$api.dataReporting.inputFansSubmitCsv"/>
 		</div>
 	</div>
 </template>
@@ -115,8 +127,8 @@
 						font: '缂栬緫',
 						type: 'text',
 						method: 'doDiy',
-						field:['createUserName']
-					},{
+						field: ['createUserName']
+					}, {
 						id: 'delete',
 						font: '鍒犻櫎',
 						type: 'text',
@@ -127,14 +139,21 @@
 						product: {
 							select: []
 						},
-						custom: {select: []}
+						custom: {
+							select: []
+						}
 					},
+					requiredAdd: ['custom', 'product', 'fansAdd'],
+					requiredUp: ['custom', 'product', 'fansAdd'],
+					disabledUp: ['custom','product']
 				},
 				entityCopy: {},
 				upIndex: 0,
 				product: [],
 				custom: [],
-				addPower: true
+				addPower: true,
+				inPower: true,
+				outPower: true
 			}
 		},
 		mounted() {
@@ -151,14 +170,14 @@
 				this.componentData.entity = this.HaveJson(this.entityCopy)
 				this.upIndex++
 			},
-			openAdd(){
+			openAdd() {
 				this.$refs.ValueTable.openAddDia(this.$api.dataReporting.addFansSubmit);
 			},
-			selectProductEnumList(){
-				this.$axios.get(this.$api.enums.selectProductEnumList).then(res=>{
+			selectProductEnumList() {
+				this.$axios.get(this.$api.enums.selectProductEnumList).then(res => {
 					this.product = res.data
 					var str = []
-					res.data.forEach(a=>{
+					res.data.forEach(a => {
 						str.push({
 							label: a.product,
 							value: a.product
@@ -167,11 +186,11 @@
 					this.componentData.selectField.product.select = str
 				})
 			},
-			selectCustomEnumList(){
-				this.$axios.get(this.$api.enums.selectCustomEnumList).then(res=>{
+			selectCustomEnumList() {
+				this.$axios.get(this.$api.enums.selectCustomEnumList).then(res => {
 					this.custom = res.data
 					var str = []
-					res.data.forEach(a=>{
+					res.data.forEach(a => {
 						str.push({
 							label: a.name,
 							value: a.name
@@ -181,29 +200,32 @@
 				})
 			},
 			// 鏉冮檺鍒嗛厤
-			getPower(){
+			getPower() {
 				let power = JSON.parse(sessionStorage.getItem('power'))
 				let up = false
 				let del = false
 				let add = false
 				for (var i = 0; i < power.length; i++) {
-					if(power[i].menuMethod=='upDataReporting'){
+					if (power[i].menuMethod == 'upDataReporting') {
 						up = true
 					}
-					if(power[i].menuMethod=='delFansSubmit'){
+					if (power[i].menuMethod == 'delFansSubmit') {
 						del = true
 					}
-					if(power[i].menuMethod=='addFansSubmit'){
+					if (power[i].menuMethod == 'addFansSubmit') {
 						add = true
 					}
 				}
-				if(!del){
+				if (!del) {
 					this.componentData.do.splice(1, 1)
 				}
-				if(!up){
+				if (!up) {
 					this.componentData.do.splice(0, 1)
 				}
 				this.addPower = add
+			},
+			openUpload() {
+
 			}
 		}
 	}
diff --git a/src/components/view/finance-submit.vue b/src/components/view/finance-submit.vue
index 14db3e7..a411213 100644
--- a/src/components/view/finance-submit.vue
+++ b/src/components/view/finance-submit.vue
@@ -102,6 +102,8 @@
 						},
 						custom: {select: []}
 					},
+					requiredAdd: ['company', 'name', 'employeeRebate'],
+					requiredUp: ['company', 'name', 'employeeRebate']
 				},
 				entityCopy: {},
 				upIndex: 0,
diff --git a/src/components/view/index-index.vue b/src/components/view/index-index.vue
index d3b7b7c..507fa7a 100644
--- a/src/components/view/index-index.vue
+++ b/src/components/view/index-index.vue
@@ -325,7 +325,7 @@
 			}, 1000)
 			setInterval(() => {
 				this.getDataList()
-			}, 30000)
+			}, 60 * 1000)
 		},
 		methods: {
 			nowTime() {
diff --git a/src/components/view/person-manage.vue b/src/components/view/person-manage.vue
index 2631919..8470967 100644
--- a/src/components/view/person-manage.vue
+++ b/src/components/view/person-manage.vue
@@ -135,7 +135,9 @@
 						roleId: {
 							select: []
 						}
-					}
+					},
+					requiredAdd:['account','name','state','roleId','password'],
+					requiredUp:['account','name','state','roleId']
 				},
 				entityCopy: {},
 				upIndex: 0,
diff --git a/src/components/view/product-count.vue b/src/components/view/product-count.vue
index c5538d2..0328332 100644
--- a/src/components/view/product-count.vue
+++ b/src/components/view/product-count.vue
@@ -113,6 +113,21 @@
 				outPower: true
 			}
 		},
+		created() {
+			var today = new Date();
+			var yesterday = new Date(today);
+			yesterday.setDate(today.getDate() - 1);
+			var yyyy = yesterday.getFullYear();
+			var mm = yesterday.getMonth() + 1;
+			var dd = yesterday.getDate()
+			if (dd < 10) {
+				dd = "0" + dd;
+			}
+			if (mm < 10) {
+				mm = "0" + mm;
+			}
+			this.componentData.entity.createTime = `${yyyy}-${mm}-${dd} 00:00:00`
+		},
 		mounted() {
 			this.entityCopy = this.HaveJson(this.componentData.entity)
 			this.selectProductEnumList()
diff --git a/src/components/view/product-enum.vue b/src/components/view/product-enum.vue
index dd36b8f..582c15d 100644
--- a/src/components/view/product-enum.vue
+++ b/src/components/view/product-enum.vue
@@ -94,7 +94,10 @@
 						type: 'text',
 						method: 'doDiy'
 					}],
-					tagField: {}
+					tagField: {},
+					selectField: {},
+					requiredAdd:['product'],
+					requiredUp:['product']
 				},
 				entityCopy: {},
 				upIndex: 0,
diff --git a/src/components/view/registrant-count.vue b/src/components/view/registrant-count.vue
index 8a7fcc6..4998eb2 100644
--- a/src/components/view/registrant-count.vue
+++ b/src/components/view/registrant-count.vue
@@ -98,7 +98,7 @@
 						product: null,
 						orderBy: {
 							field: 'update_time',
-							order: 'asc'
+							order: 'desc'
 						}
 					},
 					isIndex: false,
diff --git a/src/main.js b/src/main.js
index ac9c023..b89f894 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,11 +12,11 @@
 import swal from 'sweetalert'
 
 //鏈湴
-// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80"; 
-// const javaApi = 'http://localhost:8001';
+Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80"; 
+const javaApi = 'http://localhost:8001';
 //鑳滀簯鏈嶅姟鍣�
-Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
-const javaApi = 'http://122.114.52.69:8001';
+// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
+// const javaApi = 'http://122.114.52.69:8001';
 Vue.prototype.HaveJson = (val) => {
 	return JSON.parse(JSON.stringify(val))
 }
diff --git a/src/view/enter.vue b/src/view/enter.vue
index ddc3bc9..4e01d55 100644
--- a/src/view/enter.vue
+++ b/src/view/enter.vue
@@ -180,11 +180,11 @@
               }
               localStorage.setItem('rememberme', this.ruleForm.remumberme)
               localStorage.setItem('autoenter', this.ruleForm.autoenter)
-              if (this.ruleForm.remumberme==true||this.ruleForm.autoenter==true) localStorage.setItem('user', JSON.stringify({
-                account: this.ruleForm.account,
-                password: this.ruleForm.pwd,
-                name: res.data.name
-              }))
+							localStorage.setItem('user', JSON.stringify({
+							  account: this.ruleForm.account,
+							  password: this.ruleForm.pwd,
+							  name: res.data.name
+							}))
               sessionStorage.setItem('token', res.data.token)
               sessionStorage.setItem('reToken', res.data.reToken)
 							sessionStorage.setItem('power', JSON.stringify(res.data.power))

--
Gitblit v1.9.3