zhanbei

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "supervision",
   "version": "3.7.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
@@ -18,6 +18,7 @@
         "file-saver": "^2.0.5",
         "fuse.js": "6.4.3",
         "highlight.js": "9.18.5",
+        "html-docx-js": "^0.3.1",
         "jquery": "^3.6.0",
         "js-beautify": "1.13.0",
         "js-cookie": "2.2.1",
@@ -8210,6 +8211,16 @@
       "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
       "dev": true
     },
+    "node_modules/html-docx-js": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/html-docx-js/-/html-docx-js-0.3.1.tgz",
+      "integrity": "sha1-lxP2WHoI0fDIeoAf52SaTQqwfXY=",
+      "dependencies": {
+        "jszip": "^2.3.0",
+        "lodash.escape": "^3.0.0",
+        "lodash.merge": "^3.2.0"
+      }
+    },
     "node_modules/html-entities": {
       "version": "1.4.0",
       "resolved": "https://registry.nlark.com/html-entities/download/html-entities-1.4.0.tgz",
@@ -9606,6 +9617,14 @@
         "node": ">=0.6.0"
       }
     },
+    "node_modules/jszip": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-2.6.1.tgz",
+      "integrity": "sha1-uI86ey5noqBIFSmCx6N1bZxIKPA=",
+      "dependencies": {
+        "pako": "~1.0.2"
+      }
+    },
     "node_modules/killable": {
       "version": "1.0.1",
       "resolved": "https://registry.nlark.com/killable/download/killable-1.0.1.tgz",
@@ -10157,6 +10176,56 @@
       "resolved": "https://registry.npmmirror.com/lodash/download/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
+    "node_modules/lodash._arraycopy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz",
+      "integrity": "sha1-due3wfH7klRzdIeKVi7Qaj5Q9uE="
+    },
+    "node_modules/lodash._arrayeach": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz",
+      "integrity": "sha1-urFWsqkNPxu9XGU0AzSeXlkz754="
+    },
+    "node_modules/lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
+    },
+    "node_modules/lodash._basefor": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.3.tgz",
+      "integrity": "sha1-dVC06SGO8J+tJDQ7YSAhx5tMIMI="
+    },
+    "node_modules/lodash._bindcallback": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
+      "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4="
+    },
+    "node_modules/lodash._createassigner": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
+      "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
+      "dependencies": {
+        "lodash._bindcallback": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0",
+        "lodash.restparam": "^3.0.0"
+      }
+    },
+    "node_modules/lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
+    },
+    "node_modules/lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
+    },
+    "node_modules/lodash._root": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
+      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI="
+    },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.nlark.com/lodash.debounce/download/lodash.debounce-4.0.8.tgz?cache=0&sync_timestamp=1622605323058&other_urls=https%3A%2F%2Fregistry.nlark.com%2Flodash.debounce%2Fdownload%2Flodash.debounce-4.0.8.tgz",
@@ -10169,12 +10238,64 @@
       "integrity": "sha1-US6b1yHSctlOPTpjZT+hdRZ0HKY=",
       "dev": true
     },
+    "node_modules/lodash.escape": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
+      "dependencies": {
+        "lodash._root": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
+    },
+    "node_modules/lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
+    },
+    "node_modules/lodash.isplainobject": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz",
+      "integrity": "sha1-moI4rhayAEMpYM1zRlEtASP79MU=",
+      "dependencies": {
+        "lodash._basefor": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.keysin": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.istypedarray": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz",
+      "integrity": "sha1-yaR3SYYHUB2OhJTSg7h8OSgc72I="
+    },
     "node_modules/lodash.kebabcase": {
       "version": "4.1.1",
       "resolved": "https://registry.nlark.com/lodash.kebabcase/download/lodash.kebabcase-4.1.1.tgz",
       "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=",
       "dev": true
     },
+    "node_modules/lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "dependencies": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.keysin": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-3.0.8.tgz",
+      "integrity": "sha1-IsRJPrvtsUJ5YqVLRFssinZ/tH8=",
+      "dependencies": {
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
     "node_modules/lodash.mapvalues": {
       "version": "4.6.0",
       "resolved": "https://registry.nlark.com/lodash.mapvalues/download/lodash.mapvalues-4.6.0.tgz",
@@ -10187,12 +10308,44 @@
       "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
       "dev": true
     },
+    "node_modules/lodash.merge": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-3.3.2.tgz",
+      "integrity": "sha1-DZDZPtY3sYeEN7s+IWASYNev6ZQ=",
+      "dependencies": {
+        "lodash._arraycopy": "^3.0.0",
+        "lodash._arrayeach": "^3.0.0",
+        "lodash._createassigner": "^3.0.0",
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0",
+        "lodash.isplainobject": "^3.0.0",
+        "lodash.istypedarray": "^3.0.0",
+        "lodash.keys": "^3.0.0",
+        "lodash.keysin": "^3.0.0",
+        "lodash.toplainobject": "^3.0.0"
+      }
+    },
     "node_modules/lodash.padend": {
       "version": "4.6.1",
       "resolved": "https://registry.nlark.com/lodash.padend/download/lodash.padend-4.6.1.tgz",
       "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=",
       "dev": true
     },
+    "node_modules/lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
+    },
+    "node_modules/lodash.toplainobject": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz",
+      "integrity": "sha1-KHkK2ULSk9eKpmOgfs9/UsoEGY0=",
+      "dependencies": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash.keysin": "^3.0.0"
+      }
+    },
     "node_modules/lodash.transform": {
       "version": "4.6.0",
       "resolved": "https://registry.nlark.com/lodash.transform/download/lodash.transform-4.6.0.tgz",
@@ -11552,8 +11705,7 @@
     "node_modules/pako": {
       "version": "1.0.11",
       "resolved": "https://registry.nlark.com/pako/download/pako-1.0.11.tgz",
-      "integrity": "sha1-bJWZ00DVTf05RjgCUqNXBaa5kr8=",
-      "dev": true
+      "integrity": "sha1-bJWZ00DVTf05RjgCUqNXBaa5kr8="
     },
     "node_modules/parallel-transform": {
       "version": "1.2.0",
@@ -18996,7 +19148,8 @@
       "version": "4.5.15",
       "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-vuex/download/@vue/cli-plugin-vuex-4.5.15.tgz",
       "integrity": "sha512-fqap+4HN+w+InDxlA3hZTOGE0tzBTgXhKLoDydhywqgmhQ1D9JA6Feh94ze6tG8DsWX58/ujYUqA8jAz17FJtg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@vue/cli-service": {
       "version": "4.4.6",
@@ -19238,7 +19391,8 @@
       "version": "1.1.2",
       "resolved": "https://registry.nlark.com/@vue/preload-webpack-plugin/download/@vue/preload-webpack-plugin-1.1.2.tgz",
       "integrity": "sha1-zrkktOyzucQ4ccekKaAvhCPmIas=",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
@@ -19458,7 +19612,8 @@
       "version": "5.3.2",
       "resolved": "https://registry.nlark.com/acorn-jsx/download/acorn-jsx-5.3.2.tgz?cache=0&sync_timestamp=1625793240297&other_urls=https%3A%2F%2Fregistry.nlark.com%2Facorn-jsx%2Fdownload%2Facorn-jsx-5.3.2.tgz",
       "integrity": "sha1-ftW7VZCLOy8bxVxq8WU7rafweTc=",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -19498,13 +19653,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.nlark.com/ajv-errors/download/ajv-errors-1.0.1.tgz",
       "integrity": "sha1-81mGrOuRr63sQQL72FAUlQzvpk0=",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmmirror.com/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1637524372087&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz",
       "integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0=",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "alphanum-sort": {
       "version": "1.0.2",
@@ -23112,7 +23269,7 @@
     },
     "file-saver": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
+      "resolved": "https://registry.npmmirror.com/file-saver/download/file-saver-2.0.5.tgz",
       "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
     },
     "filesize": {
@@ -23330,13 +23487,6 @@
       "resolved": "https://registry.nlark.com/fs.realpath/download/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "optional": true
-    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz",
@@ -23710,8 +23860,8 @@
     },
     "html-docx-js": {
       "version": "0.3.1",
-      "resolved": "https://registry.npmmirror.com/html-docx-js/-/html-docx-js-0.3.1.tgz",
-      "integrity": "sha512-QSrMiRhxesqxYCa3f+2Z3ttIHPzSjDOL1tCOmIDIEET7HdabxXND6tAbsFMXAgRG4RADQ3wbl74ydMmjidaDPA==",
+      "resolved": "https://registry.npmjs.org/html-docx-js/-/html-docx-js-0.3.1.tgz",
+      "integrity": "sha1-lxP2WHoI0fDIeoAf52SaTQqwfXY=",
       "requires": {
         "jszip": "^2.3.0",
         "lodash.escape": "^3.0.0",
@@ -24782,8 +24932,8 @@
     },
     "jszip": {
       "version": "2.6.1",
-      "resolved": "https://registry.npmmirror.com/jszip/-/jszip-2.6.1.tgz",
-      "integrity": "sha512-C4Z++nYQv+CudUkCWUdz+yKVhQiFJjuWSmRJ5Sg3d3/OzcJ6U4ooUYlmE3+rJXrVk89KWQaiJ9mPp/VLQ4D66g==",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-2.6.1.tgz",
+      "integrity": "sha1-uI86ey5noqBIFSmCx6N1bZxIKPA=",
       "requires": {
         "pako": "~1.0.2"
       }
@@ -25203,33 +25353,33 @@
     },
     "lodash._arraycopy": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmmirror.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz",
-      "integrity": "sha512-RHShTDnPKP7aWxlvXKiDT6IX2jCs6YZLCtNhOru/OX2Q/tzX295vVBK5oX1ECtN+2r86S0Ogy8ykP1sgCZAN0A=="
+      "resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz",
+      "integrity": "sha1-due3wfH7klRzdIeKVi7Qaj5Q9uE="
     },
     "lodash._arrayeach": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmmirror.com/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz",
-      "integrity": "sha512-Mn7HidOVcl3mkQtbPsuKR0Fj0N6Q6DQB77CtYncZcJc0bx5qv2q4Gl6a0LC1AN+GSxpnBDNnK3CKEm9XNA4zqQ=="
+      "resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz",
+      "integrity": "sha1-urFWsqkNPxu9XGU0AzSeXlkz754="
     },
     "lodash._basecopy": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmmirror.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
-      "integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ=="
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY="
     },
     "lodash._basefor": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmmirror.com/lodash._basefor/-/lodash._basefor-3.0.3.tgz",
-      "integrity": "sha512-6bc3b8grkpMgDcVJv9JYZAk/mHgcqMljzm7OsbmcE2FGUMmmLQTPHlh/dFqR8LA0GQ7z4K67JSotVKu5058v1A=="
+      "resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.3.tgz",
+      "integrity": "sha1-dVC06SGO8J+tJDQ7YSAhx5tMIMI="
     },
     "lodash._bindcallback": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmmirror.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
-      "integrity": "sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ=="
+      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
+      "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4="
     },
     "lodash._createassigner": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmmirror.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
-      "integrity": "sha512-LziVL7IDnJjQeeV95Wvhw6G28Z8Q6da87LWKOPWmzBLv4u6FAT/x5v00pyGW0u38UoogNF2JnD3bGgZZDaNEBw==",
+      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
+      "integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
       "requires": {
         "lodash._bindcallback": "^3.0.0",
         "lodash._isiterateecall": "^3.0.0",
@@ -25238,18 +25388,18 @@
     },
     "lodash._getnative": {
       "version": "3.9.1",
-      "resolved": "https://registry.npmmirror.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA=="
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U="
     },
     "lodash._isiterateecall": {
       "version": "3.0.9",
-      "resolved": "https://registry.npmmirror.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
-      "integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ=="
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw="
     },
     "lodash._root": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmmirror.com/lodash._root/-/lodash._root-3.0.1.tgz",
-      "integrity": "sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ=="
+      "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz",
+      "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI="
     },
     "lodash.debounce": {
       "version": "4.0.8",
@@ -25265,26 +25415,26 @@
     },
     "lodash.escape": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmmirror.com/lodash.escape/-/lodash.escape-3.2.0.tgz",
-      "integrity": "sha512-n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ==",
+      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz",
+      "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
       "requires": {
         "lodash._root": "^3.0.0"
       }
     },
     "lodash.isarguments": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmmirror.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg=="
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo="
     },
     "lodash.isarray": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmmirror.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ=="
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U="
     },
     "lodash.isplainobject": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmmirror.com/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz",
-      "integrity": "sha512-P4wZnho5curNqeEq/x292Pb57e1v+woR7DJ84DURelKB46lby8aDEGVobSaYtzHdQBWQrJSdxcCwjlGOvvdIyg==",
+      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz",
+      "integrity": "sha1-moI4rhayAEMpYM1zRlEtASP79MU=",
       "requires": {
         "lodash._basefor": "^3.0.0",
         "lodash.isarguments": "^3.0.0",
@@ -25293,8 +25443,8 @@
     },
     "lodash.istypedarray": {
       "version": "3.0.6",
-      "resolved": "https://registry.npmmirror.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz",
-      "integrity": "sha512-lGWJ6N8AA3KSv+ZZxlTdn4f6A7kMfpJboeyvbFdE7IU9YAgweODqmOgdUHOA+c6lVWeVLysdaxciFXi+foVsWw=="
+      "resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz",
+      "integrity": "sha1-yaR3SYYHUB2OhJTSg7h8OSgc72I="
     },
     "lodash.kebabcase": {
       "version": "4.1.1",
@@ -25304,8 +25454,8 @@
     },
     "lodash.keys": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmmirror.com/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
       "requires": {
         "lodash._getnative": "^3.0.0",
         "lodash.isarguments": "^3.0.0",
@@ -25314,8 +25464,8 @@
     },
     "lodash.keysin": {
       "version": "3.0.8",
-      "resolved": "https://registry.npmmirror.com/lodash.keysin/-/lodash.keysin-3.0.8.tgz",
-      "integrity": "sha512-YDB/5xkL3fBKFMDaC+cfGV00pbiJ6XoJIfRmBhv7aR6wWtbCW6IzkiWnTfkiHTF6ALD7ff83dAtB3OEaSoyQPg==",
+      "resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-3.0.8.tgz",
+      "integrity": "sha1-IsRJPrvtsUJ5YqVLRFssinZ/tH8=",
       "requires": {
         "lodash.isarguments": "^3.0.0",
         "lodash.isarray": "^3.0.0"
@@ -25335,8 +25485,8 @@
     },
     "lodash.merge": {
       "version": "3.3.2",
-      "resolved": "https://registry.npmmirror.com/lodash.merge/-/lodash.merge-3.3.2.tgz",
-      "integrity": "sha512-ZgGZpRhWLjivGUbjtApZR4HyLv/UAyoYqESVYkK4aLBJVHRrbFpG+GNnE9JPijliME4LkKM0SFI/WyOiBiv1+w==",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-3.3.2.tgz",
+      "integrity": "sha1-DZDZPtY3sYeEN7s+IWASYNev6ZQ=",
       "requires": {
         "lodash._arraycopy": "^3.0.0",
         "lodash._arrayeach": "^3.0.0",
@@ -25359,13 +25509,13 @@
     },
     "lodash.restparam": {
       "version": "3.6.1",
-      "resolved": "https://registry.npmmirror.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
-      "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw=="
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU="
     },
     "lodash.toplainobject": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmmirror.com/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz",
-      "integrity": "sha512-wMI0Ju1bvSmnBS3EcRRH/3zDnZOPpDtMtNDzbbNMKuTrEpALsf+sPyMeogmv63Y11qZQO7H1xFzohIEGRMjPYA==",
+      "resolved": "https://registry.npmjs.org/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz",
+      "integrity": "sha1-KHkK2ULSk9eKpmOgfs9/UsoEGY0=",
       "requires": {
         "lodash._basecopy": "^3.0.0",
         "lodash.keysin": "^3.0.0"
@@ -27241,7 +27391,8 @@
       "version": "1.14.0",
       "resolved": "https://registry.npmmirror.com/postcss-prefix-selector/download/postcss-prefix-selector-1.14.0.tgz",
       "integrity": "sha512-8d5fiBQZWMtGWH/7ewEeo6RnBNyT2kLD5wTIfV2oHYqH4hjiofg/rP5X3SUwnqOINzE4mM/K/UOAiNrIaKzd4w==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-reduce-initial": {
       "version": "4.0.3",
@@ -28957,6 +29108,15 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.nlark.com/string_decoder/download/string_decoder-1.1.1.tgz",
+      "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
     "string-argv": {
       "version": "0.3.1",
       "resolved": "https://registry.nlark.com/string-argv/download/string-argv-0.3.1.tgz",
@@ -28994,15 +29154,6 @@
         "define-properties": "^1.1.3"
       }
     },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.nlark.com/string_decoder/download/string_decoder-1.1.1.tgz",
-      "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
     "stringify-object": {
       "version": "3.3.0",
       "resolved": "https://registry.nlark.com/stringify-object/download/stringify-object-3.3.0.tgz",
@@ -30322,7 +30473,8 @@
     "vuex": {
       "version": "3.6.0",
       "resolved": "https://registry.npmmirror.com/vuex/download/vuex-3.6.0.tgz",
-      "integrity": "sha512-W74OO2vCJPs9/YjNjW8lLbj+jzT24waTo2KShI8jLvJW8OaIkgb3wuAMA7D+ZiUxDOx3ubwSZTaJBip9G8a3aQ=="
+      "integrity": "sha512-W74OO2vCJPs9/YjNjW8lLbj+jzT24waTo2KShI8jLvJW8OaIkgb3wuAMA7D+ZiUxDOx3ubwSZTaJBip9G8a3aQ==",
+      "requires": {}
     },
     "wangeditor": {
       "version": "4.7.12",
@@ -30419,13 +30571,6 @@
             "upath": "^1.1.1"
           }
         },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true
-        },
         "glob-parent": {
           "version": "3.1.0",
           "resolved": "https://registry.npmmirror.com/glob-parent/download/glob-parent-3.1.0.tgz?cache=0&sync_timestamp=1632953697891&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-3.1.0.tgz",
@@ -30770,13 +30915,6 @@
             "locate-path": "^3.0.0"
           }
         },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true
-        },
         "glob-parent": {
           "version": "3.1.0",
           "resolved": "https://registry.npmmirror.com/glob-parent/download/glob-parent-3.1.0.tgz?cache=0&sync_timestamp=1632953697891&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob-parent%2Fdownload%2Fglob-parent-3.1.0.tgz",
@@ -31245,4 +31383,4 @@
       "integrity": "sha1-7HQy+UFcgsc1hLa3uMR+GwFiCcY="
     }
   }
-}
+}

src/api/combatduty/Quantitative.js

@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+// 获取基地值班的信息
+export function getTodayzhiban() {
+    return request({
+      url: '/combatduty/quantistatis/todayzhiban',
+      method: 'get',
+    })
+}
+
+export function getListshow() {
+    return request({
+      url: '/combatduty/quantistatis/listshow',
+      method: 'get',
+    })
+}

src/api/combatduty/ReteOfTen.js

@@ -2,7 +2,49 @@ import request from '@/utils/request'
 // 获取人员五率的信息
 export function getReteOfTen() {
     return request({
-      url: '/combatduty/quantistatis/listwulvinfo',
+      url: '/peoplefiverates/probinfo/list',
       method: 'get',
     })
-  }
+  }
+// 获取六量列表接口
+export function getliuliang(){
+  return request({
+    url:"/peoplefiverates/measureinfo/list",
+    method:"get"
+  })
+}
+// 获取修改接口
+export function updateliuliang(data){
+  return request({
+    url:"/peoplefiverates/measureinfo",
+    method:"post",
+    data:data
+  })
+}
+
+// 人员五率添加接口
+export function updatewulv(data){
+  return request({
+    url:"/peoplefiverates/probinfo",
+    method:"post",
+    data:data
+  })
+}
+
+// 装备五率添加接口
+export function updatezbwl(data){
+  return request({
+    url:"/peoplefiverates/outfitinfo",
+    method:"post",
+    data:data
+  })
+}
+
+// 装备五率查询接口
+export function getzbwl(data){
+  return request({
+    url:"/peoplefiverates/outfitinfo/list",
+    method:"get",
+    data:data
+  })
+}

src/assets/styles/global.css

@@ -644,10 +644,10 @@ background-color: #1d96ff;
   text-align: center;
 }
 /* 下拉框样式 */
-.guizhangzhidu .el-select-dropdown .el-select-dropdown__wrap .el-scrollbar__view{
+/* .el-select-dropdown .el-select-dropdown__wrap .el-scrollbar__view{
   background-color: white !important;
   text-indent: 1em;
-}
+} */
 .guizhangzhidu .el-select-dropdown .el-select-dropdown__wrap .el-scrollbar__view .el-select-dropdown__item{
   text-indent: 1em;
 }

src/views/combatduty/Quantitative/index.vue

@@ -7,55 +7,67 @@
           <div style="width: 100%; display: flex">
             <div class="wrap-top-left-top-item">
               <div class="wrap-top-left-top-item-left">值 班 首 长</div>
-              <div class="wrap-top-left-top-item-right"></div>
+              <div class="wrap-top-left-top-item-right">{{this.BaseOnDuty.chiefDutyName}}</div>
             </div>
             <div class="wrap-top-left-top-item">
               <div class="wrap-top-left-top-item-left">总 值 班 员</div>
-              <div class="wrap-top-left-top-item-right"></div>
+              <div class="wrap-top-left-top-item-right">{{this.BaseOnDuty.dutyOffierName}}</div>
             </div>
             <div class="wrap-top-left-top-item">
               <div class="wrap-top-left-top-item-left zuozhan">作 战 值 班 员</div>
-              <div class="wrap-top-left-top-item-right"></div>
+              <div class="wrap-top-left-top-item-right">{{this.BaseOnDuty.combatDutyName}}</div>
             </div>
           </div>
           <div style="width: 100%; display: flex">
             <div class="wrap-top-left-top-item" style="flex: 1">
               <div class="wrap-top-left-top-item-left">值班分队一</div>
-              <div class="wrap-top-left-top-item-right"></div>
+              <div class="wrap-top-left-top-item-right">{{this.BaseOnDuty.detachmentoneName}}</div>
             </div>
             <div class="wrap-top-left-top-item">
             <div class="wrap-top-left-top-item-left">一分队人数</div>
-               <div class="wrap-top-left-top-item-right"></div>
+               <div class="wrap-top-left-top-item-right">{{this.BaseOnDuty.detachmentoneNumber}}</div>
             </div>
             <div
               class="wrap-top-left-top-item"
               style="flex: 1; margin-right: 15px;"
             >
-              <div class="wrap-top-left-top-item-left" style="text-align:start;margin-left:5px;width:69px;;font-size:14px">
-                 一 分 队 指 挥 员
-              </div>
-              <div class="wrap-top-left-top-item-right">
-               
+              <!-- <div class="wrap-top-left-top-item-left" > -->
+                <div style="color:white;font-size:14px;margin-left:7px">
+              <span style="display:inline-block;width:35px">一</span>
+              <span style="display:inline-block;width:35px">分</span>
+              <span style="display:inline-block;width:35px">队</span>
+            <span style="display:inline-block;width:35px">指</span>
+            <span style="display:inline-block;width:35px">挥</span>
+            <span style="display:inline-block;">员</span>
+            </div>
+              <!-- </div> -->
+              <div class="wrap-top-left-top-item-right" style="margin-right:8px">
+               {{this.BaseOnDuty.detachmentonePeopleName}}
               </div>
             </div>
           </div>
           <div style="width: 100%; display: flex">
             <div class="wrap-top-left-top-item" style="flex: 1">
               <div class="wrap-top-left-top-item-left zuozhan" style="margin-left:-2px">值班分队二</div>
-              <div class="wrap-top-left-top-item-right"></div>
+              <div class="wrap-top-left-top-item-right">{{this.BaseOnDuty.detachmentwoName}}</div>
             </div>
             <div class="wrap-top-left-top-item">
-             <div class="wrap-top-left-top-item-left zuozhan" style="margin-left:-1px">二分队人数</div>
-            <div class="wrap-top-left-top-item-right"></div>
+             <div class="wrap-top-left-top-item-left" style="margin-left:px">二分队人数</div>
+            <div class="wrap-top-left-top-item-right">{{this.BaseOnDuty.detachmentwoNumber}}</div>
             </div>
             <div
               class="wrap-top-left-top-item"
               style="flex: 1; margin-right: 15px"
             >
-              <div class="wrap-top-left-top-item-left">
-                二 分 队 指 挥 员
-              </div>
-              <div class="wrap-top-left-top-item-right"></div>
+                <div style="color:white;font-size:14px;margin-left:7px">
+              <span style="display:inline-block;width:35px">二</span>
+              <span style="display:inline-block;width:35px">分</span>
+              <span style="display:inline-block;width:35px">队</span>
+            <span style="display:inline-block;width:35px">指</span>
+            <span style="display:inline-block;width:35px">挥</span>
+            <span style="display:inline-block;">员</span>
+            </div>
+              <div class="wrap-top-left-top-item-right" style="margin-right:9px">{{this.BaseOnDuty.detachmentwoPeopleName}}</div>
             </div>
           </div>
         </div>
@@ -140,7 +152,7 @@
         <div class="wrap-top-left-top-head"><b>人员情况</b></div>
         <div class="wrap-top-center-item">
           <div class="wrap-top-center-item-left">
-            <img src="/static/icon-img/编纳总人数.png" alt="" />
+            <img src="../../../images/Quantitative/编纳总人数.png" alt="" />
           </div>
           <div class="wrap-top-center-item-right">
             <div class="wrap-top-center-item-right-top">编纳总人数</div>
@@ -149,7 +161,7 @@
         </div>
         <div class="wrap-top-center-item">
           <div class="wrap-top-center-item-left">
-            <img src="/static/icon-img/在位.png" alt="" />
+            <img src="../../../images/Quantitative/编纳在位.png" alt="" />
           </div>
           <div class="wrap-top-center-item-right">
             <div class="wrap-top-center-item-right-top">编纳在位</div>
@@ -158,7 +170,7 @@
         </div>
         <div class="wrap-top-center-item">
           <div class="wrap-top-center-item-left">
-            <img src="/static/icon-img/休假.png" alt="" />
+            <img src="../../../images/Quantitative/休假.png" alt="" />
           </div>
           <div class="wrap-top-center-item-right">
             <div class="wrap-top-center-item-right-top">编纳休假</div>
@@ -167,7 +179,7 @@
         </div>
         <div class="wrap-top-center-item">
           <div class="wrap-top-center-item-left">
-            <img src="/static/icon-img/出差.png" alt="" />
+            <img src="../../../images/Quantitative/出差.png" alt="" />
           </div>
           <div class="wrap-top-center-item-right">
             <div class="wrap-top-center-item-right-top">编纳出差</div>
@@ -176,7 +188,7 @@
         </div>
         <div class="wrap-top-center-item">
           <div class="wrap-top-center-item-left">
-            <img src="/static/icon-img/学习.png" alt="" />
+            <img src="../../../images/Quantitative/学习.png" alt="" />
           </div>
           <div class="wrap-top-center-item-right">
             <div class="wrap-top-center-item-right-top">编纳学习</div>
@@ -185,7 +197,7 @@
         </div>
         <div class="wrap-top-center-item">
           <div class="wrap-top-center-item-left">
-            <img src="/static/icon-img/请假.png" alt="" />
+            <img src="../../../images/Quantitative/请假.png" alt="" />
           </div>
           <div class="wrap-top-center-item-right">
             <div class="wrap-top-center-item-right-top">编纳外诊</div>
@@ -194,7 +206,7 @@
         </div>
         <div class="wrap-top-center-item">
           <div class="wrap-top-center-item-left">
-            <img src="/static/icon-img/未编纳总人数.png" alt="" />
+            <img src="../../../images/Quantitative/未编纳总人数.png" alt="" />
           </div>
           <div class="wrap-top-center-item-right">
             <div class="wrap-top-center-item-right-top">未编纳总人数</div>
@@ -203,7 +215,7 @@
         </div>
         <div class="wrap-top-center-item">
           <div class="wrap-top-center-item-left">
-            <img src="/static/icon-img/在位.png" alt="" />
+            <img src="../../../images/Quantitative/编纳在位.png" alt="" />
           </div>
           <div class="wrap-top-center-item-right">
             <div class="wrap-top-center-item-right-top">未编纳在位</div>
@@ -212,7 +224,7 @@
         </div>
         <div class="wrap-top-center-item">
           <div class="wrap-top-center-item-left">
-            <img src="/static/icon-img/休假.png" alt="" />
+            <img src="../../../images/Quantitative/休假.png" alt="" />
           </div>
           <div class="wrap-top-center-item-right">
             <div class="wrap-top-center-item-right-top">未编纳休假</div>
@@ -221,7 +233,7 @@
         </div>
         <div class="wrap-top-center-item">
           <div class="wrap-top-center-item-left">
-            <img src="/static/icon-img/出差.png" alt="" />
+            <img src="../../../images/Quantitative/出差.png" alt="" />
           </div>
           <div class="wrap-top-center-item-right">
             <div class="wrap-top-center-item-right-top">未编纳出差</div>
@@ -230,7 +242,7 @@
         </div>
         <div class="wrap-top-center-item">
           <div class="wrap-top-center-item-left">
-            <img src="/static/icon-img/学习.png" alt="" />
+            <img src="../../../images/Quantitative/学习.png" alt="" />
           </div>
           <div class="wrap-top-center-item-right">
             <div class="wrap-top-center-item-right-top">未编纳学习</div>
@@ -239,7 +251,7 @@
         </div>
         <div class="wrap-top-center-item">
           <div class="wrap-top-center-item-left">
-            <img src="/static/icon-img/请假.png" alt="" />
+            <img src="../../../images/Quantitative/请假.png" alt="" />
           </div>
           <div class="wrap-top-center-item-right">
             <div class="wrap-top-center-item-right-top">未编纳外诊</div>
@@ -319,11 +331,23 @@
   </div>
 </template>
 <script>
+import {getTodayzhiban,getListshow} from "@/api/combatduty/Quantitative"
 export default {
   data() {
-    return {};
+    return {
+      BaseOnDuty:[]
+    };
+  },
+  created() {
+    getTodayzhiban().then(res=>{
+      console.log(res.rows[0])
+      this.BaseOnDuty=res.rows[0]
+      // console.log(res.rows)
+    })
+    getListshow().then(res=>{
+      // console.log(res.data)
+    })
   },
-  created() {},
   methods: {},
 };
 </script>
@@ -470,7 +494,7 @@ body {
 
 .wrap-top-center-item-left {
   flex: 1;
-  height: 100%;
+  height: 80%;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -579,6 +603,6 @@ table tr td {
   font-size: 34px;
 }
 .zuozhan{
-    width: 110px;
+    width: 100px;
 }
 </style>

src/views/regulations/fileinfo/index.vue

@@ -117,7 +117,7 @@
               type="text"
               @click="handleupLoad(scope.row)"
             >
-              <span class="chakan">
+              <span class="chakan1">
                 <a :href="scope.row.parentDirName" download>下载</a>
               </span>
             </el-button>
@@ -141,8 +141,8 @@
       <div class="catalog">
         <div class="jichu">
           目录
-          <el-button class="turnback" @click="turnback">返回</el-button>
-          <el-button class="uploadfilesbtn" @click="upload">上传文件</el-button
+          <el-button class="turnback" @click="turnback" v-if="addbtn==0">返回上级</el-button>
+          <el-button class="uploadfilesbtn" :class="addbtn?'margins':''" @click="upload">上传文件</el-button
           ><el-button class="manage" @click="mange">目录管理</el-button>
         </div>
         <el-table
@@ -179,6 +179,7 @@
                 size="add"
                 type="text"
                 @click="ViewProgress(scope.row)"
+                v-if="addbtn==true"
               >
                 <span>添加</span>
               </el-button>
@@ -215,13 +216,13 @@
             <td class="find">{{item.documentCategory}}</td>
             <!-- 上周阅读量 -->
             <td class="readnumber">
-              上月阅读量 <span style="margin-left: 5px">{{item.readnumber1}}</span>
+              上月阅读量 <span style="margin-left: 5px">{{item.readnumber2}}</span>
             </td>
             <!-- 本周阅读量 -->  
             <td class="thisweek" style="position:relative">
               <!-- <img src="../../../images/upRow.png" alt="" style="position:absolute;top:18px;right:158px" > -->
               <!-- <img src="../../../images/downRow.png" alt=""  style="position:absolute;top:17px;right:158px"> -->
-              本月阅读量 <span style="color: red; margin-left: 5px">{{item. readnumber2}}</span>
+              本月阅读量 <span style="color: red; margin-left: 5px">{{item. readnumber1}}</span>
             </td>
           </tr>
         </table>
@@ -518,7 +519,9 @@ export default {
       // 添加上传文件名称
       title: "",
       // 排行数据
-      Ranking:[]
+      Ranking:[],
+      // 添加按钮
+      addbtn:true
     };
   },
   created() {
@@ -527,9 +530,7 @@ export default {
     this.ListDirectoryinfo();
     // 获取排行目录接口
     rankList().then(res=>{
-      console.log(res)
       this.Ranking=res.data
-      console.log(this.Ranking)
     })
   },
   methods: {
@@ -558,10 +559,11 @@ export default {
     mulus(row) {
       this.parentId = row.id;
       listDirectoryinfo({ parentId: this.parentId }).then((res) => {
-        console.log(res.rows);
+        this.addbtn=false
         res.rows.forEach((item) => {
           if (item.subclassification == 0) {
             this.directory = res.rows;
+            // this.addbtn=false
           } else {
             return;
           }
@@ -576,6 +578,7 @@ export default {
     },
     // 返回目录
     turnback() {
+      this.addbtn=true
       this.ListDirectoryinfo();
     },
     // 选中父目录之后
@@ -592,7 +595,6 @@ export default {
       // this.loading = true;
       listFileinfo(this.queryParams).then((response) => {
         this.fileinfoList = response.rows;
-        console.log(this.fileinfoList);
         this.total = response.total;
         // this.loading = false;
       });
@@ -757,7 +759,6 @@ export default {
     },
     // 添加
     ViewProgress(row) {
-      console.log(row.id);
       // 传入父亲目录id
       this.form2.parentId = row.id;
       // console.log(this.form2.parentId)
@@ -800,12 +801,13 @@ export default {
 }
 /* 文件表格 */
 .tablesfile {
-  height: 100vh;
+  /* height: 87vh; */
   background: #00365f;
   width: calc(100% - 695px);
   position: absolute;
   left: 20px;
   top: 20px;
+  bottom: 20px;
 }
 /* 弹性布局 */
 .flexlayout {
@@ -815,12 +817,12 @@ export default {
   height: 100%;
   display: flex;
   width: 100%;
-  margin: 20px 20px 0;
+  margin: 20px 20px 20px;
 }
 /* 目录 */
 .catalog {
   width: 100%;
-  height: 45vh;
+  height: 50%;
   position: relative;
   background-color: #00365f;
 }
@@ -838,20 +840,23 @@ export default {
 /* 排行 */
 .Ranking {
   width: 100%;
-  height: 45vh;
+  height: 48.6%;
   right: 12%;
   top: 45%;
   background-color: #00365f;
   margin-top: 10px;
+  margin-bottom: 20px;
 }
 /* 右边栏样式 */
 .rights {
-  height: 100vh;
+  /* height: 100vh; */
+  /* height: 85vh; */
   width: 632px;
   float: right;
   position: absolute;
   top: 20px;
   right: 20px;
+  bottom: 20px;
 }
 
 /* 阅读 */
@@ -877,7 +882,7 @@ export default {
   background-repeat: no-repeat;
   background-position: 8px 6px;
   /* text-align: center; */
-  line-height: 5px;
+  line-height: 30px;
   margin-right: 10px;
 }
 /* 删除按钮样式 */
@@ -898,6 +903,11 @@ export default {
 .el-button--reads .chakan {
   margin-left: 7px;
 }
+/* 阅读按钮样式 */
+.el-button--reads .chakan1 {
+  padding-top:2px;
+  margin-left: 7px;
+}
 /* 表格 */
 .tdfirst {
   width: 60px;
@@ -969,8 +979,24 @@ table {
   color: white;
   border-radius: 4px;
   font-size: 14px;
+  text-align: center; 
+}
+.margins{
+  margin-left: 370px;
+}
+/* 返回目录按钮 */
+.turnback {
+  width: 86px;
+  height: 33px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  font-size: 14px;
+  line-height: 33px;
+  margin-left: 30px;
   text-align: center;
   margin-left: 300px;
+  color: #ccc;
+  background: #00365f;
 }
 /* 目录管理 */
 .manage {
@@ -988,18 +1014,14 @@ table {
 ::v-deep .el-dialog {
   background-color: #004d86 !important;
 }
-::v-deep .el-select-dropdown__item {
-  color: white;
-}
+
 ::v-deep .el-dialog__title {
   color: white;
 }
 ::v-deep .el-dialog__header {
   border-bottom: 1px solid #718a9dff;
 }
-::v-deep .el-select-dropdown__item {
-  color: white;
-}
+
 ::v-deep .select_file {
   margin-left: -30px;
 }
@@ -1039,7 +1061,8 @@ table {
   background-color: white !important;
 }
 .el-select-dropdown__item {
-  background-color: white !important;
+  text-indent: 1em;
+  color: white;
   border: none !important;
 }
 ::v-deep .el-select-dropdown__wrap .el-scrollbar__view {
@@ -1048,18 +1071,7 @@ table {
 ::v-deep .pagination-container {
   display: block !important;
 }
-/* 返回目录按钮 */
-.turnback {
-  color: #ffffff;
-  width: 50px;
-  height: 30px;
-  background-color: #1d96ff;
-  border-radius: 4px;
-  font-size: 14px;
-  line-height: 30px;
-  margin-left: 30px;
-  text-align: center;
-}
+
 /* 添加按钮 */
 .el-button--add {
   width: 55px !important;
@@ -1084,7 +1096,7 @@ table {
 }
 /* 下划线 */
 .undeline {
-  text-decoration: underline;
+  /* text-decoration: underline; */
   color: #1d96ff;
   cursor: pointer;
 }