From 0d4846e9baf6c82d1f7a68ddd383b2b9c69d2ff7 Mon Sep 17 00:00:00 2001
From: wenxianping <931128603@qq.com>
Date: Sat, 20 Jan 2018 23:27:24 +0800
Subject: [PATCH] margen
---
.idea/codeStyleSettings.xml | 3 +
.idea/markdown-navigator.xml | 72 +++++++
.../markdown-navigator/profiles_settings.xml | 3 +
.idea/workspace.xml | 203 ++++--------------
config/ticketConf.py | 2 +
5 files changed, 118 insertions(+), 165 deletions(-)
create mode 100644 .idea/markdown-navigator.xml
create mode 100644 .idea/markdown-navigator/profiles_settings.xml
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index b4475db..ffd7416 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -4,6 +4,9 @@
diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml
new file mode 100644
index 0000000..dbe0e46
--- /dev/null
+++ b/.idea/markdown-navigator.xml
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/markdown-navigator/profiles_settings.xml b/.idea/markdown-navigator/profiles_settings.xml
new file mode 100644
index 0000000..57927c5
--- /dev/null
+++ b/.idea/markdown-navigator/profiles_settings.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 17ad243..a68e79d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,10 @@
-
-
+
+
+
+
@@ -40,8 +42,8 @@
-
-
+
+
@@ -52,7 +54,7 @@
-
+
@@ -75,7 +77,7 @@
-
+
@@ -83,10 +85,10 @@
-
+
-
+
@@ -95,10 +97,10 @@
-
+
-
+
@@ -248,8 +250,6 @@
-
-
@@ -281,6 +281,8 @@
+
+
@@ -304,119 +306,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $PROJECT_DIR$/README.md
- $PROJECT_DIR$/damatuCode/damatuWeb.py
- $PROJECT_DIR$/init/select_ticket_info.py
- $PROJECT_DIR$/tkcode
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -955,39 +844,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -1129,7 +1005,6 @@
-
@@ -1166,7 +1041,6 @@
-
@@ -1190,7 +1064,6 @@
-
@@ -1213,7 +1086,7 @@
-
+
@@ -1222,8 +1095,8 @@
-
-
+
+
@@ -1232,7 +1105,7 @@
-
+
@@ -1248,9 +1121,17 @@
+
+
+
+
+
+
+
+
-
+
@@ -1258,13 +1139,5 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/config/ticketConf.py b/config/ticketConf.py
index 401eae7..96cf5e6 100644
--- a/config/ticketConf.py
+++ b/config/ticketConf.py
@@ -3,6 +3,8 @@ __author__ = 'MR.wen'
import os
import yaml
+import PyQt5
+
def _get_yaml():