Merge branch 'xq_rymp' of http://47.92.108.28/changchao/founder_vue into xq_rymp

package-lock.json

@@ -2150,6 +2150,15 @@
       "integrity": "sha1-vxEWycdYxRt6kz0pa3LCIe2UKLY=",
       "dev": true
     },
+    "adler-32": {
+      "version": "1.2.0",
+      "resolved": "https://registry.nlark.com/adler-32/download/adler-32-1.2.0.tgz",
+      "integrity": "sha1-aj5r8KY5ALoVZSgIyxXGgT0aXyU=",
+      "requires": {
+        "exit-on-epipe": "~1.0.1",
+        "printj": "~1.1.0"
+      }
+    },
     "aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.1.0.tgz?cache=0&sync_timestamp=1598049934879&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faggregate-error%2Fdownload%2Faggregate-error-3.1.0.tgz",
@@ -2918,8 +2927,7 @@
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npm.taobao.org/buffer-from/download/buffer-from-1.1.1.tgz",
-      "integrity": "sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=",
-      "dev": true
+      "integrity": "sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8="
     },
     "buffer-indexof": {
       "version": "1.1.1",
@@ -3203,6 +3211,16 @@
       "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
       "dev": true
     },
+    "cfb": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npm.taobao.org/cfb/download/cfb-1.2.0.tgz",
+      "integrity": "sha1-ak0IcrUl7WA0nh71H7Swv3Psqag=",
+      "requires": {
+        "adler-32": "~1.2.0",
+        "crc-32": "~1.2.0",
+        "printj": "~1.1.2"
+      }
+    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1591687028262&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz",
@@ -3574,6 +3592,11 @@
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
       "dev": true
     },
+    "codepage": {
+      "version": "1.15.0",
+      "resolved": "https://registry.nlark.com/codepage/download/codepage-1.15.0.tgz",
+      "integrity": "sha1-LgBRkCSzlCTsZu6z7AcifmkmGKs="
+    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/collection-visit/download/collection-visit-1.0.0.tgz",
@@ -3631,6 +3654,11 @@
       "integrity": "sha1-TQuSEyXBT6+SYzCGpTbbbolWSxs=",
       "dev": true
     },
+    "colors": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npm.taobao.org/colors/download/colors-0.6.2.tgz",
+      "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w="
+    },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.8.tgz",
@@ -3934,6 +3962,15 @@
         }
       }
     },
+    "crc-32": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npm.taobao.org/crc-32/download/crc-32-1.2.0.tgz",
+      "integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=",
+      "requires": {
+        "exit-on-epipe": "~1.0.1",
+        "printj": "~1.1.0"
+      }
+    },
     "create-ecdh": {
       "version": "4.0.4",
       "resolved": "https://registry.npm.taobao.org/create-ecdh/download/create-ecdh-4.0.4.tgz?cache=0&sync_timestamp=1596557441827&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcreate-ecdh%2Fdownload%2Fcreate-ecdh-4.0.4.tgz",
@@ -5195,6 +5232,11 @@
         "strip-eof": "^1.0.0"
       }
     },
+    "exit-on-epipe": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
+      "integrity": "sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI="
+    },
     "expand-brackets": {
       "version": "2.1.4",
       "resolved": "https://registry.npm.taobao.org/expand-brackets/download/expand-brackets-2.1.4.tgz",
@@ -5427,6 +5469,11 @@
         "websocket-driver": ">=0.5.1"
       }
     },
+    "fflate": {
+      "version": "0.3.11",
+      "resolved": "https://registry.nlark.com/fflate/download/fflate-0.3.11.tgz",
+      "integrity": "sha1-LEQNcYD964GeZImNiFivMnsEKl0="
+    },
     "figgy-pudding": {
       "version": "3.5.2",
       "resolved": "https://registry.npm.taobao.org/figgy-pudding/download/figgy-pudding-3.5.2.tgz",
@@ -5461,6 +5508,11 @@
         "schema-utils": "^2.5.0"
       }
     },
+    "file-saver": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npm.taobao.org/file-saver/download/file-saver-2.0.5.tgz?cache=0&sync_timestamp=1605790845476&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffile-saver%2Fdownload%2Ffile-saver-2.0.5.tgz",
+      "integrity": "sha1-1hz+LOBZ9BTYmendbUEH7iVnDDg="
+    },
     "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/file-uri-to-path/download/file-uri-to-path-1.0.0.tgz",
@@ -5617,6 +5669,11 @@
       "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
       "dev": true
     },
+    "frac": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npm.taobao.org/frac/download/frac-1.1.2.tgz",
+      "integrity": "sha1-PXT39keMiKG1AgMG10fcYxPHTQs="
+    },
     "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npm.taobao.org/fragment-cache/download/fragment-cache-0.2.1.tgz",
@@ -6992,6 +7049,21 @@
         "verror": "1.10.0"
       }
     },
+    "jszip": {
+      "version": "2.4.0",
+      "resolved": "https://registry.nlark.com/jszip/download/jszip-2.4.0.tgz",
+      "integrity": "sha1-SHqTt2w7/6bLCFzWHrk06r4tKU8=",
+      "requires": {
+        "pako": "~0.2.5"
+      },
+      "dependencies": {
+        "pako": {
+          "version": "0.2.9",
+          "resolved": "https://registry.nlark.com/pako/download/pako-0.2.9.tgz?cache=0&sync_timestamp=1627560213493&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpako%2Fdownload%2Fpako-0.2.9.tgz",
+          "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU="
+        }
+      }
+    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/killable/download/killable-1.0.1.tgz",
@@ -9296,6 +9368,11 @@
         "utila": "~0.4"
       }
     },
+    "printj": {
+      "version": "1.1.2",
+      "resolved": "https://registry.nlark.com/printj/download/printj-1.1.2.tgz",
+      "integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI="
+    },
     "process": {
       "version": "0.11.10",
       "resolved": "https://registry.npm.taobao.org/process/download/process-0.11.10.tgz",
@@ -10696,6 +10773,14 @@
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
+    "ssf": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.11.2.tgz",
+      "integrity": "sha1-C5lpiyN1SNCI/EPN8rcMGnUSwGw=",
+      "requires": {
+        "frac": "~1.1.2"
+      }
+    },
     "sshpk": {
       "version": "1.16.1",
       "resolved": "https://registry.npm.taobao.org/sshpk/download/sshpk-1.16.1.tgz",
@@ -11656,8 +11741,7 @@
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npm.taobao.org/typedarray/download/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
     "uglify-js": {
       "version": "3.4.10",
@@ -12001,6 +12085,11 @@
       "integrity": "sha1-eGQcSIuObKkadfUR56OzKobl3aA=",
       "dev": true
     },
+    "voc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npm.taobao.org/voc/download/voc-1.2.0.tgz",
+      "integrity": "sha1-xFkCRTHXEGfAniwMK9psKxOvMtg="
+    },
     "vue": {
       "version": "2.6.12",
       "resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz?cache=0&sync_timestamp=1600441210971&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.12.tgz",
@@ -12606,6 +12695,16 @@
         }
       }
     },
+    "wmf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/wmf/download/wmf-1.0.2.tgz",
+      "integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto="
+    },
+    "word": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npm.taobao.org/word/download/word-0.3.0.tgz",
+      "integrity": "sha1-hUIVfk+OhJ9KNjooiZLUdhLbmWE="
+    },
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npm.taobao.org/word-wrap/download/word-wrap-1.2.3.tgz",
@@ -12692,6 +12791,126 @@
         "async-limiter": "~1.0.0"
       }
     },
+    "xlsx": {
+      "version": "0.17.1",
+      "resolved": "https://registry.nlark.com/xlsx/download/xlsx-0.17.1.tgz",
+      "integrity": "sha1-JVdADVlJmDAYMe9gsI3d6A8oQu4=",
+      "requires": {
+        "adler-32": "~1.2.0",
+        "cfb": "^1.1.4",
+        "codepage": "~1.15.0",
+        "commander": "~2.17.1",
+        "crc-32": "~1.2.0",
+        "exit-on-epipe": "~1.0.1",
+        "fflate": "^0.3.8",
+        "ssf": "~0.11.2",
+        "wmf": "~1.0.1",
+        "word": "~0.3.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.17.1",
+          "resolved": "https://registry.nlark.com/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1627359190297&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz",
+          "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
+        }
+      }
+    },
+    "xlsx-style": {
+      "version": "0.8.13",
+      "resolved": "https://registry.npm.taobao.org/xlsx-style/download/xlsx-style-0.8.13.tgz",
+      "integrity": "sha1-7SONa4wFYvlEfCkGq73tLTOeBIY=",
+      "requires": {
+        "adler-32": "^1.3.0",
+        "cfb": ">=0.10.0",
+        "codepage": "~1.3.6",
+        "commander": "^8.1.0",
+        "crc-32": "^1.2.0",
+        "jszip": "2.4.0",
+        "ssf": "~0.8.1"
+      },
+      "dependencies": {
+        "adler-32": {
+          "version": "1.3.0",
+          "resolved": "https://registry.nlark.com/adler-32/download/adler-32-1.3.0.tgz",
+          "integrity": "sha1-PK0bcc36afbIqR8+NhXTGk/e3HI=",
+          "requires": {
+            "printj": "~1.2.2"
+          }
+        },
+        "codepage": {
+          "version": "1.3.8",
+          "resolved": "https://registry.nlark.com/codepage/download/codepage-1.3.8.tgz",
+          "integrity": "sha1-Ty5dfAl13ij4hJgFjcta/KtqX3E=",
+          "requires": {
+            "commander": "^8.1.0",
+            "concat-stream": "^2.0.0",
+            "voc": "^1.2.0"
+          }
+        },
+        "commander": {
+          "version": "8.1.0",
+          "resolved": "https://registry.nlark.com/commander/download/commander-8.1.0.tgz?cache=0&sync_timestamp=1627359190297&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcommander%2Fdownload%2Fcommander-8.1.0.tgz",
+          "integrity": "sha1-2zbj5m7fJP9ZHWOYYsarLFJmQ2I="
+        },
+        "concat-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npm.taobao.org/concat-stream/download/concat-stream-2.0.0.tgz",
+          "integrity": "sha1-QUz1r3kKSMYKub5FJ9VtXkETPLE=",
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "inherits": "^2.0.3",
+            "readable-stream": "^3.0.2",
+            "typedarray": "^0.0.6"
+          }
+        },
+        "crc-32": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npm.taobao.org/crc-32/download/crc-32-1.2.0.tgz",
+          "integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=",
+          "requires": {
+            "exit-on-epipe": "~1.0.1",
+            "printj": "~1.1.0"
+          },
+          "dependencies": {
+            "printj": {
+              "version": "1.1.2",
+              "resolved": "https://registry.nlark.com/printj/download/printj-1.1.2.tgz",
+              "integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI="
+            }
+          }
+        },
+        "frac": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npm.taobao.org/frac/download/frac-0.3.1.tgz",
+          "integrity": "sha1-V3Z3t/3L5vr3xGHxgB00E3zaQ1Q="
+        },
+        "printj": {
+          "version": "1.2.3",
+          "resolved": "https://registry.nlark.com/printj/download/printj-1.2.3.tgz",
+          "integrity": "sha1-LPsrGSoeU4XbvltGZYrDSqgoUIo="
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.6.0.tgz",
+          "integrity": "sha1-M3u9o63AcGvT4CRCaihtS0sskZg=",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "ssf": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.8.2.tgz",
+          "integrity": "sha1-udTcahwbz3b4q/qW19dlb7Kr7NY=",
+          "requires": {
+            "colors": "0.6.2",
+            "frac": "0.3.1",
+            "voc": "^1.2.0"
+          }
+        }
+      }
+    },
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz",
@@ -12848,7 +13067,7 @@
     },
     "zrender": {
       "version": "4.3.2",
-      "resolved": "https://registry.nlark.com/zrender/download/zrender-4.3.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fzrender%2Fdownload%2Fzrender-4.3.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.2.tgz",
       "integrity": "sha1-7HQy+UFcgsc1hLa3uMR+GwFiCcY="
     }
   }

package.json

@@ -12,6 +12,7 @@
     "driver.js": "^0.9.8",
     "echarts": "^4.9.0",
     "element-ui": "^2.4.5",
+    "file-saver": "^2.0.5",
     "js-cookie": "^2.2.1",
     "qs": "^6.9.4",
     "sass-resources-loader": "^2.1.1",
@@ -20,7 +21,9 @@
     "vue-router": "^3.2.0",
     "vue-wechat-title": "^2.0.7",
     "vuex": "^3.4.0",
-    "vuex-persistedstate": "^4.0.0-beta.1"
+    "vuex-persistedstate": "^4.0.0-beta.1",
+    "xlsx": "^0.17.1",
+    "xlsx-style": "^0.8.13"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^4.5.0",

src/assets/img/mpzs.svg

 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
-    <title>编组 12</title>
+    <title>摸排总数</title>
     <desc>Created with Sketch.</desc>
     <defs>
         <linearGradient x1="0%" y1="23.1970835%" x2="50%" y2="100%" id="linearGradient-1">

src/assets/img/thzs.svg

 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
-    <title>编组 17</title>
+    <title>退回总数</title>
     <desc>Created with Sketch.</desc>
     <defs>
         <linearGradient x1="0%" y1="12.5009432%" x2="50%" y2="100%" id="linearGradient-1">

src/assets/img/wcl.svg

 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
-    <title>编组 18</title>
+    <title>完成率</title>
     <desc>Created with Sketch.</desc>
     <defs>
         <linearGradient x1="0%" y1="7.85313098%" x2="50%" y2="100%" id="linearGradient-1">

src/assets/img/wfks.svg

 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
-    <title>编组 16</title>
+    <title>未反馈数</title>
     <desc>Created with Sketch.</desc>
     <defs>
         <linearGradient x1="0%" y1="11.1245778%" x2="50%" y2="100%" id="linearGradient-1">

src/assets/img/wpps.svg

 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
-    <title>编组 14</title>
+    <title>未匹配数</title>
     <desc>Created with Sketch.</desc>
     <defs>
         <linearGradient x1="0%" y1="8.38135342%" x2="50%" y2="100%" id="linearGradient-1">

src/assets/img/yfks.svg

 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
-    <title>编组 15</title>
+    <title>已反馈数</title>
     <desc>Created with Sketch.</desc>
     <defs>
         <linearGradient x1="0%" y1="11.1245778%" x2="50%" y2="100%" id="linearGradient-1">

src/assets/img/ypps.svg

 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
-    <title>编组 13</title>
+    <title>已匹配数</title>
     <desc>Created with Sketch.</desc>
     <defs>
         <linearGradient x1="0%" y1="8.38135342%" x2="50%" y2="100%" id="linearGradient-1">

src/router/modules/index.js

 /*
  * @Author: your name
  * @Date: 2021-08-27 14:14:36
- * @LastEditTime: 2021-09-02 17:19:28
+ * @LastEditTime: 2021-09-02 18:17:16
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\router\modules\index.js
@@ -23,6 +23,7 @@ export default [
   {
     path: "/Home",
     name: "Home",
+    redirect: '/Home/rwgl',
     meta: {
       title: "工作桌面",
       auth: "5"
@@ -82,11 +83,21 @@ export default [
             component: () => import("@/views/rwgl/rympfk.vue"),
           },
           {
+            path: "rythfk",
+            name: "rythfk",
+            hidden: true,
+            meta: {
+              title: "人员退回反馈",
+              auth: "5"
+            },
+            component: () => import("@/views/rwgl/rythfk.vue"),
+          },
+          {
             path: "sdxfrw",
             name: "sdxfrw",
             hidden: false,
             meta: {
-              title: "手动下发任务",
+              title: "任务下发",
               auth: "5"
             },
             component: () => import("@/views/rwgl/sdxfrw.vue"),
@@ -94,9 +105,9 @@ export default [
           {
             path: "mptj",
             name: "mptj",
-            hidden: false,
+            hidden: true,
             meta: {
-              title: "摸排统计",
+              title: "人员摸排列表",
               auth: "5"
             },
             component: () => import("@/views/rwgl/mptj.vue"),

src/views/rwgl/rwthcl.vue

 <!--
  * @Author: your name
  * @Date: 2021-08-28 19:36:38
- * @LastEditTime: 2021-09-01 20:44:10
+ * @LastEditTime: 2021-09-02 15:49:52
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\rwgl\rwthcl.vue
@@ -27,21 +27,10 @@
         </span>
       </el-dialog>
     </div>
-    <div class="fkDialog">
-      <el-dialog title="反馈" :visible.sync="fkdialogVisible" width="30%">
-        反馈：<el-input type="textarea" :rows="2" placeholder="请输入反馈信息" v-model="fk">
-        </el-input>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="fkdialogVisible = false">取 消</el-button>
-          <el-button type="primary" @click="fkBtn">确 定</el-button>
-        </span>
-      </el-dialog>
-    </div>
     <div class="thDialog">
       <el-dialog title="退回" :visible.sync="thdialogVisible" width="30%">
-        <div>
-          是否要退回原地址天津市西湖区
-        </div>
+        请输入真实地址：<el-input placeholder="请输入" v-model="thdz">
+        </el-input>
         <span slot="footer" class="dialog-footer">
           <el-button @click="thdialogVisible = false">取 消</el-button>
           <el-button type="primary" @click="thBtn">确 定</el-button>
@@ -59,9 +48,8 @@ export default {
   },
   data () {
     return {
+      thdz: '',
       thdialogVisible: false,
-      fkdialogVisible: false,
-      fk: '',
       xqID: '',
       xqZSDZ: '',
       xqBZ: '',
@@ -122,10 +110,6 @@ export default {
         })
         .catch(_ => { });
     },
-    fkBtn () {
-      this.fkdialogVisible = false
-      this.$message.success('反馈已发送！')
-    },
     resetForm (formName) {
       this.$refs[formName].resetFields();
       console.log("重置按钮");
@@ -144,9 +128,13 @@ export default {
         this.xqBZ = msg[0].BZ
         this.xqdialogVisible = true
       } else if (msg[1] == 'fk') {
-        this.fk = ''
-        this.fkdialogVisible = true
+        // 反馈跳转
+        this.$router.push({
+          name: 'rythfk',
+          params: { info: msg[0] }
+        })
       } else if(msg[1] == 'th') {
+        this.thdz = ''
         this.thdialogVisible = true
       }
       console.log("父组件", msg[0], msg[1]);

src/views/rwgl/rythfk.vue

+<!--
+ * @Author: your name
+ * @Date: 2021-09-01 09:45:29
+ * @LastEditTime: 2021-09-02 17:38:56
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \founder_vue\src\views\rwgl\rympfk.vue
+-->
+<template>
+  <div>
+    <div class="dinfo">
+      <div class="info">人员退回详情</div>
+    </div>
+    <div class="settable">
+      <el-table id="ajzbQuery" v-loading="tableLoading" element-loading-text="拼命加载中" :key="key" ref="itsmDataTable" :data="tableData" tooltip-effect="dark" max-height="600" width="100%" size="small">
+        <el-table-column v-for="columnTitle in cxDefaultFormThead" :prop="columnTitle.prop" :key="columnTitle.label" :label="columnTitle.label" :width="columnTitle.width">
+        </el-table-column>
+        <el-table-column label="操作" width="auto" v-if="btnShow">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" v-if="btnShow == 'rymplb'" @click="handleClick(scope.row, 'xq')">详情</el-button>
+            <el-button type="text" size="small" v-if="btnShow == 'rymplb'" @click="handleClick(scope.row, 'fk')">反馈</el-button>
+            <el-button type="text" size="small" v-if="btnShow == 'rymplb'" @click="handleClick(scope.row, 'th')">退回</el-button>
+
+            <div class="clearimg" v-if="btnShow == 'rwgl'" @click="handleImg(scope.row)">
+              <img :src="clraeImg" alt="" />
+            </div>
+          </template>
+          <!-- <template slot-scope="scope">
+        </template> -->
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="dinfo ryfk">
+      <div class="info">人员退回反馈</div>
+    </div>
+    <div class="rympform">
+      <el-form ref="form" :model="sizeForm" label-width="80px" :inline="true" label-position="top" size="mini" class="ryform">
+        <div>
+          <el-form-item label="人员来源:" class="col">
+            <el-select v-model="sizeForm.region" placeholder="请选择人员来源">
+              <el-option v-for="(item1, index) in perList" :label="item1.label" :value="item1.value" :key="index"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="核酸检测结果:" class="col">
+            <el-input v-model="sizeForm.name" placeholder="请输入核算检测结果"></el-input>
+          </el-form-item>
+          <el-form-item label="管理方式:" class="col">
+            <el-select v-model="sizeForm.glff" placeholder="请选择管理方式">
+              <el-option v-for="(item1, index) in glList" :label="item1.label" :value="item1.value" :key="index"></el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="twoform">
+          <el-form-item label="大数据协查人员类别:" class="col">
+            <el-select v-model="sizeForm.dsj" placeholder="请选择管理方式">
+              <el-option v-for="(item1, index) in dsjList" :label="item1.label" :value="item1.value" :key="index"></el-option>
+            </el-select>
+          </el-form-item>
+          <div class="data">
+            <el-form-item label="活动时间" class="col">
+              <el-date-picker type="datetime" placeholder="选择日期" v-model="sizeForm.date1" style="width: 100%" ref="data" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+            </el-form-item>
+          </div>
+          <div class="textarea">
+            <el-form-item label="备注" prop="desc">
+              <el-input type="textarea" v-model="sizeForm.textarea" placeholder="请填写备注"></el-input>
+            </el-form-item>
+          </div>
+        </div>
+      </el-form>
+    </div>
+    <div class="btn">
+      <el-button size="mini" @click="handClick('clear')">取消</el-button>
+      <el-button size="mini" type="primary" @click="handClick('ok')">提交</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      sizeForm: {
+        name: "",
+        region: "",
+        date1: "",
+        date2: "",
+        delivery: false,
+        type: [],
+        resource: "",
+        desc: "",
+        glff: "",
+        dsj: "",
+        textarea: "",
+      },
+      tableLoading: false, //loading
+      key: "1",
+      cxDefaultFormThead: [
+        {
+          label: "ID",
+          prop: "ID",
+          width: "auto",
+        },
+        {
+          label: "真实地址",
+          prop: "ZSDZ",
+          width: "auto",
+        },
+        {
+          label: "备注",
+          prop: "BZ",
+          width: "auto",
+        },
+      ],
+      info: {},
+      tableData: [
+        
+      ],
+      form: {
+        name: "",
+        userId: "",
+      },
+      btnShow: "",
+      isShowpagin: "rympfk",
+      perList: [
+        { label: "北京", value: "1" },
+        { label: "哈尔滨", value: "2" },
+      ],
+      glList: [
+        { label: "法律方法", value: "1" },
+        { label: "教育方法", value: "2" },
+      ],
+      dsjList: [
+        { label: "学生", value: "1" },
+        { label: "打工人", value: "2" },
+      ],
+    };
+  },
+  methods: {
+    handClick (type) {
+      console.log(this.sizeForm);
+    },
+    /**
+     * @description: 取消
+     * @param {*}
+     * @return {*}
+     */
+    handCancel () {
+      console.log("取消");
+    },
+    /**
+     * @description: 提交
+     * @param {*}
+     * @return {*}
+     */
+    handSubmit () {
+      console.log("提交");
+    },
+  },
+  mounted () {
+    console.log(this.$route.params);
+    if(this.$route.params.info) {
+      localStorage.setItem('info', JSON.stringify(this.$route.params.info))
+    }
+    console.log(localStorage);
+    this.tableData[0] = JSON.parse(localStorage.getItem('info'))
+    //  document.getElementsByClassName('el-input__icon')[0].className += ' el-icon-date'; //在原来的后面加这个
+  },
+  updated () {
+    if (this.$refs.data.value) {
+      var data = document.getElementsByClassName("el-input__inner")[4].value;
+      if (data) {
+      } else {
+        console.log("001");
+        document.getElementsByClassName("el-input__icon")[4].className =
+          "el-icon-time";
+      }
+    }
+    //    console.log(this.$refs.data.value);
+  },
+};
+</script>
+<style lang="scss" scoped>
+.settable {
+  position: absolute;
+  width: 98%;
+  padding: 0 24px 0 24px;
+}
+.rympform /deep/ {
+  padding-left: 25px;
+  padding-top: 6px;
+  padding-right: 23px;
+  position: relative;
+  .ryform {
+    border-bottom: 1px solid #eeeeee;
+  }
+  top: 77px;
+  .el-input__inner {
+    width: 280px;
+    height: 32px;
+  }
+  .textarea {
+    .el-textarea__inner {
+      width: 677px;
+      height: 64px;
+    }
+  }
+}
+.twoform /deep/ {
+  .el-input__prefix {
+    display: none;
+  }
+  .el-input--prefix .el-input__inner {
+    padding-left: 15px;
+  }
+  .data {
+    display: inline-block;
+    .el-input__icon::after {
+      position: absolute;
+      right: 20px;
+      content: "";
+      height: 100%;
+      width: 0;
+      display: inline-block;
+      vertical-align: middle;
+      background: olivedrab;
+    }
+    .el-input__icon::after:hover {
+      display: none;
+    }
+    .el-input__prefix,
+    .el-input__suffix {
+      position: absolute;
+      top: 2px;
+      //    right: 2px;
+    }
+    .el-icon-time {
+      width: 25px;
+    }
+  }
+}
+.col {
+  margin-right: 7.472%;
+}
+.ryfk {
+  position: relative;
+  top: 77px;
+}
+
+.dinfo {
+  height: 62px;
+  //  background: chocolate;
+  padding: 23px 25px 15px 24px;
+  box-sizing: border-box;
+  margin-bottom: 16px;
+  .info {
+    border-bottom: 1px solid #999999;
+    width: 100%;
+    // height: 24px;
+
+    font-size: 16px;
+    font-family: MicrosoftYaHei-Bold, MicrosoftYaHei;
+    font-weight: bold;
+    color: #333333;
+    line-height: 24px;
+    padding-bottom: 15px;
+  }
+}
+.btn {
+margin-top: 20px;
+  padding-right: 24px;
+  position: relative;
+  top: 77px;
+  display: flex;
+  justify-content: flex-end;
+  .el-button+.el-button{
+      margin-left: 24px;
+  }
+  .el-button{
+     width: 72px;
+  }
+  .el-button--mini, .el-button--mini.is-round {
+    padding: 9px 15px;
+}
+}
+</style>

src/views/tjbb/bb.vue

 <!--
  * @Author: your name
  * @Date: 2021-08-31 15:25:02
- * @LastEditTime: 2021-09-01 19:23:26
+ * @LastEditTime: 2021-09-03 17:17:27
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\tjbb\bb.vue
@@ -19,12 +19,12 @@
           <el-radio :label="3">当季</el-radio>
         </el-radio-group>
       </div>
-      <div class="export">导出</div>
+      <div class="export" @click="exportExcel('XXX重点地区来津人员排查统计表')">导出</div>
     </div>
     <div class="content">
       <div class="title">XXX重点地区来津人员排查统计表</div>
       <div class="table">
-        <el-table :data="tableData" max-height="400" style="width: 100%" :span-method="arraySpanMethod" :cell-class-name="addClass" :header-cell-style="headClass">
+        <el-table ref="report-table" id="tableData" :data="tableData" max-height="400" style="width: 100%" :span-method="arraySpanMethod" :cell-class-name="addClass" :header-cell-style="headClass">
           <el-table-column prop="date" label="街镇" width="150" align="center">
           </el-table-column>
           <el-table-column label="人员" align="center">
@@ -73,6 +73,8 @@
 </template>
 
 <script>
+import FileSaver from 'file-saver';
+import XLSX from 'xlsx';
 export default {
   data () {
     return {
@@ -201,7 +203,7 @@ export default {
     document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.right = '5px';
   },
   updated () {
-		if(document.querySelector('.el-range-input').value != '') {
+    if (document.querySelector('.el-range-input').value != '') {
       document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.display = 'none'
     } else {
       document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.display = 'block'
@@ -209,6 +211,32 @@ export default {
   },
   methods: {
     /**
+     * @description: 导出excel表格
+     * @param {*}
+     * @return {*}
+     */    
+    exportExcel (excelName) {
+      //excelName --设置导出的excel名称
+      //report-table --对应的要导出的el-table的ref名称
+      try {
+        const $e = this.$refs['report-table'].$el;
+        // 如果表格加了fixed属性，则导出的文件会生产两份一样的数据，所以可在这里判断一下
+        let $table = $e.querySelector('.el-table__fixed');
+        if (!$table) {
+          $table = $e;
+        }
+        // 为了返回单元格原始字符串，设置{ raw: true }
+        const wb = XLSX.utils.table_to_book($table, { raw: true });
+        const wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' });
+        FileSaver.saveAs(
+          new Blob([wbout], { type: 'application/octet-stream' }),
+          `${excelName}.xlsx`,
+        );
+      } catch (e) {
+        if (typeof console !== 'undefined') console.error(e);
+      }
+    },
+    /**
      * @description: 找到表头设置样式
      * @param {*} row
      * @param {*} column

src/views/tjbb/bb2.vue

 <!--
  * @Author: your name
  * @Date: 2021-08-31 15:25:02
- * @LastEditTime: 2021-09-01 19:39:23
+ * @LastEditTime: 2021-09-03 16:56:43
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\tjbb\bb.vue
@@ -19,15 +19,15 @@
           <el-radio :label="3">当季</el-radio>
         </el-radio-group>
       </div>
-      <div class="export">导出</div>
+      <div class="export" @click="exportExcel('杨柳青镇街镇江苏重点区域驻留和时空伴随统计表')">导出</div>
     </div>
     <div class="content">
       <div class="title">杨柳青镇街镇江苏重点区域驻留和时空伴随统计表</div>
       <div class="table">
-        <el-table :data="tableData" max-height="400"  style="width: 100%" :span-method="arraySpanMethod" :cell-class-name="addClass" :header-cell-style="headClass">
-          <el-table-column prop="pc" label="批次" width="150" align="center" fixed>
+        <el-table id="tableData2" ref="report-table" :data="tableData" max-height="400" style="width: 100%" :span-method="arraySpanMethod" :cell-class-name="addClass" :header-cell-style="headClass">
+          <el-table-column prop="pc" label="批次" width="150" align="center">
           </el-table-column>
-          <el-table-column label="推送数" prop="tss" align="center">
+          <el-table-column label="推送数" prop="tss" align="center" fixed>
           </el-table-column>
           <el-table-column label="已排查人数" prop="ypcrs" align="center">
           </el-table-column>
@@ -79,6 +79,8 @@
 </template>
 
 <script>
+import FileSaver from 'file-saver';
+import XLSX from 'xlsx';
 export default {
   data () {
     return {
@@ -230,7 +232,7 @@ export default {
     document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.right = '5px';
   },
   updated () {
-		if(document.querySelector('.el-range-input').value != '') {
+    if (document.querySelector('.el-range-input').value != '') {
       document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.display = 'none'
     } else {
       document.querySelector('.el-input__icon.el-range__icon.el-icon-date').style.display = 'block'
@@ -238,6 +240,32 @@ export default {
   },
   methods: {
     /**
+     * @description: 导出excel表格
+     * @param {*}
+     * @return {*}
+     */
+    exportExcel (excelName) {
+      //excelName --设置导出的excel名称
+      //report-table --对应的要导出的el-table的ref名称
+      try {
+        const $e = this.$refs['report-table'].$el;
+        // 如果表格加了fixed属性，则导出的文件会生产两份一样的数据，所以可在这里判断一下
+        let $table = $e.querySelector('.el-table__fixed');
+        if (!$table) {
+          $table = $e;
+        }
+        // 为了返回单元格原始字符串，设置{ raw: true }
+        const wb = XLSX.utils.table_to_book($table, { raw: true });
+        const wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: true, type: 'array' });
+        FileSaver.saveAs(
+          new Blob([wbout], { type: 'application/octet-stream' }),
+          `${excelName}.xlsx`,
+        );
+      } catch (e) {
+        if (typeof console !== 'undefined') console.error(e);
+      }
+    },
+    /**
      * @description: 找到表头设置样式
      * @param {*} row
      * @param {*} column

src/views/tjbb/tb.vue

 <!--
  * @Author: your name
  * @Date: 2021-08-31 15:24:48
- * @LastEditTime: 2021-09-02 10:22:41
+ * @LastEditTime: 2021-09-03 15:22:05
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \founder_vue\src\views\tjbb\tb.vue
@@ -417,7 +417,7 @@ export default {
 			}
 		}
 		.content {
-			height: 500px;
+			height: 480px;
 		}
 	}
 	.right {
@@ -428,7 +428,7 @@ export default {
 		justify-content: space-between;
 		.pie {
 			width: 48%;
-			height: 243px;
+			height: 240px;
 			margin-bottom: 25px;
 			border-radius: 6px;
 			border: 1px solid #999999;