From c7e4dd9bd50cf6e6426598753c796ec1a27f333f Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期五, 22 十二月 2023 13:18:10 +0800
Subject: [PATCH] 修改了异常的名称
---
src/views/getdata/GetData.vue | 58 ++++++++++++----------------------------------------------
1 files changed, 12 insertions(+), 46 deletions(-)
diff --git a/src/views/getdata/GetData.vue b/src/views/getdata/GetData.vue
index c7e91a4..da13397 100644
--- a/src/views/getdata/GetData.vue
+++ b/src/views/getdata/GetData.vue
@@ -1,6 +1,5 @@
<script>
import axiosInstancePy from '../../utils/requestPy'
-// import ShopNameSelect from '../sfc/ShopNameSelect.vue'
import ShopNameCheckBox from '../../sfc/ShopNameCheckBox.vue';
import TimeSelectCrawling from '../../sfc/TimeSelectCrawling.vue';
@@ -40,7 +39,7 @@
// 妯℃嫙鐧婚檰鎸夐挳鍔犺浇涓姸鎬�
login_loading:false,
// 鏃犳暟鎹椂鐨勫浘鐗�
- isNoData:false
+ isNoData:true
};
},
methods: {
@@ -57,7 +56,6 @@
autoLogin(){
this.login_loading = true
axiosInstancePy.get('/autologin').then(response =>{
- console.log('鐧婚檰缁撴灉涓猴細',response.data);
ElMessage.success(response.data)
this.login_loading = false
})
@@ -79,7 +77,6 @@
this.loading = true;
// 寰楀埌鍙嶉淇℃伅 鎵�鏈夋暟鎹�
axiosInstancePy.post('/getData', form).then((response) => {
- console.log(response.data);
if(response.data == '-1'){
this.loading = false;
// ElMessage.warning('璇峰厛鐐瑰嚮鐧婚檰')
@@ -97,19 +94,13 @@
this.result = this.result + item + '\n';
});
- // response.data.allData.forEach(item=>{
- // this.allData =this.allData+item+'\n'
- // this.allData =this.allData+'\n'
- // });
+
this.allData = response.data.allData;
this.duplicateData = response.data.duplicate;
- console.log('閲嶅鐨勬暟鎹负锛�', this.duplicateData);
this.newData = response.data.newData;
- console.log('鏂版暟鎹潯鏁颁负锛�',this.newData.length);
this.loading = false;
this.displayData = this.arrToObject(this.duplicateData);
- console.log('杞崲鍚庣殑瀵硅薄鏁扮粍涓猴細',this.displayData);
this.result=this.result+'\n閲嶅鐨勬暟閲忎负锛�'+this.duplicateData.length
});
@@ -147,7 +138,6 @@
}
this.openFullScreen()
axiosInstancePy.post('/store', {'allData':this.allData}).then((response) => {
- console.log(response.data);
ElMessage.success(response.data)
this.loadingToMysql.close()
})
@@ -165,7 +155,6 @@
axiosInstancePy
.post('/store', { 'allData': this.newData })
.then((response) => {
- console.log(response.data);
ElMessage.success(response.data)
this.loadingToMysql.close()
});
@@ -194,7 +183,6 @@
axiosInstancePy
.post('/store', { 'allData': this.newData })
.then((response) => {
- console.log(response.data);
ElMessage.success(response.data)
this.loadingToMysql.close()
});
@@ -222,11 +210,11 @@
</div>
<el-card>
- <!-- <ShopNameSelect @submit-shops="(n)=>selectedShopNames=n"></ShopNameSelect> -->
+
<ShopNameCheckBox
@submit-shops="(n) => (form.selectedShopNames = n)"
></ShopNameCheckBox>
- <!-- {{ selectedShopNames }} -->
+
</el-card>
@@ -248,32 +236,14 @@
placeholder="鐖彇缁撴灉"
autosize
></el-input>
- <!-- rows="6" -->
+
</div>
- <!-- <div class="progress-percentage">
-<el-progress :text-inside="true" :percentage="percentage" stroke-width="15" status="warning" striped striped-flow duration="5"></el-progress>
-</div>
-
-
-<div class="countdown-time">
- <el-countdown
- title="棰勮杩橀渶瑕佺埇鍙栫殑鏃堕棿"
- format="HH:mm:ss"
- :value="countdownTime"
- />
-</div> -->
-
- <!-- <div class="result-textarea-data" v-loading="loading">
- <div>鏁版嵁</div>
- <el-input v-model="allData" rows="6" type="textarea" class="result-textarea-textarea" placeholder="鏁版嵁"></el-input>
- <div>鑾峰彇鐨勬暟鎹暟涓猴細{{ allData.length }}</div>
-</div> -->
<div class="result-textarea-duplication">
- <div>閲嶅鐨勬暟鎹�</div>
- <!-- <div></div> -->
- <el-table :data="displayData" height="250" style="width: 100%">
+ <div>閲嶅鐨勬暟鎹�:</div>
+ <div v-show="!isNoData">
+ <el-table :data="displayData" height="200" style="width: 100%">
<el-table-column prop="椁愰ギ搴�" label="椁愰ギ搴�" width="180" fixed show-overflow-tooltip="true"/>
<el-table-column prop="渚涘簲鍟�" label="渚涘簲鍟�" width="180" show-overflow-tooltip="true"/>
<el-table-column prop="璁惧缂栧彿" label="璁惧缂栧彿" show-overflow-tooltip="true"/>
@@ -290,13 +260,11 @@
<el-table-column prop="鏁版嵁鏃堕棿" label="鏁版嵁鏃堕棿" show-overflow-tooltip="true"/>
<el-table-column prop="閲嶅娆℃暟" label="閲嶅娆℃暟" show-overflow-tooltip="true"/>
</el-table>
-
- <el-empty v-show="isNoData" :image-size="200" />
+ </div>
+ <el-empty v-show="isNoData" :image-size="150" />
</div>
- <!-- <div class="result-textarea">
- <span >閲嶅鏁伴噺涓猴細{{ duplicateData.length }}</span>
- </div> -->
+
<div class="store-button" >
<el-button
@@ -335,9 +303,7 @@
margin-top: 20px;
width: 50%;
}
-// .result-textarea-textarea {
-// // width: 50%;
-// }
+
.progress-percentage {
width: 50%;
margin-top: 20px;
--
Gitblit v1.9.3