Merge branch 'master' of http://192.168.136.45:3000/SERVER/langer

controller/LangArea.py

@@ -170,6 +170,10 @@ class LangAreaView(TemplateView):
                 lk = lk.replace('%', '_')
                 lk = lk.replace(';', '_')
                 lk = lk.replace('‘', '_')
+                T = res[l]
+                T.replace('"', '\"')
+                res[l] = T
+                print(res[l])
                 # 正则表达式
                 # re.sub("[a-z]+", "$", "123abc78ab9cdeg00t8")
                 content_val = res[l].replace("'","\\'")

controller/LangWord.py

@@ -169,10 +169,11 @@ class LangWordView(TemplateView):
                     lk_qs = lk_qs.filter(langvalmodel__word_val__contains=searchVal, langvalmodel__la__lang=searchKey)
             count = lk_qs.count()
             # lk_qs = lk_qs[(page - 1) * line:page * line].values_list('word_key', flat=True)
-            # if orderByupdate == 1:
-            #     lk_qs = lk_qs.order_by('updTime')
-            # else:
-            #     lk_qs = lk_qs.order_by('-updTime')
+            # 时间排序
+            if orderByupdate == 1:
+                lk_qs = lk_qs.order_by('updTime')
+            else:
+                lk_qs = lk_qs.order_by('-updTime')
             lk_qs = lk_qs[(page - 1) * line:page * line].values('word_key', 'updTime')
             k_list = []
             lw_dict = {}