modified: main.py

modified:   tools/zhangdan_flask.py

main.py

@@ -173,17 +173,23 @@ class MyPlugin(Star):
             self.sqllitaa.commit()
             cur.close()
             self.sqllitaa.close()
+            # 删除源文件
+            file_list = os.listdir(f"{self.data_path}")
             try:
-                # 删除源文件
-                file_list = os.listdir(f"{self.data_path}")
                 for nam in file_list:
                     if "zhangdan" not in nam:
                         os.remove(str(self.data_path)+"\\"+nam)
                 file_listaa = os.listdir(f"{self.data_path}/zhangdan/")
                 for namaa in file_listaa:
                     os.remove(str(self.data_path)+"\\zhangdan\\"+namaa)
-            except IOError as e:
-                logger.error(f"文件删除失败 原因{e}")
+            except Exception as e:
+                for nam in file_list:
+                    if "zhangdan" not in nam:
+                        os.remove(str(self.data_path)+"/"+nam)
+                file_listaa = os.listdir(f"{self.data_path}/zhangdan/")
+                for namaa in file_listaa:
+                    os.remove(str(self.data_path)+"/zhangdan/"+namaa)
+
             yield event.plain_result("保存完成__使用/chazhang 查询最后10条记录")
         except Exception as e:
             yield event.plain_result(f"保存失败{e}")
@@ -217,7 +223,7 @@ class MyPlugin(Star):
         yuju = []
         try:
             if ".csv" in filename:
-                ata = pd.read_csv(filename, encoding='GB2312', on_bad_lines='skip',header=22)
+                ata = pd.read_csv(filename, encoding='gb18030', on_bad_lines='skip',header=22)
                 # 读取表格数据
                 for biao in range(10):
                     # 暂存当行数据