v2.4.0

cxh1205 · Apr 3, 2022 · 9e87e4e · 9e87e4e
1 parent 7ab5f19
commit 9e87e4e
Show file tree

Hide file tree

Showing 11 changed files with 470 additions and 139 deletions.
diff --git a/format.py b/format.py
@@ -12,7 +12,7 @@
 HOST_PAGE = "http://localhost:40115"
 HOST = "127.0.0.1"
 PORT = 40115
-VERSION = "v2.3.2"
+VERSION = "v2.4.0"
 
 
 class Excel_List:

diff --git a/static/analysis.html b/static/analysis.html
@@ -8,6 +8,10 @@
     <META HTTP-EQUIV="pragma" CONTENT="no-cache">
     <script src="vue.global.prod.js"></script>
     <script src="axios.min.js"></script>
+    <script src="noty.min.js"></script>
+    <script src="index.js"></script>
+    <link rel="stylesheet" href="noty.css">
+    <link rel="stylesheet" href="mint.css">
     <link rel="stylesheet" href="style.css">
     <link rel="shortcut icon" href="favicon.ico">
     <title>数据分析</title>
@@ -69,15 +73,15 @@
                         <th>多交</th>
                     </tr>
                     <tr v-for="i in remain">
-                        <td @click="mes=i;copy()" class="raw">{{remain[i]}}</td>
+                        <td @click="mes=i;copy()" class="raw">{{i}}</td>
                     </tr>
                 </table>
             </td>
         </tr>
 
         <tr>
             <td>
-                <div @click="submit" class="button">改名</div>
+                <div @click="submit" class="button submit">改名</div>
                 <div @click="back" class="button">返回</div>
             </td>
         </tr>
@@ -135,8 +139,12 @@
                 },
                 submit() {
                     axios.post('Rename').then((res) => {
-                        console.log(res.data)
-                        alert(res.data['msg'])
+                        if (res.data['code'] == 0) {
+                            notify(res.data['msg'], 'success')
+                        }
+                        else{
+                            notify(res.data['msg'], 'error')
+                        }
                     })
                 },
                 back() {

diff --git a/static/excel.html b/static/excel.html
@@ -8,6 +8,10 @@
     <META HTTP-EQUIV="pragma" CONTENT="no-cache">
     <script src="vue.global.prod.js"></script>
     <script src="axios.min.js"></script>
+    <script src="noty.min.js"></script>
+    <script src="index.js"></script>
+    <link rel="stylesheet" href="noty.css">
+    <link rel="stylesheet" href="mint.css">
     <link rel="stylesheet" href="style.css">
     <link rel="shortcut icon" href="favicon.ico">
     <title>填写excel路径</title>
@@ -29,7 +33,7 @@
         </tr>
         <tr>
             <td>
-                <div @click="submit" class="button">提交</div>
+                <div @click="submit" class="button submit">提交</div>
             </td>
         </tr>
     </table>
@@ -46,10 +50,13 @@
                             "path": this.message.replace(/\\/g, "/")
                         })
                         .then((res) => {
-                            console.log(res.data)
-                            alert(res.data['msg'])
                             if (res.data['code'] == 0) {
-                                window.location.href = window.location.origin + "/GetKeyWord";
+                                notify(res.data['msg'], 'success')
+                                setTimeout(() => {
+                                    window.location.href = window.location.origin + "/GetKeyWord";
+                                }, 1000)
+                            } else {
+                                notify(res.data['msg'], 'error')
                             }
                         })
 

diff --git a/static/index.html b/static/index.html
@@ -8,6 +8,10 @@
     <META HTTP-EQUIV="pragma" CONTENT="no-cache">
     <script src="vue.global.prod.js"></script>
     <script src="axios.min.js"></script>
+    <script src="noty.min.js"></script>
+    <script src="index.js"></script>
+    <link rel="stylesheet" href="noty.css">
+    <link rel="stylesheet" href="mint.css">
     <link rel="stylesheet" href="style.css">
     <link rel="shortcut icon" href="favicon.ico">
     <title>选取命名格式</title>
@@ -194,7 +198,7 @@
         </tr>
         <tr>
             <td>
-                <div @click="submit" class="button">提交</div>
+                <div @click="submit" class="button submit">提交</div>
             </td>
         </tr>
 
@@ -207,7 +211,7 @@
                     keys: [],
                     examples: [],
                     sep: '',
-                    picked: [0, '-', 0],
+                    picked: [0, '', 0],
                     path: "",
                     same: true,
                 }
@@ -236,10 +240,14 @@
                         "execute": this.picked
                     }).then((res) => {
                         console.log(res.data)
-                        alert(res.data['msg'])
 
                         if (res.data['code'] == 0) {
-                            window.location.href = window.location.origin + "/Analysis"
+                            notify(res.data['msg'], 'success')
+                            setTimeout(() => {
+                                window.location.href = window.location.origin + "/Analysis"
+                            }, 1000)
+                        } else {
+                            notify(res.data['msg'], 'error')
                         }
 
                     })
@@ -249,7 +257,7 @@
                 },
                 increse() {
                     if (this.picked.length > 12) {
-                        alert('哥，不至于！')
+                        notify('哥，不至于！', 'warning')
                     } else {
                         this.picked.push(this.sep, 0)
                     }

diff --git a/static/index.js b/static/index.js
@@ -0,0 +1,17 @@
+function notify(text, type) {
+    new Noty({
+        text: text,
+        theme: 'mint',
+        type: type,
+        timeout: type=='success'?1000:5000,
+        progressBar: true,
+        closeWith: ['click'],
+    }).show();
+}
+
+document.onkeydown = function(e){
+
+    if(e.key == 'Enter'){
+        document.querySelector('.button.submit').click();
+    }
+}