@@ -4,6 +4,7 @@
/runtime/*
/public/uploads/*
/public/file/*
+/public/*.pdf
.idea
composer.lock
*.log
@@ -97,7 +97,7 @@ class Makezip{
self::restoreFileName($path . '\\' . $k, $v['children']);
rename($path . '/' . $k, iconv('UTF-8', 'GBK', $path . '/' . $v['originName']));
} else {
- rename($path . '/' . $k, iconv('UTF-8', 'GBK', $path . '/' . $v['originName']));
+ rename($path . '/' . $k, $v['originName']);
}
@@ -55,7 +55,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
title: __('学员考试记录'),
text:'学员考试记录',
classname: 'btn btn-xs btn-default btn-dialog',
- extend:'data-area=\'["1200px","700px"]\'',
+ extend:'data-area=\'["100%","100%"]\'',
icon: 'fa fa-file-text-o',
url: 'yexam/exam/user_log?exam_id={id}'
},