diff --git a/client/dist/index.html b/client/dist/index.html
index afe93b3..60df6a3 100644
--- a/client/dist/index.html
+++ b/client/dist/index.html
@@ -1 +1 @@
-vue Admin Template
\ No newline at end of file
+vue Admin Template
\ No newline at end of file
diff --git a/client/src/views/informatiomCollect/yearReport.vue b/client/src/views/informatiomCollect/yearReport.vue
index 3a7f04c..f0d1f13 100644
--- a/client/src/views/informatiomCollect/yearReport.vue
+++ b/client/src/views/informatiomCollect/yearReport.vue
@@ -155,7 +155,6 @@ export default {
this.tableData.results =[];
this.tableData.count =0;
pdfAll(this.listQuery).then((response) => {
- console.log(response);
if (response.data) {
this.tableData = response.data;
}
@@ -166,10 +165,8 @@ export default {
handleDownload(scope) {
this.listLoading = true;
this.dialogTableVisible=true;
- console.log(scope.row.id);
getpdf(scope.row.id).then((response) => {
if (response.code>=200) {
- console.log(response.data.excel_path);
downloadFile(response.data.excel_path)
this.listLoading = false;
}else{
@@ -198,7 +195,6 @@ export default {
},
handleUpSuccess(res, file, filelist) {
this.fileList = [file];
- console.log(res.data.path);
this.form.pdf_file = res.data.path;
},
handleRemove(file, filelist) {
diff --git a/client/src/views/testvideo/exchange.vue b/client/src/views/testvideo/exchange.vue
index e553382..6a4d2f8 100644
--- a/client/src/views/testvideo/exchange.vue
+++ b/client/src/views/testvideo/exchange.vue
@@ -49,10 +49,10 @@
-
+
+ {{ scope.row.name }}
{{ scope.row.name }}
diff --git a/server/apps/information/views.py b/server/apps/information/views.py
index 177a460..7d90285 100644
--- a/server/apps/information/views.py
+++ b/server/apps/information/views.py
@@ -370,7 +370,7 @@ class ParsePdfViewSet(RbacFilterSet, CreateUpdateCustomMixin, ModelViewSet):
"""
try:
pdf_file = request.data['pdf_file']
- annual = request.data['year']
+ annual = request.data['annual']
# 读数据路径copy 在media 下新建excel,解析完成后存入数据库。
media_excel = os.path.join(os.path.dirname(EXCEL_PATH),"media_excel")
if not os.path.exists(media_excel):
diff --git a/server/apps/supervision/models.py b/server/apps/supervision/models.py
index f1e45f8..bbb21cb 100644
--- a/server/apps/supervision/models.py
+++ b/server/apps/supervision/models.py
@@ -294,7 +294,7 @@ class Oinspect(CommonBDModel):
checker = models.CharField('检查方', max_length=100)
date_inspect = models.DateField('检查日期')
result = models.TextField('检查结果', null=True, blank=True, default='')
- result_date = models.DateField('检查结果日期', null=True, blank=True)
+ result_date = models.DateField('检查结果日期', null=True, blank=True, default='')
notification_form = models.CharField('检查通知单', max_length=100, null=True)
result_form = models.CharField('检查结果告知单', max_length=100, null=True)
task2do = models.ForeignKey('supervision.task2do', verbose_name= '关联任务执行', on_delete=models.SET_NULL, null=True, blank=True)
\ No newline at end of file