unknown 3 vuotta sitten
vanhempi
commit
1fc22b28c9
61 muutettua tiedostoa jossa 1028 lisäystä ja 360 poistoa
  1. 2 1
      package.json
  2. 2 1
      public/index.html
  3. 8 1
      src/App.vue
  4. 16 0
      src/api/user.js
  5. 1 5
      src/assets/css/base.css
  6. 1 0
      src/icons/svg/bug.svg
  7. 1 0
      src/icons/svg/chart.svg
  8. 1 0
      src/icons/svg/clipboard.svg
  9. 1 0
      src/icons/svg/component.svg
  10. 1 0
      src/icons/svg/documentation.svg
  11. 1 0
      src/icons/svg/drag.svg
  12. 1 0
      src/icons/svg/education.svg
  13. 1 0
      src/icons/svg/example.svg
  14. 1 0
      src/icons/svg/excel.svg
  15. 1 0
      src/icons/svg/exit-fullscreen.svg
  16. 1 0
      src/icons/svg/eye-open.svg
  17. 1 0
      src/icons/svg/eye.svg
  18. 0 0
      src/icons/svg/form.svg
  19. 1 0
      src/icons/svg/fullscreen.svg
  20. 1 0
      src/icons/svg/guide.svg
  21. 1 0
      src/icons/svg/icon.svg
  22. 1 0
      src/icons/svg/international.svg
  23. 1 0
      src/icons/svg/link.svg
  24. 1 0
      src/icons/svg/list.svg
  25. 1 0
      src/icons/svg/lock.svg
  26. 1 0
      src/icons/svg/message.svg
  27. 1 0
      src/icons/svg/money.svg
  28. 1 0
      src/icons/svg/nested.svg
  29. 1 0
      src/icons/svg/password.svg
  30. 1 0
      src/icons/svg/people.svg
  31. 1 0
      src/icons/svg/peoples.svg
  32. 0 0
      src/icons/svg/qq.svg
  33. 0 0
      src/icons/svg/shopping.svg
  34. 1 0
      src/icons/svg/size.svg
  35. 1 0
      src/icons/svg/skill.svg
  36. 1 0
      src/icons/svg/tab.svg
  37. 1 0
      src/icons/svg/table.svg
  38. 1 0
      src/icons/svg/theme.svg
  39. 1 0
      src/icons/svg/tree-table.svg
  40. 1 0
      src/icons/svg/tree.svg
  41. 1 0
      src/icons/svg/user.svg
  42. 1 0
      src/icons/svg/wechat.svg
  43. 1 0
      src/icons/svg/zip.svg
  44. 1 0
      src/main.js
  45. 14 85
      src/pages/data/data.js
  46. 59 9
      src/pages/other/apply-list.vue
  47. 3 3
      src/pages/other/components/IArtical.vue
  48. 26 46
      src/pages/other/components/IFooter.vue
  49. 28 6
      src/pages/other/components/IHeader.vue
  50. 266 0
      src/pages/other/components/IPanel.vue
  51. 1 0
      src/pages/other/file-add.vue
  52. 179 0
      src/pages/other/file-confirm.vue
  53. 66 47
      src/pages/other/file-manage.vue
  54. 179 0
      src/pages/other/file-publish.vue
  55. 10 6
      src/pages/other/file-search.vue
  56. 0 10
      src/pages/other/index.vue
  57. 2 2
      src/pages/other/my-file.vue
  58. 101 130
      src/pages/other/reply-list.vue
  59. 10 0
      src/router/index.js
  60. 5 6
      src/store/modules/user.js
  61. 14 2
      vue.config.js

+ 2 - 1
package.json

@@ -29,7 +29,7 @@
     "js-cookie": "2.2.0",
     "js-file-download": "^0.4.12",
     "jsonlint": "1.6.3",
-    "jszip": "3.2.1",
+    "lib-flexible": "^0.3.2",
     "lodash-es": "^4.17.20",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
@@ -65,6 +65,7 @@
     "eslint-plugin-vue": "6.2.2",
     "html-webpack-plugin": "3.2.0",
     "husky": "1.3.1",
+    "jszip": "^3.2.1",
     "lint-staged": "8.1.5",
     "plop": "2.3.0",
     "runjs": "4.3.2",

+ 2 - 1
public/index.html

@@ -3,8 +3,9 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+
     <!-- link rel="icon" href="<%= BASE_URL %>favicon.ico" -->
     <link rel="icon" href="favicon.jpg">
     <title><%= webpackConfig.name %></title>

+ 8 - 1
src/App.vue

@@ -5,8 +5,15 @@
 </template>
 
 <script>
+import { mapActions } from "vuex";
 export default {
-  name: 'App'
+  name: 'App',
+  methods: {
+    ...mapActions("user", ["loadDepartment"])
+  },
+  created() {
+     this.loadDepartment()
+  }
 }
 </script>
 

+ 16 - 0
src/api/user.js

@@ -8,3 +8,19 @@ export function getMyDepartmentList() {
     data: { }
   })
 }
+
+export function loadDepartmentList( data ) {
+  return request({
+    url: '/api/base/loadDepartmentList',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getDepartmentAccount( data ) {
+  return request({
+    url: '/api/base/getDepartmentAccount',
+    method: 'post',
+    data: data
+  })
+}

+ 1 - 5
src/assets/css/base.css

@@ -67,8 +67,4 @@
   .navfirst a{ background:#ffa200; display:block;}
 
   .sousuo{ height:37px; line-height:37px; background:#efefef; border-bottom:1px solid #e7e7e7; width:1000px; margin:0 auto;}
-  .sousuo h4{ margin-left:20px;}
-
-  .footer{ height:200px; margin: 20px auto 0;width: 1000px;}
-  .footer p{ text-align:center; color:#FFF; line-height:28px;}
-  .footer p a{ color:#FFF;}
+  .sousuo h4{ margin-left:20px;}

+ 1 - 0
src/icons/svg/bug.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M127.88 73.143c0 1.412-.506 2.635-1.518 3.669-1.011 1.033-2.209 1.55-3.592 1.55h-17.887c0 9.296-1.783 17.178-5.35 23.645l16.609 17.044c1.011 1.034 1.517 2.257 1.517 3.67 0 1.412-.506 2.635-1.517 3.668-.958 1.033-2.155 1.55-3.593 1.55-1.438 0-2.635-.517-3.593-1.55l-15.811-16.063a15.49 15.49 0 0 1-1.196 1.06c-.532.434-1.65 1.208-3.353 2.322a50.104 50.104 0 0 1-5.192 2.974c-1.758.87-3.94 1.658-6.546 2.364-2.607.706-5.189 1.06-7.748 1.06V47.044H58.89v73.062c-2.716 0-5.417-.367-8.106-1.102-2.688-.734-5.003-1.631-6.945-2.692a66.769 66.769 0 0 1-5.268-3.179c-1.571-1.057-2.73-1.94-3.476-2.65L33.9 109.34l-14.611 16.877c-1.066 1.14-2.344 1.711-3.833 1.711-1.277 0-2.422-.434-3.434-1.304-1.012-.978-1.557-2.187-1.635-3.627-.079-1.44.333-2.705 1.236-3.794l16.129-18.51c-3.087-6.197-4.63-13.644-4.63-22.342H5.235c-1.383 0-2.58-.517-3.592-1.55S.125 74.545.125 73.132c0-1.412.506-2.635 1.518-3.668 1.012-1.034 2.21-1.55 3.592-1.55h17.887V43.939L9.308 29.833c-1.012-1.033-1.517-2.256-1.517-3.669 0-1.412.505-2.635 1.517-3.668 1.012-1.034 2.21-1.55 3.593-1.55s2.58.516 3.593 1.55l13.813 14.106h67.396l13.814-14.106c1.012-1.034 2.21-1.55 3.592-1.55 1.384 0 2.581.516 3.593 1.55 1.012 1.033 1.518 2.256 1.518 3.668 0 1.413-.506 2.636-1.518 3.67l-13.814 14.105v23.975h17.887c1.383 0 2.58.516 3.593 1.55 1.011 1.033 1.517 2.256 1.517 3.668l-.005.01zM89.552 26.175H38.448c0-7.23 2.489-13.386 7.466-18.469C50.892 2.623 56.92.082 64 .082c7.08 0 13.108 2.541 18.086 7.624 4.977 5.083 7.466 11.24 7.466 18.469z"/></svg>

+ 1 - 0
src/icons/svg/chart.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 54.857h36.571V128H0V54.857zM91.429 27.43H128V128H91.429V27.429zM45.714 0h36.572v128H45.714V0z"/></svg>

+ 1 - 0
src/icons/svg/clipboard.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M54.857 118.857h64V73.143H89.143c-1.902 0-3.52-.668-4.855-2.002-1.335-1.335-2.002-2.954-2.002-4.855V36.57H54.857v82.286zM73.143 16v-4.571a2.2 2.2 0 0 0-.677-1.61 2.198 2.198 0 0 0-1.609-.676H20.571c-.621 0-1.158.225-1.609.676a2.198 2.198 0 0 0-.676 1.61V16a2.2 2.2 0 0 0 .676 1.61c.451.45.988.676 1.61.676h50.285c.622 0 1.158-.226 1.61-.677.45-.45.676-.987.676-1.609zm18.286 48h21.357L91.43 42.642V64zM128 73.143v48c0 1.902-.667 3.52-2.002 4.855-1.335 1.335-2.953 2.002-4.855 2.002H52.57c-1.901 0-3.52-.667-4.854-2.002-1.335-1.335-2.003-2.953-2.003-4.855v-11.429H6.857c-1.902 0-3.52-.667-4.855-2.002C.667 106.377 0 104.759 0 102.857v-96c0-1.902.667-3.52 2.002-4.855C3.337.667 4.955 0 6.857 0h77.714c1.902 0 3.52.667 4.855 2.002 1.335 1.335 2.003 2.953 2.003 4.855V30.29c1 .622 1.856 1.29 2.569 2.003l29.147 29.147c1.335 1.335 2.478 3.145 3.429 5.43.95 2.287 1.426 4.383 1.426 6.291v-.018z"/></svg>

+ 1 - 0
src/icons/svg/component.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h54.857v54.857H0V0zm0 73.143h54.857V128H0V73.143zm73.143 0H128V128H73.143V73.143zm27.428-18.286C115.72 54.857 128 42.577 128 27.43 128 12.28 115.72 0 100.571 0 85.423 0 73.143 12.28 73.143 27.429c0 15.148 12.28 27.428 27.428 27.428z"/></svg>

+ 1 - 0
src/icons/svg/documentation.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M71.984 44.815H115.9L71.984 9.642v35.173zM16.094.05h63.875l47.906 38.37v76.74c0 3.392-1.682 6.645-4.677 9.044-2.995 2.399-7.056 3.746-11.292 3.746H16.094c-4.236 0-8.297-1.347-11.292-3.746-2.995-2.399-4.677-5.652-4.677-9.044V12.84C.125 5.742 7.23.05 16.094.05zm71.86 102.32V89.58h-71.86v12.79h71.86zm23.952-25.58V64H16.094v12.79h95.812z"/></svg>

+ 1 - 0
src/icons/svg/drag.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M73.137 29.08h-9.209 29.7L63.886.093 34.373 29.08h20.49v27.035H27.238v17.948h27.625v27.133h18.274V74.063h27.41V56.115h-27.41V29.08zm-9.245 98.827l27.518-26.711H36.59l27.302 26.71zM.042 64.982l27.196 27.029V38.167L.042 64.982zm100.505-26.815V92.01l27.41-27.029-27.41-26.815z"/></svg>

+ 1 - 0
src/icons/svg/education.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M88.883 119.565c-7.284 0-19.434 2.495-21.333 8.25v.127c-4.232.13-5.222 0-7.108 0-1.895-5.76-14.045-8.256-21.333-8.256H0V0h42.523c9.179 0 17.109 5.47 21.47 13.551C68.352 5.475 76.295 0 85.478 0H128v119.57l-39.113-.005h-.004zM60.442 24.763c0-9.651-8.978-16.507-17.777-16.507H7.108V111.43H39.11c7.054-.14 18.177.082 21.333 6.12v-4.628c-.134-5.722-.004-13.522 0-13.832V27.413l.004-2.655-.004.005zm60.442-16.517h-35.55c-8.802 0-17.78 6.856-17.78 16.493v74.259c.004.32.138 8.115 0 13.813v4.627c3.155-6.022 14.279-6.26 21.333-6.114h32V8.25l-.003-.005z"/></svg>

+ 1 - 0
src/icons/svg/example.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M96.258 57.462h31.421C124.794 27.323 100.426 2.956 70.287.07v31.422a32.856 32.856 0 0 1 25.971 25.97zm-38.796-25.97V.07C27.323 2.956 2.956 27.323.07 57.462h31.422a32.856 32.856 0 0 1 25.97-25.97zm12.825 64.766v31.421c30.46-2.885 54.507-27.253 57.713-57.712H96.579c-2.886 13.466-13.146 23.726-26.292 26.291zM31.492 70.287H.07c2.886 30.46 27.253 54.507 57.713 57.713V96.579c-13.466-2.886-23.726-13.146-26.291-26.292z"/></svg>

+ 1 - 0
src/icons/svg/excel.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.208 16.576v8.384h38.72v5.376h-38.72v8.704h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.576h38.72v5.376h-38.72v8.512h38.72v5.376h-38.72v11.136H128v-94.72H78.208zM0 114.368L72.128 128V0L0 13.632v100.736z"/><path d="M28.672 82.56h-11.2l14.784-23.488-14.08-22.592h11.52l8.192 14.976 8.448-14.976h11.136l-14.08 22.208L58.368 82.56H46.656l-8.768-15.68z"/></svg>

+ 1 - 0
src/icons/svg/exit-fullscreen.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M49.217 41.329l-.136-35.24c-.06-2.715-2.302-4.345-5.022-4.405h-3.65c-2.712-.06-4.866 2.303-4.806 5.016l.152 19.164-24.151-23.79a6.698 6.698 0 0 0-9.499 0 6.76 6.76 0 0 0 0 9.526l23.93 23.713-18.345.074c-2.712-.069-5.228 1.813-5.64 5.02v3.462c.069 2.721 2.31 4.97 5.022 5.03l35.028-.207c.052.005.087.025.133.025l2.457.054a4.626 4.626 0 0 0 3.436-1.38c.88-.874 1.205-2.096 1.169-3.462l-.262-2.465c0-.048.182-.081.182-.136h.002zm52.523 51.212l18.32-.073c2.713.06 5.224-1.609 5.64-4.815v-3.462c-.068-2.722-2.317-4.97-5.021-5.04l-34.58.21c-.053 0-.086-.021-.138-.021l-2.451-.06a4.64 4.64 0 0 0-3.445 1.381c-.885.868-1.201 2.094-1.174 3.46l.27 2.46c.005.06-.177.095-.177.141l.141 34.697c.069 2.713 2.31 4.338 5.022 4.397l3.45.006c2.705.062 4.867-2.31 4.8-5.026l-.153-18.752 24.151 23.946a6.69 6.69 0 0 0 9.494 0 6.747 6.747 0 0 0 0-9.523L101.74 92.54v.001zM48.125 80.662a4.636 4.636 0 0 0-3.437-1.382l-2.457.06c-.05 0-.082.022-.137.022l-35.025-.21c-2.712.07-4.957 2.318-5.022 5.04v3.462c.409 3.206 2.925 4.874 5.633 4.814l18.554.06-24.132 23.928c-2.62 2.626-2.62 6.89 0 9.524a6.694 6.694 0 0 0 9.496 0l24.155-23.79-.155 18.866c-.06 2.722 2.094 5.093 4.801 5.025h3.65c2.72-.069 4.962-1.685 5.022-4.406l.141-34.956c0-.05-.182-.082-.182-.136l.262-2.46c.03-1.366-.286-2.592-1.166-3.46h-.001zM80.08 47.397a4.62 4.62 0 0 0 3.443 1.374l2.45-.054c.055 0 .088-.02.143-.028l35.08.21c2.712-.062 4.953-2.312 5.021-5.033l.009-3.463c-.417-3.211-2.937-5.084-5.64-5.025l-18.615-.073 23.917-23.715c2.63-2.623 2.63-6.879.008-9.513a6.691 6.691 0 0 0-9.494 0L92.251 26.016l.155-19.312c.065-2.713-2.097-5.085-4.802-5.025h-3.45c-2.713.069-4.954 1.693-5.022 4.406l-.139 35.247c0 .054.18.088.18.136l-.267 2.465c-.028 1.366.288 2.588 1.174 3.463v.001z"/></svg>

+ 1 - 0
src/icons/svg/eye-open.svg

@@ -0,0 +1 @@
+<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="128" height="128"><defs><style/></defs><path d="M512 128q69.675 0 135.51 21.163t115.498 54.997 93.483 74.837 73.685 82.006 51.67 74.837 32.17 54.827L1024 512q-2.347 4.992-6.315 13.483T998.87 560.17t-31.658 51.669-44.331 59.99-56.832 64.34-69.504 60.16-82.347 51.5-94.848 34.687T512 896q-69.675 0-135.51-21.163t-115.498-54.826-93.483-74.326-73.685-81.493-51.67-74.496-32.17-54.997L0 513.707q2.347-4.992 6.315-13.483t18.816-34.816 31.658-51.84 44.331-60.33 56.832-64.683 69.504-60.331 82.347-51.84 94.848-34.816T512 128.085zm0 85.333q-46.677 0-91.648 12.331t-81.152 31.83-70.656 47.146-59.648 54.485-48.853 57.686-37.675 52.821-26.325 43.99q12.33 21.674 26.325 43.52t37.675 52.351 48.853 57.003 59.648 53.845T339.2 767.02t81.152 31.488T512 810.667t91.648-12.331 81.152-31.659 70.656-46.848 59.648-54.186 48.853-57.344 37.675-52.651T927.957 512q-12.33-21.675-26.325-43.648t-37.675-52.65-48.853-57.345-59.648-54.186-70.656-46.848-81.152-31.659T512 213.334zm0 128q70.656 0 120.661 50.006T682.667 512 632.66 632.661 512 682.667 391.339 632.66 341.333 512t50.006-120.661T512 341.333zm0 85.334q-35.328 0-60.33 25.002T426.666 512t25.002 60.33T512 597.334t60.33-25.002T597.334 512t-25.002-60.33T512 426.666z"/></svg>

+ 1 - 0
src/icons/svg/eye.svg

@@ -0,0 +1 @@
+<svg width="128" height="64" xmlns="http://www.w3.org/2000/svg"><path d="M127.072 7.994c1.37-2.208.914-5.152-.914-6.87-2.056-1.717-4.797-1.226-6.396.982-.229.245-25.586 32.382-55.74 32.382-29.24 0-55.74-32.382-55.968-32.627-1.6-1.963-4.57-2.208-6.397-.49C-.17 3.086-.399 6.275 1.2 8.238c.457.736 5.94 7.36 14.62 14.72L4.17 35.96c-1.828 1.963-1.6 5.152.228 6.87.457.98 1.6 1.471 2.742 1.471s2.284-.49 3.198-1.472l12.564-13.983c5.94 4.416 13.021 8.587 20.788 11.53l-4.797 17.418c-.685 2.699.686 5.397 3.198 6.133h1.37c2.057 0 3.884-1.472 4.341-3.68L52.6 42.83c3.655.736 7.538 1.227 11.422 1.227 3.883 0 7.767-.49 11.422-1.227l4.797 17.173c.457 2.208 2.513 3.68 4.34 3.68.457 0 .914 0 1.143-.246 2.513-.736 3.883-3.434 3.198-6.133l-4.797-17.172c7.767-2.944 14.848-7.114 20.788-11.53l12.336 13.738c.913.981 2.056 1.472 3.198 1.472s2.284-.49 3.198-1.472c1.828-1.963 1.828-4.906.228-6.87l-11.65-13.001c9.366-7.36 14.849-14.474 14.849-14.474z"/></svg>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
src/icons/svg/form.svg


+ 1 - 0
src/icons/svg/fullscreen.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M38.47 52L52 38.462l-23.648-23.67L43.209 0H.035L0 43.137l14.757-14.865L38.47 52zm74.773 47.726L89.526 76 76 89.536l23.648 23.672L84.795 128h43.174L128 84.863l-14.757 14.863zM89.538 52l23.668-23.648L128 43.207V.038L84.866 0 99.73 14.76 76 38.472 89.538 52zM38.46 76L14.792 99.651 0 84.794v43.173l43.137.033-14.865-14.757L52 89.53 38.46 76z"/></svg>

+ 1 - 0
src/icons/svg/guide.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M1.482 70.131l36.204 16.18 69.932-65.485-61.38 70.594 46.435 18.735c1.119.425 2.397-.17 2.797-1.363v-.085L127.998.047 1.322 65.874c-1.12.597-1.519 1.959-1.04 3.151.32.511.72.937 1.2 1.107zm44.676 57.821L64.22 107.26l-18.062-7.834v28.527z"/></svg>

+ 1 - 0
src/icons/svg/icon.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M115.147.062a13 13 0 0 1 4.94.945c1.55.63 2.907 1.526 4.069 2.688a13.148 13.148 0 0 1 2.761 4.069c.678 1.55 1.017 3.245 1.017 5.086v102.3c0 3.681-1.187 6.733-3.56 9.155-2.373 2.422-5.352 3.633-8.937 3.633H12.992c-3.875 0-7-1.26-9.373-3.779-2.373-2.518-3.56-5.667-3.56-9.445V12.704c0-3.39 1.163-6.345 3.488-8.863C5.872 1.32 8.972.062 12.847.062h102.3zM81.434 109.047c1.744 0 3.003-.412 3.778-1.235.775-.824 1.163-1.914 1.163-3.27 0-1.26-.388-2.325-1.163-3.197-.775-.872-2.034-1.307-3.778-1.307H72.57c.097-.194.145-.485.145-.872V27.09h9.01c1.743 0 2.954-.436 3.633-1.308.678-.872 1.017-1.938 1.017-3.197 0-1.26-.34-2.325-1.017-3.197-.679-.872-1.89-1.308-3.633-1.308H46.268c-1.743 0-2.954.436-3.632 1.308-.678.872-1.018 1.938-1.018 3.197 0 1.26.34 2.325 1.018 3.197.678.872 1.889 1.308 3.632 1.308h8.138v72.075c0 .193.024.339.073.436.048.096.072.242.072.436H46.56c-1.744 0-3.003.435-3.778 1.307-.775.872-1.163 1.938-1.163 3.197 0 1.356.388 2.446 1.163 3.27.775.823 2.034 1.235 3.778 1.235h34.875z"/></svg>

+ 1 - 0
src/icons/svg/international.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M83.287 103.01c-1.57-3.84-6.778-10.414-15.447-19.548-2.327-2.444-2.182-4.306-1.338-9.862v-.64c.553-3.81 1.513-6.05 14.313-8.087 6.516-1.018 8.203 1.57 10.589 5.178l.785 1.193a12.625 12.625 0 0 0 6.43 5.207c1.134.524 2.53 1.164 4.421 2.24 4.596 2.53 4.596 5.41 4.596 11.753v.727a26.91 26.91 0 0 1-5.178 17.454 59.055 59.055 0 0 1-19.025 11.026c3.49-6.546.814-14.313 0-16.553l-.146-.087zM64 5.12a58.502 58.502 0 0 1 25.484 5.818 54.313 54.313 0 0 0-12.859 10.327c-.93 1.28-1.716 2.473-2.472 3.579-2.444 3.694-3.637 5.352-5.818 5.614a25.105 25.105 0 0 1-4.219 0c-4.276-.29-10.094-.64-11.956 4.422-1.193 3.23-1.396 11.956 2.444 16.495.66 1.077.778 2.4.32 3.578a7.01 7.01 0 0 1-2.066 3.229 18.938 18.938 0 0 1-2.909-2.91 18.91 18.91 0 0 0-8.32-6.603c-1.25-.349-2.647-.64-3.985-.93-3.782-.786-8.03-1.688-9.019-3.812a14.895 14.895 0 0 1-.727-5.818 21.935 21.935 0 0 0-1.396-9.25 8.873 8.873 0 0 0-5.557-4.946A58.705 58.705 0 0 1 64 5.12zM0 64c0 35.346 28.654 64 64 64 35.346 0 64-28.654 64-64 0-35.346-28.654-64-64-64C28.654 0 0 28.654 0 64z"/></svg>

+ 1 - 0
src/icons/svg/link.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M115.625 127.937H.063V12.375h57.781v12.374H12.438v90.813h90.813V70.156h12.374z"/><path d="M116.426 2.821l8.753 8.753-56.734 56.734-8.753-8.745z"/><path d="M127.893 37.982h-12.375V12.375H88.706V0h39.187z"/></svg>

+ 1 - 0
src/icons/svg/list.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M1.585 12.087c0 6.616 3.974 11.98 8.877 11.98 4.902 0 8.877-5.364 8.877-11.98 0-6.616-3.975-11.98-8.877-11.98-4.903 0-8.877 5.364-8.877 11.98zM125.86.107H35.613c-1.268 0-2.114 1.426-2.114 2.852v18.255c0 1.712 1.057 2.853 2.114 2.853h90.247c1.268 0 2.114-1.426 2.114-2.853V2.96c0-1.711-1.057-2.852-2.114-2.852zM.106 62.86c0 6.615 3.974 11.979 8.876 11.979 4.903 0 8.877-5.364 8.877-11.98 0-6.616-3.974-11.98-8.877-11.98-4.902 0-8.876 5.364-8.876 11.98zM124.17 50.88H33.921c-1.268 0-2.114 1.425-2.114 2.851v18.256c0 1.711 1.057 2.852 2.114 2.852h90.247c1.268 0 2.114-1.426 2.114-2.852V53.73c0-1.426-.846-2.852-2.114-2.852zM.106 115.913c0 6.616 3.974 11.98 8.876 11.98 4.903 0 8.877-5.364 8.877-11.98 0-6.616-3.974-11.98-8.877-11.98-4.902 0-8.876 5.364-8.876 11.98zm124.064-11.98H33.921c-1.268 0-2.114 1.426-2.114 2.853v18.255c0 1.711 1.057 2.852 2.114 2.852h90.247c1.268 0 2.114-1.426 2.114-2.852v-18.255c0-1.427-.846-2.853-2.114-2.853z"/></svg>

+ 1 - 0
src/icons/svg/lock.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M119.88 49.674h-7.987V39.52C111.893 17.738 90.45.08 63.996.08 37.543.08 16.1 17.738 16.1 39.52v10.154H8.113c-4.408 0-7.987 2.94-7.987 6.577v65.13c0 3.637 3.57 6.577 7.987 6.577H119.88c4.407 0 7.987-2.94 7.987-6.577v-65.13c-.008-3.636-3.58-6.577-7.987-6.577zm-23.953 0H32.065V39.52c0-14.524 14.301-26.295 31.931-26.295 17.63 0 31.932 11.777 31.932 26.295v10.153z"/></svg>

+ 1 - 0
src/icons/svg/message.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 20.967v59.59c0 11.59 8.537 20.966 19.075 20.966h28.613l1 26.477L76.8 101.523h32.125c10.538 0 19.075-9.377 19.075-20.966v-59.59C128 9.377 119.463 0 108.925 0h-89.85C8.538 0 0 9.377 0 20.967zm82.325 33.1c0-5.524 4.013-9.935 9.037-9.935 5.026 0 9.038 4.41 9.038 9.934 0 5.524-4.025 9.934-9.038 9.934-5.024 0-9.037-4.41-9.037-9.934zm-27.613 0c0-5.524 4.013-9.935 9.038-9.935s9.037 4.41 9.037 9.934c0 5.524-4.025 9.934-9.037 9.934-5.025 0-9.038-4.41-9.038-9.934zm-27.1 0c0-5.524 4.013-9.935 9.038-9.935s9.038 4.41 9.038 9.934c0 5.524-4.026 9.934-9.05 9.934-5.013 0-9.025-4.41-9.025-9.934z"/></svg>

+ 1 - 0
src/icons/svg/money.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M54.122 127.892v-28.68H7.513V87.274h46.609v-12.4H7.513v-12.86h38.003L.099 0h22.6l32.556 45.07c3.617 5.144 6.44 9.611 8.487 13.385 1.788-3.05 4.89-7.779 9.301-14.186L103.93 0h24.01L82.385 62.013h38.34v12.862h-46.41v12.4h46.41v11.937h-46.41v28.68H54.123z"/></svg>

+ 1 - 0
src/icons/svg/nested.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M.002 9.2c0 5.044 3.58 9.133 7.998 9.133 4.417 0 7.997-4.089 7.997-9.133 0-5.043-3.58-9.132-7.997-9.132S.002 4.157.002 9.2zM31.997.066h95.981V18.33H31.997V.066zm0 45.669c0 5.044 3.58 9.132 7.998 9.132 4.417 0 7.997-4.088 7.997-9.132 0-3.263-1.524-6.278-3.998-7.91-2.475-1.63-5.524-1.63-7.998 0-2.475 1.632-4 4.647-4 7.91zM63.992 36.6h63.986v18.265H63.992V36.6zm-31.995 82.2c0 5.043 3.58 9.132 7.998 9.132 4.417 0 7.997-4.089 7.997-9.132 0-5.044-3.58-9.133-7.997-9.133s-7.998 4.089-7.998 9.133zm31.995-9.131h63.986v18.265H63.992V109.67zm0-27.404c0 5.044 3.58 9.133 7.998 9.133 4.417 0 7.997-4.089 7.997-9.133 0-3.263-1.524-6.277-3.998-7.909-2.475-1.631-5.524-1.631-7.998 0-2.475 1.632-4 4.646-4 7.91zm31.995-9.13h31.991V91.4H95.987V73.135z"/></svg>

+ 1 - 0
src/icons/svg/password.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M108.8 44.322H89.6v-5.36c0-9.04-3.308-24.163-25.6-24.163-23.145 0-25.6 16.881-25.6 24.162v5.361H19.2v-5.36C19.2 15.281 36.798 0 64 0c27.202 0 44.8 15.281 44.8 38.961v5.361zm-32 39.356c0-5.44-5.763-9.832-12.8-9.832-7.037 0-12.8 4.392-12.8 9.832 0 3.682 2.567 6.808 6.407 8.477v11.205c0 2.718 2.875 4.962 6.4 4.962 3.524 0 6.4-2.244 6.4-4.962V92.155c3.833-1.669 6.393-4.795 6.393-8.477zM128 64v49.201c0 8.158-8.645 14.799-19.2 14.799H19.2C8.651 128 0 121.359 0 113.201V64c0-8.153 8.645-14.799 19.2-14.799h89.6c10.555 0 19.2 6.646 19.2 14.799z"/></svg>

+ 1 - 0
src/icons/svg/people.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M104.185 95.254c8.161 7.574 13.145 17.441 13.145 28.28 0 1.508-.098 2.998-.285 4.466h-10.784c.238-1.465.403-2.948.403-4.465 0-8.983-4.36-17.115-11.419-23.216C86 104.66 75.355 107.162 64 107.162c-11.344 0-21.98-2.495-31.22-6.83-7.064 6.099-11.444 14.218-11.444 23.203 0 1.517.165 3 .403 4.465H10.955a35.444 35.444 0 0 1-.285-4.465c0-10.838 4.974-20.713 13.127-28.291C9.294 85.42.003 70.417.003 53.58.003 23.99 28.656.001 64 .001s63.997 23.988 63.997 53.58c0 16.842-9.299 31.85-23.812 41.673zM64 36.867c-29.454 0-53.33-10.077-53.33 15.342 0 25.418 23.876 46.023 53.33 46.023 29.454 0 53.33-20.605 53.33-46.023 0-25.419-23.876-15.342-53.33-15.342zm24.888 25.644c-3.927 0-7.111-2.665-7.111-5.953 0-3.288 3.184-5.954 7.11-5.954 3.928 0 7.111 2.666 7.111 5.954s-3.183 5.953-7.11 5.953zm-3.556 16.372c0 4.11-9.55 7.442-21.332 7.442-11.781 0-21.332-3.332-21.332-7.442 0-1.06.656-2.064 1.8-2.976 3.295 2.626 10.79 4.465 19.532 4.465 8.743 0 16.237-1.84 19.531-4.465 1.145.912 1.801 1.916 1.801 2.976zm-46.22-16.372c-3.927 0-7.11-2.665-7.11-5.953 0-3.288 3.183-5.954 7.11-5.954 3.927 0 7.111 2.666 7.111 5.954s-3.184 5.953-7.11 5.953z"/></svg>

+ 1 - 0
src/icons/svg/peoples.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M95.648 118.762c0 5.035-3.563 9.121-7.979 9.121H7.98c-4.416 0-7.979-4.086-7.979-9.121C0 100.519 15.408 83.47 31.152 76.75c-9.099-6.43-15.216-17.863-15.216-30.987v-9.128c0-20.16 14.293-36.518 31.893-36.518s31.894 16.358 31.894 36.518v9.122c0 13.137-6.123 24.556-15.216 30.993 15.738 6.726 31.141 23.769 31.141 42.012z"/><path d="M106.032 118.252h15.867c3.376 0 6.101-3.125 6.101-6.972 0-13.957-11.787-26.984-23.819-32.123 6.955-4.919 11.638-13.66 11.638-23.704v-6.985c0-15.416-10.928-27.926-24.39-27.926-1.674 0-3.306.193-4.89.561 1.936 4.713 3.018 9.974 3.018 15.526v9.121c0 13.137-3.056 23.111-11.066 30.993 14.842 4.41 27.312 23.42 27.541 41.509z"/></svg>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
src/icons/svg/qq.svg


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
src/icons/svg/shopping.svg


+ 1 - 0
src/icons/svg/size.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M0 54.857h54.796v18.286H36.531V128H18.265V73.143H0V54.857zm127.857-36.571H91.935V128H72.456V18.286H36.534V0h91.326l-.003 18.286z"/></svg>

+ 1 - 0
src/icons/svg/skill.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M31.652 93.206h33.401c1.44 2.418 3.077 4.663 4.93 6.692h-38.33v-6.692zm0-10.586h28.914a44.8 44.8 0 0 1-1.264-6.688h-27.65v6.688zm0-17.27H59.39c.288-2.286.714-4.532 1.34-6.687H31.65v6.687h.003zm53.913 44.84v5.85c0 2.798-2.095 5.075-4.667 5.075h-70.07c-2.576 0-4.663-2.277-4.663-5.075V31.26l23.22-20.96v22.25H17.16v6.688h18.39V6.688h45.348c2.576 0 4.667 2.277 4.667 5.066v20.009c1.987-.675 4.053-1.128 6.17-1.445v-18.56C91.738 5.28 86.874 0 80.902 0H31.15L0 28.118v87.917c0 6.48 4.859 11.759 10.832 11.759h70.07c5.974 0 10.837-5.27 10.837-11.759v-4.41c-2.117-.312-4.183-.765-6.17-1.435h-.004zM23.279 58.667h-7.96v6.688h7.96v-6.688zm-7.956 41.23h7.96v-6.691h-7.96v6.692zm7.956-23.96h-7.96v6.687h7.96v-6.688zm89.718-15.042l-4.896-4.07-12.447 17.613-11.19-9.305-3.762 5.311 16.091 13.38 16.204-22.929zM128 70.978c0-18.632-13.97-33.782-31.147-33.782-17.168 0-31.135 15.155-31.135 33.782 0 18.628 13.97 33.783 31.135 33.783 17.172 0 31.143-15.15 31.143-33.783H128zm-6.17 0c0 14.933-11.203 27.1-24.981 27.1-13.77 0-24.987-12.158-24.987-27.1 0-14.941 11.195-27.099 24.987-27.099 13.778 0 24.982 12.158 24.982 27.1z"/></svg>

+ 1 - 0
src/icons/svg/tab.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.921.052H49.08c-1.865 0-3.198 1.599-3.198 3.464v6.661c0 1.865 1.6 3.464 3.198 3.464h29.84c1.865 0 3.198-1.599 3.198-3.464V3.516C82.385 1.65 80.786.052 78.92.052zm45.563 0H94.642c-1.865 0-3.464 1.599-3.464 3.464v6.661c0 1.865 1.599 3.464 3.464 3.464h29.842c1.865-.266 3.464-1.599 3.464-3.464V3.516c0-1.865-1.599-3.464-3.464-3.464zm0 22.382H40.02c-1.866 0-3.464-1.599-3.464-3.464V3.516c0-1.865-1.599-3.464-3.464-3.464H3.516C1.65.052.052 1.651.052 3.516V124.75c0 1.598 1.599 3.197 3.464 3.197h120.968c1.865 0 3.464-1.599 3.464-3.464V25.898c0-1.865-1.599-3.464-3.464-3.464z"/></svg>

+ 1 - 0
src/icons/svg/table.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M.006.064h127.988v31.104H.006V.064zm0 38.016h38.396v41.472H.006V38.08zm0 48.384h38.396v41.472H.006V86.464zM44.802 38.08h38.396v41.472H44.802V38.08zm0 48.384h38.396v41.472H44.802V86.464zM89.598 38.08h38.396v41.472H89.598zm0 48.384h38.396v41.472H89.598z"/><path d="M.006.064h127.988v31.104H.006V.064zm0 38.016h38.396v41.472H.006V38.08zm0 48.384h38.396v41.472H.006V86.464zM44.802 38.08h38.396v41.472H44.802V38.08zm0 48.384h38.396v41.472H44.802V86.464zM89.598 38.08h38.396v41.472H89.598zm0 48.384h38.396v41.472H89.598z"/></svg>

+ 1 - 0
src/icons/svg/theme.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M125.5 36.984L95.336 2.83C93.735 1.018 91.565 0 89.3 0c-2.263 0-4.433 1.018-6.033 2.83l-3.786 4.286c-1.6 1.812-3.77 2.83-6.032 2.831H54.553c-2.263 0-4.434-1.018-6.033-2.83L44.734 2.83C43.134 1.018 40.964 0 38.701 0c-2.263 0-4.434 1.018-6.034 2.83L2.5 36.984C.9 38.796 0 41.254 0 43.815c0 2.562.899 5.02 2.5 6.831L14.565 64.31c2.178 2.468 5.367 3.403 8.33 2.444 1.35-.435 2.709.592 2.709 2.18v49.407c0 5.313 3.84 9.66 8.532 9.66h59.726c4.693 0 8.532-4.347 8.532-9.66V68.934c0-1.59 1.36-2.616 2.71-2.181 2.962.96 6.15.024 8.329-2.444L125.5 50.646c1.6-1.811 2.499-4.269 2.499-6.83 0-2.563-.899-5.02-2.5-6.832z"/></svg>

+ 1 - 0
src/icons/svg/tree-table.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M44.8 0h79.543C126.78 0 128 1.422 128 4.267v23.466c0 2.845-1.219 4.267-3.657 4.267H44.8c-2.438 0-3.657-1.422-3.657-4.267V4.267C41.143 1.422 42.362 0 44.8 0zm22.857 48h56.686c2.438 0 3.657 1.422 3.657 4.267v23.466c0 2.845-1.219 4.267-3.657 4.267H67.657C65.22 80 64 78.578 64 75.733V52.267C64 49.422 65.219 48 67.657 48zm0 48h56.686c2.438 0 3.657 1.422 3.657 4.267v23.466c0 2.845-1.219 4.267-3.657 4.267H67.657C65.22 128 64 126.578 64 123.733v-23.466C64 97.422 65.219 96 67.657 96zM50.286 68.267c2.02 0 3.657-1.91 3.657-4.267 0-2.356-1.638-4.267-3.657-4.267H17.37V32h6.4c2.02 0 3.658-1.91 3.658-4.267V4.267C27.429 1.91 25.79 0 23.77 0H3.657C1.637 0 0 1.91 0 4.267v23.466C0 30.09 1.637 32 3.657 32h6.4v80c0 2.356 1.638 4.267 3.657 4.267h36.572c2.02 0 3.657-1.91 3.657-4.267 0-2.356-1.638-4.267-3.657-4.267H17.37V68.267h32.915z"/></svg>

+ 1 - 0
src/icons/svg/tree.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M126.713 90.023c.858.985 1.287 2.134 1.287 3.447v29.553c0 1.423-.429 2.6-1.287 3.53-.858.93-1.907 1.395-3.146 1.395H97.824c-1.145 0-2.146-.465-3.004-1.395-.858-.93-1.287-2.107-1.287-3.53V93.47c0-.875.19-1.696.572-2.462.382-.766.906-1.368 1.573-1.806a3.84 3.84 0 0 1 2.146-.657h9.725V69.007a3.84 3.84 0 0 0-.43-1.806 3.569 3.569 0 0 0-1.143-1.313 2.714 2.714 0 0 0-1.573-.492h-36.47v23.149h9.725c1.144 0 2.145.492 3.004 1.478.858.985 1.287 2.134 1.287 3.447v29.553c0 .876-.191 1.696-.573 2.463-.38.766-.905 1.368-1.573 1.806a3.84 3.84 0 0 1-2.145.656H51.915a3.84 3.84 0 0 1-2.145-.656c-.668-.438-1.216-1.04-1.645-1.806a4.96 4.96 0 0 1-.644-2.463V93.47c0-1.313.43-2.462 1.288-3.447.858-.986 1.907-1.478 3.146-1.478h9.582v-23.15h-37.9c-.953 0-1.74.356-2.359 1.068-.62.711-.93 1.56-.93 2.544v19.538h9.726c1.239 0 2.264.492 3.074 1.478.81.985 1.216 2.134 1.216 3.447v29.553c0 1.423-.405 2.6-1.216 3.53-.81.93-1.835 1.395-3.074 1.395H4.29c-.476 0-.93-.082-1.358-.246a4.1 4.1 0 0 1-1.144-.657 4.658 4.658 0 0 1-.93-1.067 5.186 5.186 0 0 1-.643-1.395 5.566 5.566 0 0 1-.215-1.56V93.47c0-.437.048-.875.143-1.313a3.95 3.95 0 0 1 .429-1.15c.19-.328.429-.656.715-.984.286-.329.572-.602.858-.821.286-.22.62-.383 1.001-.493.382-.11.763-.164 1.144-.164h9.726V61.619c0-.985.31-1.833.93-2.544.619-.712 1.358-1.068 2.216-1.068h44.335V39.62h-9.582c-1.24 0-2.288-.492-3.146-1.477a5.09 5.09 0 0 1-1.287-3.448V5.14c0-1.423.429-2.627 1.287-3.612.858-.985 1.907-1.477 3.146-1.477h25.743c.763 0 1.478.246 2.145.739a5.17 5.17 0 0 1 1.573 1.888c.382.766.573 1.587.573 2.462v29.553c0 1.313-.43 2.463-1.287 3.448-.859.985-1.86 1.477-3.004 1.477h-9.725v18.389h42.762c.954 0 1.74.355 2.36 1.067.62.711.93 1.56.93 2.545v26.925h9.582c1.239 0 2.288.492 3.146 1.478z"/></svg>

+ 1 - 0
src/icons/svg/user.svg

@@ -0,0 +1 @@
+<svg width="130" height="130" xmlns="http://www.w3.org/2000/svg"><path d="M63.444 64.996c20.633 0 37.359-14.308 37.359-31.953 0-17.649-16.726-31.952-37.359-31.952-20.631 0-37.36 14.303-37.358 31.952 0 17.645 16.727 31.953 37.359 31.953zM80.57 75.65H49.434c-26.652 0-48.26 18.477-48.26 41.27v2.664c0 9.316 21.608 9.325 48.26 9.325H80.57c26.649 0 48.256-.344 48.256-9.325v-2.663c0-22.794-21.605-41.271-48.256-41.271z" stroke="#979797"/></svg>

+ 1 - 0
src/icons/svg/wechat.svg

@@ -0,0 +1 @@
+<svg width="128" height="110" xmlns="http://www.w3.org/2000/svg"><path d="M86.635 33.334c1.467 0 2.917.113 4.358.283C87.078 14.392 67.58.111 45.321.111 20.44.111.055 17.987.055 40.687c0 13.104 6.781 23.863 18.115 32.209l-4.527 14.352 15.82-8.364c5.666 1.182 10.207 2.395 15.858 2.395 1.42 0 2.829-.073 4.227-.189-.886-3.19-1.398-6.53-1.398-9.996 0-20.845 16.98-37.76 38.485-37.76zm-24.34-12.936c3.407 0 5.665 2.363 5.665 5.954 0 3.576-2.258 5.97-5.666 5.97-3.392 0-6.795-2.395-6.795-5.97 0-3.591 3.403-5.954 6.795-5.954zM30.616 32.323c-3.393 0-6.818-2.395-6.818-5.971 0-3.591 3.425-5.954 6.818-5.954 3.392 0 5.65 2.363 5.65 5.954 0 3.576-2.258 5.97-5.65 5.97z"/><path d="M127.945 70.52c0-19.075-18.108-34.623-38.448-34.623-21.537 0-38.5 15.548-38.5 34.623 0 19.108 16.963 34.622 38.5 34.622 4.508 0 9.058-1.2 13.584-2.395l12.414 7.167-3.404-11.923c9.087-7.184 15.854-16.712 15.854-27.471zm-50.928-5.97c-2.254 0-4.53-2.362-4.53-4.773 0-2.378 2.276-4.771 4.53-4.771 3.422 0 5.665 2.393 5.665 4.771 0 2.41-2.243 4.773-5.665 4.773zm24.897 0c-2.24 0-4.498-2.362-4.498-4.773 0-2.378 2.258-4.771 4.498-4.771 3.392 0 5.665 2.393 5.665 4.771 0 2.41-2.273 4.773-5.665 4.773z"/></svg>

+ 1 - 0
src/icons/svg/zip.svg

@@ -0,0 +1 @@
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><path d="M78.527 116.793c.178.008.348.024.527.024h40.233c4.711-.005 8.53-3.677 8.534-8.21V18.895c-.004-4.532-3.823-8.204-8.534-8.209H79.054c-.179 0-.353.016-.527.024V0L0 10.082v107.406l78.527 10.342v-11.037zm0-101.362c.174-.024.348-.052.527-.052h40.233c2.018 0 3.659 1.578 3.659 3.52v89.713c-.003 1.942-1.64 3.517-3.659 3.519H79.054c-.179 0-.353-.028-.527-.052V15.431zM30.262 75.757l-18.721-.46V72.37l11.3-16.673v-.148l-10.266.164v-4.51l17.504-.44v3.264L18.696 70.76v.144l11.566.176v4.678zm9.419.231l-5.823-.144V50.671l5.823-.144v25.461zm22.255-11.632c-2.168 1.922-5.353 2.76-9.02 2.736-.702.004-1.402-.04-2.097-.131v9.303l-5.997-.148V50.743c1.852-.352 4.473-.647 8.218-.743 3.838-.096 6.608.539 8.48 1.913 1.807 1.306 3.032 3.5 3.032 6.112s-.926 4.833-2.612 6.331h-.004zM53.36 54.45c-.856-.01-1.71.083-2.541.275v7.682c.523.116 1.167.152 2.06.152 3.301-.004 5.36-1.614 5.36-4.314 0-2.425-1.772-3.843-4.875-3.791l-.004-.004zm39.847-37.066h9.564v3.795h-9.564v-3.795zm-9.568 5.68h9.564v3.8h-9.564v-3.8zm9.568 6.216h9.564v3.799h-9.564V29.28zm0 12h9.564v3.794h-9.564V41.28zm-9.568-6.096h9.564v3.795h-9.564v-3.795zm9.472 47.064c2.512 0 4.921-.96 6.697-2.67 1.776-1.708 2.773-4.026 2.772-6.442l-1.748-15.263c0-5.033-2.492-9.112-7.725-9.112-5.232 0-7.72 4.079-7.72 9.112l-1.752 15.263c-.001 2.417.996 4.735 2.773 6.444 1.777 1.71 4.187 2.669 6.7 2.668h.003zm-3.135-16.75h6.27v12.743h-6.27V65.5z"/></svg>

+ 1 - 0
src/main.js

@@ -16,6 +16,7 @@ import './permission' // permission control
 import './utils/error-log' // error log
 import Bus from '@/utils/bus.js'
 import ElementUI from 'element-ui';
+import 'lib-flexible/flexible'
 Vue.use(ElementUI);
 Vue.component(ElementUI.Message)
 

+ 14 - 85
src/pages/data/data.js

@@ -5,90 +5,9 @@ import {
   getDownloadArticalList
 } from '@/api/article'
 
-const departs = [{
-    "department_id": "47",
-    "department": "交易中心"
-  },
-  {
-    "department_id": "49",
-    "department": "人事科"
-  },
-  {
-    "department_id": "51",
-    "department": "人才中心"
-  },
-  {
-    "department_id": "53",
-    "department": "住房保障中心"
-  },
-  {
-    "department_id": "55",
-    "department": "党办"
-  },
-  {
-    "department_id": "57",
-    "department": "办公室"
-  },
-  {
-    "department_id": "59",
-    "department": "图审中心"
-  },
-  {
-    "department_id": "61",
-    "department": "城建科"
-  },
-  {
-    "department_id": "63",
-    "department": "审批科"
-  },
-  {
-    "department_id": "65",
-    "department": "建筑业"
-  },
-  {
-    "department_id": "67",
-    "department": "房产保障科"
-  },
-  {
-    "department_id": "69",
-    "department": "房屋征收中心"
-  },
-  {
-    "department_id": "71",
-    "department": "法规科"
-  },
-  {
-    "department_id": "73",
-    "department": "消防中心"
-  },
-  {
-    "department_id": "75",
-    "department": "燃管站"
-  },
-  {
-    "department_id": "77",
-    "department": "节水站"
-  },
-  {
-    "department_id": "79",
-    "department": "财务中心"
-  },
-  {
-    "department_id": "81",
-    "department": "质安站"
-  },
-  {
-    "department_id": "83",
-    "department": "造价站"
-  },
-  {
-    "department_id": "85",
-    "department": "项目中心"
-  }
-];
 
 export default {
-  departs,
+  departs:[],
   categorys: {
     laws: "法律法规",
     mechanism: "机制制度类",
@@ -101,17 +20,27 @@ export default {
     2: '负责人',
     3: '分管领导'
   },
-  getDepart: (id)=> {
+  getDepart: (id, departs)=> {
     for (let i in departs) {
-      if (departs[i].department_id == id) {
+      if (departs[i].departmentId == id) {
         return departs[i]
       }
     }
     return {
-      department_id: 0,
+      departmentId: id,
+      isLeader:0,
       department: ''
     }
   },
+  getLeader:( departmentId, departs)=>{
+    let isLeader = 0;
+    for( let i in departs){
+      if( departs[i].departmentId == departmentId){
+        isLeader = departs[i].isLeader;
+      }
+    }
+    return isLeader
+  },
   myfiles: [{
     id: "1",
     value: '我发布的文件',

+ 59 - 9
src/pages/other/apply-list.vue

@@ -2,9 +2,41 @@
   <div class="main">
     <div class="main-body">
       <el-card class="box-card">
-        <div slot="header" class="clearfix" >
-          <span>申请记录</span>
-        </div>
+         <div slot="header" class="clearfix" >
+            <el-form :inline="true" :model="searchInfo" class="demo-form-inline">
+              <el-form-item label="选择部门">
+                <el-select v-model="searchInfo.department" collapse-tags placeholder="请选择"  clearable>
+                  <div class="el-input" style="width:90%;margin-left:5%;">
+                    <input type="text" placeholder="请输入" class="el-input__inner" v-model="dropDownValue">
+                  </div>
+                  <el-option
+                  v-for="(item,index) in userDepartments"
+                  :value="item.departmentId"
+                  v-show="item.isLeader>1"
+                  @click.native="selectDepartment(item)"
+                  :key="index"
+                  :label="item.department"></el-option>
+                </el-select>
+
+              </el-form-item>
+
+              <el-form-item label="选择分类">
+                <el-select v-model="searchInfo.category" collapse-tags placeholder="请选择"  clearable>
+                  <el-option v-for="(item,index) in categorys"
+                  :value="index" :key="index" :label="item"></el-option>
+                </el-select>
+              </el-form-item>
+
+              <el-form-item label="文件标题">
+                <el-input placeholder="" v-model="searchInfo.keyword" clearable></el-input>
+              </el-form-item>
+
+
+              <el-form-item>
+                <el-button @click="getApplyArticalList" type="primary">搜索</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
 
         <el-table :data="restaurants"  border stripe>
           <el-table-column label="序号" width="50" prop="id" align="center">
@@ -16,7 +48,7 @@
           </el-table-column>
 
           <el-table-column label="申请时间" min-width="110" prop="createAt">
-            <template slot-scope="{row, $index}">
+            <template slot-scope="{row}">
               <span> {{row.createAt|toDatetime}}</span>
             </template>
           </el-table-column>
@@ -90,8 +122,8 @@ import IHeader from "./components/IHeader";
 import IFooter from "./components/IFooter";
 import glIcon from '@/icons/img/2016smyjj_gl_icon.jpg'
 import data  from '../data/data.js'
-import {replyArtical,getArticalList,getApplyArticalList}  from '@/api/article'
-
+import {replyArtical,getApplyArticalList}  from '@/api/article'
+import { mapGetters } from "vuex";
 import {toDatetime} from '@/utils/date.js'
 
 export default {
@@ -102,13 +134,15 @@ export default {
   },
   data() {
     return {
+      categorys: data.categorys,
       dialogFormVisible: false,
       glIcon: glIcon,
       list: data.departs,
       total: 0,
       page:1,
       pageSize: 10,
-      searchDepartId: "",
+      searchInfo:{},
+      departmentId: 0,
       restaurants: [],
       state3: '',
       form:{},
@@ -118,6 +152,15 @@ export default {
       isShowMore: false
     }
   },
+  watch:{
+    "searchInfo.category"(val){
+      this.page = 1
+      this.getApplyArticalList()
+    }
+  },
+   computed: {
+  	...mapGetters("user", ["userDepartments"])
+  },
   mounted() {
     this.getApplyArticalList();
   },
@@ -132,6 +175,11 @@ export default {
     toDatetime
   },
   methods: {
+    selectDepartment(item){
+      this.departmentId = item.departmentId
+      this.page = 1
+      this.getApplyArticalList()
+    },
     handleSizeChange(size){
       this.pageSize = size
       this.getApplyArticalList()
@@ -167,8 +215,10 @@ export default {
 
     },
     getApplyArticalList() {
-      let {page,pageSize} = this
-      getApplyArticalList( {page,pageSize}  ).then( res=>{
+      let {page,pageSize, departmentId} = this
+      let param = {page,pageSize, departmentId}
+      Object.assign( param , this.searchInfo)
+      getApplyArticalList( param  ).then( res=>{
         this.restaurants = res.data.list
         this.total = res.data.total
         console.log("getHotArticalList", res)

+ 3 - 3
src/pages/other/components/IArtical.vue

@@ -1,7 +1,7 @@
 <template>
   <el-card class="mt20">
     <div slot="header" class="clearfix">
-      <span>{{department}} {{department?'-':''}} {{categorys[type]}}</span>
+      <span>{{department.department}} {{department.department?'-':''}} {{categorys[type]}}</span>
       <el-button class="more-btn" type="text" @click="$emit('return')" v-if="more"><<返回</el-button>
       <el-button class="more-btn" type="text" @click="handleOpenMore(type)" v-else>更多>></el-button>
     </div>
@@ -34,8 +34,8 @@
   export default {
     props: {
       department: {
-        type: String,
-        default: ''
+        type: Object,
+        default: ()=>{department:''}
       },
       type:{
         type: String,

+ 26 - 46
src/pages/other/components/IFooter.vue

@@ -1,10 +1,15 @@
 <template>
-  <div style="position: absolute;left: 0;right: 0;background:#0078c7; ">
+  <div class="">
     <div class="footer">
-      <div class="jc fl" style="width: 110px;height: 55px;position: absolute;left: 240px;margin-top: 40px;">
-        <span id="_span_jiucuo"><img onclick="Link('3504000033')" style="margin:0;border:0;cursor: pointer;"
-                                     src="https://zfwzgl.www.gov.cn/exposure/images/jiucuo.png?v=3504000033"></span>
+
+      <div class="jc fl" style="width: 100px;height: 55px;position: absolute;left: 240px;margin-top: 40px;">
+        <span>
+          
+          <img style="margin:0;border:0;cursor: pointer;"
+                                     src="https://zfwzgl.www.gov.cn/exposure/images/jiucuo.png?v=3504000033">
+        </span>
       </div>
+
       <div class="footer_con fl" style="width: 100%;">
         <p class="pad-T20"><a href="javascript:setHome(window.location);">设为首页</a> |<a
           href="javascript:addFav(window.location, document.title);"> 加入收藏 </a>| <a href="http://zjj.sm.gov.cn/bzzx/lxwm/"
@@ -19,8 +24,8 @@
         <p><a target="_blank" href="http://beian.miit.gov.cn">备案号:闽ICP备07023322号</a>
           <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=35040302610014">
             <img src="http://zjj.sm.gov.cn/images/20170818_smszf_gabalogo.png" style="padding-bottom: 3px;">闽公网安备35040302610014号</a></p>
-        <p>您是第 <span>2805481</span> 位访问本站嘉宾</p>
       </div>
+
       <div class="dzjg fl" style="width: 80px;height: 80px;position: absolute;right: 240px;margin-top: 30px;">
         <span id="_ideConac">
           <a href="https://bszs.conac.cn/sitename?method=show&amp;id=078FD35C8A7829B9E053012819AC452C" target="_blank">
@@ -37,47 +42,7 @@
   export default {
     data() {
       return {
-        SearchList: [],
-        searchInfo: '',
-        timeout: null
-      }
-    },
-    methods: {
-      loadAll() {
-        return [
-          { 'value': '测试数据1' },
-          { 'value': '测试数据2' },
-          { 'value': '测试数据3' },
-          { 'value': '测试数据4' },
-          { 'value': '测试数据5' },
-          { 'value': '测试数据6' },
-          { 'value': '测试数据7' },
-          { 'value': '测试数据8' },
-          { 'value': '测试数据9' },
-          { 'value': '测试数据10' },
-          { 'value': '测试数据11' }
-        ]
-      },
-      querySearchAsync(queryString, cb) {
-        var SearchList = this.SearchList
-        var results = queryString ? SearchList.filter(this.createStateFilter(queryString)) : SearchList
-
-        clearTimeout(this.timeout)
-        this.timeout = setTimeout(() => {
-          cb(results)
-        }, 1000 * Math.random())
-      },
-      createStateFilter(queryString) {
-        return (state) => {
-          return (state.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
-        }
-      },
-      handleSelect(item) {
-        console.log(item)
       }
-    },
-    mounted() {
-      this.SearchList = this.loadAll()
     }
   }
 </script>
@@ -85,5 +50,20 @@
 <style lang="scss" scoped>
   .el-button + .el-button {
     margin-left: 5px;
-  }
+  }  
+  
+  .footer{ 
+    position: absolute;
+    left: 0;
+    right: 0;
+    background:#0078c7;
+    height:200px; 
+    margin: 20px auto 0;
+    min-width: 1000px
+    
+    }
+  .footer p{ text-align:center; color:#FFF; line-height:28px;}
+  .footer p a{ color:#FFF;}
+
+
 </style>

+ 28 - 6
src/pages/other/components/IHeader.vue

@@ -15,15 +15,23 @@
         </li>
 
         <li :class="{'navfirst': isActive('/apply-list')}">
-          <a href="#/apply-list">审核申请</a>
+          <a href="#/apply-list">下载审核</a>
         </li>
 
         <li :class="{'navfirst': isActive('/reply-list')}">
           <a href="#/reply-list">我的申请</a>
         </li>
 
-        <li :class="{'navfirst': isActive('/file-add')}" v-if="isActive('/file-add')">
-          <a href="#/apply-list">发布文章</a>
+        <li :class="{'navfirst': isActive('/file-add')}" v-if="isLeader(1)">
+          <a href="#/file-add">上传文件</a>
+        </li>
+
+        <li :class="{'navfirst': isActive('/file-confirm')}" v-if="isLeader(2)">
+          <a href="#/file-confirm">审核文章</a>
+        </li>
+
+        <li :class="{'navfirst': isActive('/file-publish')}" v-if="isLeader(3)">
+          <a href="#/file-publish">发布文章</a>
         </li>
 
         <li :class="{'navfirst': isActive('/file-info')}" v-if="isActive('/file-info')">
@@ -47,14 +55,14 @@
           clearable
         ></el-autocomplete>
         <el-button type="primary" size="mini" @click="handlerSearch">搜索</el-button>
-        <el-button type="success" size="mini" @click="addFile">发布文章</el-button>
+        <el-button type="success" size="mini" @click="doLogout">退出登入</el-button>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-  import { mapGetters } from "vuex";
+  import { mapGetters,mapActions } from "vuex";
 export default {
   data() {
     return {
@@ -74,9 +82,23 @@ export default {
      }
   },
   computed: {
-  	...mapGetters("user", ["getArticals"])
+  	...mapGetters("user", ["getArticals", "userDepartments"])
   },
   methods: {
+    ...mapActions("user", ["logout"]),
+    isLeader(leaderId){
+      for( let i in this.userDepartments){
+        if( this.userDepartments[i].isLeader == leaderId){
+          return true
+        }
+      }
+      return false
+    },
+    doLogout(){
+      this.logout().then( res=>{
+        console.log("logout")
+      })
+    },
     isActive( path ){
       let rpath = this.$route.path;
       return rpath.indexOf( path )> -1;

+ 266 - 0
src/pages/other/components/IPanel.vue

@@ -0,0 +1,266 @@
+<template>
+
+    <div>  
+        <el-card>
+            <div slot="header" class="clearfix">
+                <span> {{categorys['laws']}}</span>
+                <el-button class="more-btn" type="text" @click="handleOpenMore('laws')">详情>></el-button>
+            </div>
+            <!--  -->
+            <el-row :gutter="40" class="panel-group">
+                <el-col :xs="8" :sm="8" :lg="8" class="card-panel-col" v-for="(item,index) in [1,2,3]" :key="index">
+                    <div class="card-panel" @click="handleSetLineChartData('laws', item)">
+                        <div class="card-panel-icon-wrapper" :class="'color'+index">
+                            <svg-icon icon-class="education" class-name="card-panel-icon" />
+                        </div>
+                        <div class="card-panel-description">
+                        <div class="card-panel-text">
+                            {{status[item]}}
+                        </div>
+                        <count-to :start-val="0" :end-val="getAccount('laws', item)" :duration="2600" class="card-panel-num" />
+                        </div>
+                    </div>
+                </el-col>
+            </el-row>
+        </el-card>
+
+        <el-card>
+            <div slot="header" class="clearfix">
+                <span> {{categorys['result']}}</span>
+                <el-button class="more-btn" type="text" @click="handleOpenMore('result')">详情>></el-button>
+            </div>
+            <!--  -->
+            <el-row :gutter="40" class="panel-group">
+                <el-col :xs="8" :sm="8" :lg="8" class="card-panel-col" v-for="(item,index) in [1,2,3]" :key="index">
+                    <div class="card-panel" @click="handleSetLineChartData('result', item)">
+                        <div class="card-panel-icon-wrapper" :class="'color'+index">
+                            <svg-icon icon-class="chart" class-name="card-panel-icon" />
+                        </div>
+                        <div class="card-panel-description">
+                        <div class="card-panel-text">
+                            {{status[item]}}
+                        </div>
+                        <count-to :start-val="0" :end-val="getAccount('result', item)" :duration="2600" class="card-panel-num" />
+                        </div>
+                    </div>
+                </el-col>
+            </el-row>
+        </el-card>
+
+        <el-card>
+            <div slot="header" class="clearfix">
+                <span> {{categorys['mechanism']}}</span>
+                <el-button class="more-btn" type="text" @click="handleOpenMore('mechanism')">详情>></el-button>
+            </div>
+            <!--  -->
+            <el-row :gutter="40" class="panel-group">
+                <el-col :xs="8" :sm="8" :lg="8" class="card-panel-col" v-for="(item,index) in [1,2,3]" :key="index">
+                    <div class="card-panel" @click="handleSetLineChartData('mechanism', item)">
+                        <div class="card-panel-icon-wrapper" :class="'color'+index">
+                            <svg-icon icon-class="example" class-name="card-panel-icon" />
+                        </div>
+                        <div class="card-panel-description">
+                        <div class="card-panel-text">
+                            {{status[item]}}
+                        </div>
+                        <count-to :start-val="0" :end-val="getAccount('mechanism', item)" :duration="2600" class="card-panel-num" />
+                        </div>
+                    </div>
+                </el-col>
+            </el-row>
+        </el-card>
+
+        <el-card>
+            <div slot="header" class="clearfix">
+                <span> {{categorys['other']}}</span>
+                <el-button class="more-btn" type="text" @click="handleOpenMore('other')">详情>></el-button>
+            </div>
+            <!--  -->
+            <el-row :gutter="40" class="panel-group">
+                <el-col :xs="8" :sm="8" :lg="8" class="card-panel-col" v-for="(item,index) in [1,2,3]" :key="index">
+                    <div class="card-panel" @click="handleSetLineChartData('other', item)">
+                        <div class="card-panel-icon-wrapper" :class="'color'+index">
+                            <svg-icon icon-class="guide" class-name="card-panel-icon" />
+                        </div>
+                        <div class="card-panel-description">
+                        <div class="card-panel-text">
+                            {{status[item]}}
+                        </div>
+                        <count-to :start-val="0" :end-val="getAccount('other', item)" :duration="2600" class="card-panel-num" />
+                        </div>
+                    </div>
+                </el-col>
+            </el-row>
+        </el-card>
+
+    </div>
+
+
+</template>
+
+<script>
+import CountTo from 'vue-count-to'
+import data from '@/pages/data/data.js'
+
+export default {
+  components: {
+    CountTo
+  },
+  data(){
+      return {
+        categorys: data.categorys,
+        status:{
+            1:'提交中',
+            2:'审核中',
+            3:'发布中'
+        }
+    }
+  },
+  props: {
+    departmentId:{
+        type: [String, Number],
+        default:0
+    },
+    account: {
+      type: Object,
+      default: () => {
+        return {
+          'laws1': 0,
+          'laws2': 0,
+          'laws3': 0,
+          sumLogin: 0,
+          sumFace: 0
+        }
+      }
+    }
+  },
+  methods: {
+    handleSetLineChartData(type) {
+      this.$emit('handleSetLineChartData', type)
+    },
+    getAccount( category, index){
+        let key = category+index;
+        return this.account[key]||0;
+    },
+    handleOpenMore( category ){
+      console.log("handleOpenMore", this)
+      let query = {category, departmentId: this.departmentId}
+      let path = '/file-search'
+      this.$router.push( {path, query})
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .panel-group {
+    margin-top: 8px;
+    .card-panel-col {
+      margin-bottom: 8px;
+    }
+    .card-panel {
+      height: 108px;
+      cursor: pointer;
+      font-size: 8px;
+      position: relative;
+      overflow: hidden;
+      color: #666;
+      background: #fff;
+      box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+      border-color: rgba(0, 0, 0, .05);
+
+      &:hover {
+        .card-panel-icon-wrapper {
+          color: #fff;
+        }
+        
+
+        .color0{
+            background: #40c9c6;
+        }
+        .color1{
+            background: #f4516c;
+        }
+        .color2{
+            background: #36a3f7
+        }
+      }
+
+      .color0{
+        color: #40c9c6;
+      }
+      .color1{
+          color: #f4516c;
+      }
+      .color2{
+          color: #36a3f7;
+      }
+
+      .icon-people {
+        color: #40c9c6;
+      }
+
+      .icon-message {
+        color: #36a3f7;
+      }
+
+      .icon-international {
+        color: #f4516c;
+      }
+
+      .icon-tree-table {
+        color: #34bfa3
+      }
+
+      .card-panel-icon-wrapper {
+        float: left;
+        margin: 14px 0 0 14px;
+        padding: 16px;
+        transition: all 0.38s ease-out;
+        border-radius: 6px;
+      }
+
+      .card-panel-icon {
+        float: left;
+        font-size: 48px;
+      }
+
+      .card-panel-description {
+        float: right;
+        font-weight: bold;
+        margin: 26px;
+        margin-left: 0px;
+
+        .card-panel-text {
+          line-height: 18px;
+          color: rgba(0, 0, 0, 0.45);
+          font-size: 16px;
+          margin-bottom: 8px;
+        }
+
+        .card-panel-num {
+          font-size: 20px;
+        }
+      }
+    }
+  }
+
+//   @media (max-width:550px) {
+//     .card-panel-description {
+//       display: none;
+//     }
+
+//     .card-panel-icon-wrapper {
+//       float: none !important;
+//       width: 40%;
+//       height: 100%;
+//       margin: 0 !important;
+
+//       .svg-icon {
+//         display: block;
+//         margin: 14px auto !important;
+//         float: none !important;
+//       }
+//     }
+//   }
+</style>

+ 1 - 0
src/pages/other/file-add.vue

@@ -10,6 +10,7 @@
             collapse-tags placeholder="请选择"  clearable>
              <el-option
              v-for="item in userDepartments"
+             v-show="item.isLeader>0"
              :value="item"
              :key="item.departmentId">
              {{item.department}} - {{item.isLeader|leader}}

+ 179 - 0
src/pages/other/file-confirm.vue

@@ -0,0 +1,179 @@
+<template>
+  <div class="main">
+    <div class="main-table">
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>我的申请</span>
+        </div>
+
+        <el-table :data="restaurants" border stripe v-loading="loading">
+          <el-table-column label="序号" min-width="60" prop="id"> </el-table-column>
+
+          <el-table-column label="文件名称" min-width="200" prop="title"> </el-table-column>
+
+          <el-table-column label="解压密码" min-width="60" prop="secret">
+            <template v-slot="{ row }">
+              <span> {{ row.isSend ? row.secret : '还未生成' }} </span>
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" min-width="80px" label="操作" class-name="small-padding fixed-width">
+            <template slot-scope="{ row }">
+              <el-button v-if="row.isSend" type="success" size="small" icon="el-icon-circle-check" @click="download(row)">下载文件</el-button>
+
+              <el-button v-else type="text" size="small">等待审核</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <el-pagination :current-page="page" :page-size="pageSize" :page-sizes="[10, 30, 50, 100]" :style="{ float: 'center', padding: '20px' }" @size-change="handleSizeChange" @current-change="handleCurrentChange" :total="total" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+      </el-card>
+    </div>
+    <el-dialog title="[办公室]XX 申请下载资料" center :visible.sync="dialogFormVisible">
+      <h3>【{{ form.username }}】需要下载文件 【{{ form.title }}】</h3>
+      <div class="dialog-footer" slot="footer">
+        <el-button type="warning" size="medium" style="width: 100px; padding: 10px; margin: 20px" @click="dialogFormVisible = false">拒绝下载</el-button>
+        <el-button type="primary" size="medium" style="width: 100px; padding: 10px; margin: 20px" @click="dialogFormVisible = false">允许下载</el-button>
+      </div>
+    </el-dialog>
+    <IFooter />
+  </div>
+</template>
+
+<script>
+import IHeader from './components/IHeader'
+import IFooter from './components/IFooter'
+import glIcon from '@/icons/img/2016smyjj_gl_icon.jpg'
+import data from '../data/data.js'
+import { downloadArtical, getReplyArticalList } from '@/api/article'
+
+import { toDatetime } from '@/utils/date.js'
+
+export default {
+  name: 'application',
+  components: {
+    IHeader,
+    IFooter,
+  },
+  data() {
+    return {
+      dialogFormVisible: false,
+      glIcon: glIcon,
+      loading: false,
+      list: data.departs,
+      total: 0,
+      page: 1,
+      pageSize: 10,
+      searchDepartId: '',
+      restaurants: [],
+      state3: '',
+      form: {},
+      selectDepartId: 1,
+      selectDepartName: '',
+      category: '',
+      isShowMore: false,
+    }
+  },
+  mounted() {
+    this.getReplyArticalList()
+  },
+  filters: {
+    filterTitle(val) {
+      if (val.length > 35) {
+        return val.substr(0, 32) + '...'
+      } else {
+        return val
+      }
+    },
+    toDatetime,
+  },
+  methods: {
+    handleSizeChange(size) {
+      this.pageSize = size
+      this.getReplyArticalList()
+    },
+    handleCurrentChange(page) {
+      this.page = page
+      this.getReplyArticalList()
+    },
+    applyDoc(row) {
+      this.dialogFormVisible = true
+      this.form = row
+    },
+    download(row) {
+      let param = { articalId: row.articalId, isLeader: 0, id: row.id }
+      this.loading = true
+      this.$message.successMsg('文件生成中', 1)
+      downloadArtical(param)
+        .then((res) => {
+          this.loading = false
+          if (res.code == 200) {
+            window.open(res.data)
+            return
+          }
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    getReplyArticalList() {
+      let { page, pageSize } = this
+      let param = { pageSize, page }
+      getReplyArticalList(param).then((res) => {
+        this.restaurants = res.data.list
+        this.total = res.data.total
+        console.log('getHotArticalList', res)
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.el-breadcrumb {
+  display: inline-block;
+  padding-left: 10px;
+}
+.box-card {
+  margin-bottom: 20px;
+}
+.my-autocomplete {
+  li {
+    line-height: normal;
+    padding: 7px;
+
+    .name {
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
+    .addr {
+      font-size: 12px;
+      color: #b4b4b4;
+    }
+
+    .highlighted .addr {
+      color: #ddd;
+    }
+  }
+}
+.el-card__body .text {
+  margin: 5px 0;
+}
+.el-card {
+  color: #1890ff;
+}
+.el-card__header {
+  padding: 15px 20px;
+}
+.el-menu-vertical-demo:not(.el-menu--collapse) {
+  width: 200px;
+  min-height: 400px;
+}
+
+.oneline {
+  line-height: 30px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+</style>

+ 66 - 47
src/pages/other/file-manage.vue

@@ -1,27 +1,38 @@
 <template>
   <div class="other-container" style="margin-top: 178px;">
-    <IHeader :departmentId="selectDepartId"/>
+    <IHeader :departmentId="department.departmentId"/>
     <div  class="main">
 
       <div class="main-table">
 
         <div class="main-left">
-          <el-select v-model="searchDepartId" filterable clearable placeholder="关键字搜索部门" @change="handleChangeDepart">
+          <el-select v-model="searchDepartment" filterable clearable placeholder="关键字搜索部门" @change="handleChangeDepart">
             <el-option
-              v-for="item in list"
-              :key="item.department_id"
+              v-for="item in userDepartments"
+              :key="item.departmentId"
               :label="item.department"
-              :value="item.department_id"
+              :value="item"
             >
             </el-option>
           </el-select>
+
           <el-menu
-            :default-active="selectDepartId"
+            :default-active="''+department.departmentId"
             class="el-menu-vertical-demo"
             @select="handleSelectDepart">
-            <template  v-for="(item, index) in list">
-              <el-menu-item :index="item.department_id">
-                <span>{{ item.department}}</span>
+            <template  v-for="item in userDepartments" >
+              <el-menu-item :index="''+item.departmentId" v-bind:key="item.departmentId">
+                <el-button v-if="item.departmentId == department.departmentId" type="text" 
+                :icon="'el-icon-'+item.icon">
+                  {{ item.department}}
+                </el-button>
+                
+                
+                <el-button v-else type="text" :icon="'el-icon-'+item.icon" style="color:#000">
+                  
+                  {{ item.department}}
+                  
+                </el-button>
               </el-menu-item>
             </template>
           </el-menu>
@@ -34,19 +45,24 @@
               <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
               <el-breadcrumb-item>帮助中心</el-breadcrumb-item>
               <el-breadcrumb-item>文件列表</el-breadcrumb-item>
-              <el-breadcrumb-item>{{ selectDepartName }}</el-breadcrumb-item>
+              <el-breadcrumb-item>{{ department.department }}</el-breadcrumb-item>
             </el-breadcrumb>
           </div>
 
 
-          <IArtical :department="selectDepartName" type="laws"
+          <IPanel :account="account" :departmentId="department.departmentId"></IPanel>
+
+
+
+
+          <!-- <IArtical :department="department" type="laws"
             :list="restaurants.laws" @more="handleOpenMore('laws')" @download="downloadFile"></IArtical>
-          <IArtical :department="selectDepartName" type="mechanism"
+          <IArtical :department="department" type="mechanism"
             :list="restaurants.mechanism" @more="handleOpenMore('mechanism')" @download="downloadFile"></IArtical>
-          <IArtical :department="selectDepartName" type="result"
+          <IArtical :department="department" type="result"
             :list="restaurants.result" @more="handleOpenMore('result')" @download="downloadFile"></IArtical>
-          <IArtical :department="selectDepartName" type="other"
-            :list="restaurants.other" @more="handleOpenMore('other')" @download="downloadFile"></IArtical>
+          <IArtical :department="department" type="other"
+            :list="restaurants.other" @more="handleOpenMore('other')" @download="downloadFile"></IArtical> -->
 
         </div>
       </div>
@@ -62,45 +78,52 @@
 
     <IFooter />
 
-
-
   </div>
 </template>
 
 <script>
 import IHeader from "./components/IHeader";
+import IPanel from "./components/IPanel";
 import IArtical from "./components/IArtical";
 import IFooter from "./components/IFooter";
 import glIcon from '@/icons/img/2016smyjj_gl_icon.jpg'
 import data  from '../data/data.js'
-import {getHotArticalList,getArticalList}  from '@/api/article'
-import { mapActions } from "vuex";
+import {getDepartmentAccount}  from '@/api/user.js'
+import { mapActions, mapGetters } from "vuex";
 
 export default {
   name: 'application',
   components: {
     IHeader,
     IArtical,
-    IFooter
+    IFooter,
+    IPanel
   },
   data() {
     return {
-      categorys:{'laws':'法律法规', 'mechanism':'机制类','result':'成果类', 'other':'其他类'},
+      categorys:data.categorys,
       dialogFormVisible: false,
+      leaderId:0,
       glIcon: glIcon,
-      list: data.departs,
-      searchDepartId: "",
+      searchDepartment: "",
+      department:{ departmentId:0, department:''},
+      account: {},
       restaurants: {},
       form:{},
       state3: '',
-      selectDepartId:"0",
-      selectDepartName: '',
       category:'',
-      isShowMore: false
+      isShowMore: false,
+      screenWidth: document.body.clientWidth
     }
   },
-  mounted() {
-    this.getHotArticalList();
+  computed: {
+  	...mapGetters("user", ["userDepartments"])
+  },
+  beforeMount( ){
+    let departmentId = localStorage.getItem("@departmentId")||0;
+    this.department = data.getDepart( departmentId, this.userDepartments );
+    this.leaderId = data.getLeader( departmentId, this.userDepartments)
+    this.getDepartmentAccount()
   },
   filters:{
     filterTitle(val){
@@ -117,15 +140,17 @@ export default {
       this.form = o;
       this.dialogFormVisible = true
     },
-    getHotArticalList() {
-      let param = {
-        "departmentId": +this.selectDepartId,
-        "category": this.category
-      }
-      getHotArticalList( param ).then( res=>{
-        this.restaurants = res.data
-        this.initSearch()
-
+    getDepartmentAccount(){
+      let departmentId = +this.department.departmentId;
+      getDepartmentAccount( {departmentId}).then( res=>{
+        if( res.code == 200){
+          let account ={}
+          for( let i in res.data){
+            let item = res.data[i]
+            account[item.category+item.status] = item.count;
+          }
+          this.account = account;
+        }
       })
     },
     initSearch(){
@@ -139,20 +164,14 @@ export default {
     },
     handleChangeDepart(item){
       console.log("handleChangeDepart", item);
-      
-      this.selectDepartId = item;
+      this.department = item;
       // 切换文件列表
     },
     handleSelectDepart( departId ) {
       localStorage.setItem("@departmentId", departId)
-      this.selectDepartId = departId;
-      for( let i in data.departs){
-        if( data.departs[i].department_id == departId){
-          this.selectDepartName = data.departs[i].department;
-        }
-      }
-      console.log("handleSelectDepart", this.selectDepartId,this.selectDepartName );
-      this.getHotArticalList();
+      this.department = data.getDepart( departId, this.userDepartments)
+      console.log("handleSelectDepart", this.department );
+      this.getDepartmentAccount();
       // 切换文件列表
     },
     querySearch( item ){

+ 179 - 0
src/pages/other/file-publish.vue

@@ -0,0 +1,179 @@
+<template>
+  <div class="main">
+    <div class="main-table">
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>我的申请</span>
+        </div>
+
+        <el-table :data="restaurants" border stripe v-loading="loading">
+          <el-table-column label="序号" min-width="60" prop="id"> </el-table-column>
+
+          <el-table-column label="文件名称" min-width="200" prop="title"> </el-table-column>
+
+          <el-table-column label="解压密码" min-width="60" prop="secret">
+            <template v-slot="{ row }">
+              <span> {{ row.isSend ? row.secret : '还未生成' }} </span>
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" min-width="80px" label="操作" class-name="small-padding fixed-width">
+            <template slot-scope="{ row }">
+              <el-button v-if="row.isSend" type="success" size="small" icon="el-icon-circle-check" @click="download(row)">下载文件</el-button>
+
+              <el-button v-else type="text" size="small">等待审核</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <el-pagination :current-page="page" :page-size="pageSize" :page-sizes="[10, 30, 50, 100]" :style="{ float: 'center', padding: '20px' }" @size-change="handleSizeChange" @current-change="handleCurrentChange" :total="total" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+      </el-card>
+    </div>
+    <el-dialog title="[办公室]XX 申请下载资料" center :visible.sync="dialogFormVisible">
+      <h3>【{{ form.username }}】需要下载文件 【{{ form.title }}】</h3>
+      <div class="dialog-footer" slot="footer">
+        <el-button type="warning" size="medium" style="width: 100px; padding: 10px; margin: 20px" @click="dialogFormVisible = false">拒绝下载</el-button>
+        <el-button type="primary" size="medium" style="width: 100px; padding: 10px; margin: 20px" @click="dialogFormVisible = false">允许下载</el-button>
+      </div>
+    </el-dialog>
+    <IFooter />
+  </div>
+</template>
+
+<script>
+import IHeader from './components/IHeader'
+import IFooter from './components/IFooter'
+import glIcon from '@/icons/img/2016smyjj_gl_icon.jpg'
+import data from '../data/data.js'
+import { downloadArtical, getReplyArticalList } from '@/api/article'
+
+import { toDatetime } from '@/utils/date.js'
+
+export default {
+  name: 'application',
+  components: {
+    IHeader,
+    IFooter,
+  },
+  data() {
+    return {
+      dialogFormVisible: false,
+      glIcon: glIcon,
+      loading: false,
+      list: data.departs,
+      total: 0,
+      page: 1,
+      pageSize: 10,
+      searchDepartId: '',
+      restaurants: [],
+      state3: '',
+      form: {},
+      selectDepartId: 1,
+      selectDepartName: '',
+      category: '',
+      isShowMore: false,
+    }
+  },
+  mounted() {
+    this.getReplyArticalList()
+  },
+  filters: {
+    filterTitle(val) {
+      if (val.length > 35) {
+        return val.substr(0, 32) + '...'
+      } else {
+        return val
+      }
+    },
+    toDatetime,
+  },
+  methods: {
+    handleSizeChange(size) {
+      this.pageSize = size
+      this.getReplyArticalList()
+    },
+    handleCurrentChange(page) {
+      this.page = page
+      this.getReplyArticalList()
+    },
+    applyDoc(row) {
+      this.dialogFormVisible = true
+      this.form = row
+    },
+    download(row) {
+      let param = { articalId: row.articalId, isLeader: 0, id: row.id }
+      this.loading = true
+      this.$message.successMsg('文件生成中', 1)
+      downloadArtical(param)
+        .then((res) => {
+          this.loading = false
+          if (res.code == 200) {
+            window.open(res.data)
+            return
+          }
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    getReplyArticalList() {
+      let { page, pageSize } = this
+      let param = { pageSize, page }
+      getReplyArticalList(param).then((res) => {
+        this.restaurants = res.data.list
+        this.total = res.data.total
+        console.log('getHotArticalList', res)
+      })
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.el-breadcrumb {
+  display: inline-block;
+  padding-left: 10px;
+}
+.box-card {
+  margin-bottom: 20px;
+}
+.my-autocomplete {
+  li {
+    line-height: normal;
+    padding: 7px;
+
+    .name {
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
+    .addr {
+      font-size: 12px;
+      color: #b4b4b4;
+    }
+
+    .highlighted .addr {
+      color: #ddd;
+    }
+  }
+}
+.el-card__body .text {
+  margin: 5px 0;
+}
+.el-card {
+  color: #1890ff;
+}
+.el-card__header {
+  padding: 15px 20px;
+}
+.el-menu-vertical-demo:not(.el-menu--collapse) {
+  width: 200px;
+  min-height: 400px;
+}
+
+.oneline {
+  line-height: 30px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+</style>

+ 10 - 6
src/pages/other/file-search.vue

@@ -10,8 +10,8 @@
                     <input type="text" placeholder="请输入" class="el-input__inner" v-model="dropDownValue">
                   </div>
                   <el-option
-                  v-for="(item,index) in showDepartments"
-                  :value="item.department_id"
+                  v-for="(item,index) in userDepartments"
+                  :value="item.departmentId"
                   @click.native="selectDepartment(item)"
                   :key="index"
                   :label="item.department"></el-option>
@@ -60,7 +60,7 @@
               label="操作"
               class-name="small-padding fixed-width"
             >
-              <template slot-scope="{row, $index}">
+              <template slot-scope="{row}">
                 <el-button
                   size="small"
                   type="primary"
@@ -91,6 +91,7 @@ import IHeader from "./components/IHeader";
 import IFooter from "./components/IFooter";
 import data  from '../data/data.js'
 import {getArticalList} from '@/api/article.js'
+import { mapGetters } from "vuex";
 
 export default {
   name: 'application',
@@ -116,6 +117,9 @@ export default {
       }
 
     }
+  },
+   computed: {
+  	...mapGetters("user", ["userDepartments"])
   },
   mounted(){
     this.getArticalList()
@@ -137,7 +141,7 @@ export default {
     if( !this.departmentId ){
       this.departmentId = localStorage.getItem( "@departmentId")||0
     }
-    let department = data.getDepart( this.departmentId)
+    let department = data.getDepart( this.departmentId, this.userDepartments )
     this.searchInfo.department = department.department||''
   },
   methods: {
@@ -150,7 +154,7 @@ export default {
       this.getArticalList()
     },
     selectDepartment(item){
-      this.departmentId = +item.department_id
+      this.departmentId = +item.departmentId
       localStorage.setItem("@departmentId", this.departmentId)
       this.getArticalList()
     },
@@ -160,7 +164,7 @@ export default {
     },
     getArticalList(){
       let param = {
-        departmentId:this.departmentId,
+        departmentId:+this.departmentId,
         keyword: this.searchInfo.keyword,
         category: this.searchInfo.category,
         page: this.page,

+ 0 - 10
src/pages/other/index.vue

@@ -24,16 +24,6 @@ export default {
   },
   computed: {
   	...mapGetters("user", ["userInfo", "userDepartments"])
-  },
-  methods: {
-    ...mapActions("user", ["loadDepartment"])
-  },
-  created() {
-    // console.log("userInfo", this.userInfo )
-    // if( this.userInfo && this.userInfo.userId) return;
-    if( this.userDepartments.length <1 ){
-      this.loadDepartment()
-    }
   }
 };
 </script>

+ 2 - 2
src/pages/other/my-file.vue

@@ -8,7 +8,7 @@
           style="min-height: 700px;"
           >
           <template  v-for="(item, index) in options">
-            <el-menu-item :index="'1-'+item.id" @click="selectTag(item)">
+            <el-menu-item :index="'1-'+item.id" @click="selectTag(item)" :key="index">
               <span>{{ item.value }}</span>
             </el-menu-item>
           </template>
@@ -45,7 +45,7 @@
             </el-table-column>
 
             <el-table-column label="时间" min-width="80" prop="createAt" align="center">
-              <template slot-scope="{row, $index}">
+              <template slot-scope="{row}">
                 <span> {{row.createAt|toDatetime}}</span>
               </template>
             </el-table-column>

+ 101 - 130
src/pages/other/reply-list.vue

@@ -2,207 +2,178 @@
   <div class="main">
     <div class="main-table">
       <el-card class="box-card">
-        <div slot="header" class="clearfix" >
+        <div slot="header" class="clearfix">
           <span>我的申请</span>
         </div>
 
-        <el-table :data="restaurants"  border stripe v-loading="loading">
-          <el-table-column label="序号" min-width="60" prop="id">
-          </el-table-column>
+        <el-table :data="restaurants" border stripe v-loading="loading">
+          <el-table-column label="序号" min-width="60" prop="id"> </el-table-column>
 
-          <el-table-column label="文件名称" min-width="200" prop="title">
-          </el-table-column>
+          <el-table-column label="文件名称" min-width="200" prop="title"> </el-table-column>
 
           <el-table-column label="解压密码" min-width="60" prop="secret">
-            <template v-slot="{row}">
-              <span> {{row.isSend?row.secret:'还未生成'}} </span>
+            <template v-slot="{ row }">
+              <span> {{ row.isSend ? row.secret : '还未生成' }} </span>
             </template>
           </el-table-column>
 
-          <el-table-column
-            align="center"
-            min-width="80px"
-            label="操作"
-            class-name="small-padding fixed-width"
-          >
-            <template slot-scope="{row, $index}">
-              <el-button
-              v-if="row.isSend"
-                type="success"
-                size="small"
-                icon="el-icon-circle-check"
-                @click="download(row)"
-              >下载文件</el-button>
+          <el-table-column align="center" min-width="80px" label="操作" class-name="small-padding fixed-width">
+            <template slot-scope="{ row }">
+              <el-button v-if="row.isSend" type="success" size="small" icon="el-icon-circle-check" @click="download(row)">下载文件</el-button>
 
-              <el-button
-                v-else
-                type="text"
-                size="small"
-              >等待审核</el-button>
+              <el-button v-else type="text" size="small">等待审核</el-button>
             </template>
           </el-table-column>
-
         </el-table>
 
-
-        <el-pagination
-          :current-page="page"
-          :page-size="pageSize"
-          :page-sizes="[10, 30, 50, 100]"
-          :style="{float:'center',padding:'20px'}"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-        ></el-pagination>
+        <el-pagination :current-page="page" :page-size="pageSize" :page-sizes="[10, 30, 50, 100]" :style="{ float: 'center', padding: '20px' }" @size-change="handleSizeChange" @current-change="handleCurrentChange" :total="total" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
       </el-card>
-
     </div>
-    <el-dialog title="[办公室]XX 申请下载资料" center :visible.sync="dialogFormVisible"  >
-      <h3> 【{{form.username}}】需要下载文件 【{{form.title}}】  </h3>
+    <el-dialog title="[办公室]XX 申请下载资料" center :visible.sync="dialogFormVisible">
+      <h3>【{{ form.username }}】需要下载文件 【{{ form.title }}】</h3>
       <div class="dialog-footer" slot="footer">
-        <el-button type="warning" size="medium" style="width: 100px; padding: 10px; margin: 20px;" @click="dialogFormVisible=false">拒绝下载</el-button>
-        <el-button type="primary" size="medium" style="width: 100px; padding: 10px; margin: 20px;" @click="dialogFormVisible=false">允许下载</el-button>
+        <el-button type="warning" size="medium" style="width: 100px; padding: 10px; margin: 20px" @click="dialogFormVisible = false">拒绝下载</el-button>
+        <el-button type="primary" size="medium" style="width: 100px; padding: 10px; margin: 20px" @click="dialogFormVisible = false">允许下载</el-button>
       </div>
     </el-dialog>
     <IFooter />
-
   </div>
 </template>
 
 <script>
-import IHeader from "./components/IHeader";
-import IFooter from "./components/IFooter";
+import IHeader from './components/IHeader'
+import IFooter from './components/IFooter'
 import glIcon from '@/icons/img/2016smyjj_gl_icon.jpg'
-import data  from '../data/data.js'
-import {downloadArtical ,getArticalList,getReplyArticalList}  from '@/api/article'
-
+import data from '../data/data.js'
+import { downloadArtical, getReplyArticalList } from '@/api/article'
 
-import {toDatetime} from '@/utils/date.js'
+import { toDatetime } from '@/utils/date.js'
 
 export default {
   name: 'application',
   components: {
     IHeader,
-    IFooter
+    IFooter,
   },
   data() {
     return {
       dialogFormVisible: false,
       glIcon: glIcon,
-      loading:false,
+      loading: false,
       list: data.departs,
       total: 0,
-      page:1,
+      page: 1,
       pageSize: 10,
-      searchDepartId: "",
+      searchDepartId: '',
       restaurants: [],
       state3: '',
-      form:{},
-      selectDepartId:1,
+      form: {},
+      selectDepartId: 1,
       selectDepartName: '',
-      category:'',
-      isShowMore: false
+      category: '',
+      isShowMore: false,
     }
   },
   mounted() {
-    this.getReplyArticalList();
+    this.getReplyArticalList()
   },
-  filters:{
-    filterTitle(val){
-      if( val.length > 35) {
-        return val.substr(0,32)+"..."
-      }else{
+  filters: {
+    filterTitle(val) {
+      if (val.length > 35) {
+        return val.substr(0, 32) + '...'
+      } else {
         return val
       }
     },
-    toDatetime
+    toDatetime,
   },
   methods: {
-    handleSizeChange(size){
+    handleSizeChange(size) {
       this.pageSize = size
       this.getReplyArticalList()
     },
-    handleCurrentChange(page){
+    handleCurrentChange(page) {
       this.page = page
       this.getReplyArticalList()
     },
-    applyDoc( row ){
+    applyDoc(row) {
       this.dialogFormVisible = true
       this.form = row
     },
-    download( row ){
-      let param ={articalId: row.articalId, isLeader:0, id:row.id}
-      this.loading = true;
-      this.$message.successMsg("文件生成中", 1)
-      downloadArtical( param ).then( res=>{
-        this.loading = false;
-        if( res.code == 200 ) {
-          window.open( res.data )
-          return;
-        }
-      }).catch( ()=>{
-        this.loading = false;
-      })
+    download(row) {
+      let param = { articalId: row.articalId, isLeader: 0, id: row.id }
+      this.loading = true
+      this.$message.successMsg('文件生成中', 1)
+      downloadArtical(param)
+        .then((res) => {
+          this.loading = false
+          if (res.code == 200) {
+            window.open(res.data)
+            return
+          }
+        })
+        .catch(() => {
+          this.loading = false
+        })
     },
     getReplyArticalList() {
-      let {page,pageSize} = this
-      let param = {pageSize, page}
-      getReplyArticalList( param).then( res=>{
+      let { page, pageSize } = this
+      let param = { pageSize, page }
+      getReplyArticalList(param).then((res) => {
         this.restaurants = res.data.list
         this.total = res.data.total
-        console.log("getHotArticalList", res)
+        console.log('getHotArticalList', res)
       })
-    }
-  }
+    },
+  },
 }
 </script>
 
 <style lang="scss" scoped>
-  .el-breadcrumb{
-    display: inline-block;
-    padding-left: 10px;
-  }
-  .box-card{
-    margin-bottom: 20px;
-  }
-  .my-autocomplete {
-    li {
-      line-height: normal;
-      padding: 7px;
-
-      .name {
-        text-overflow: ellipsis;
-        overflow: hidden;
-      }
-      .addr {
-        font-size: 12px;
-        color: #b4b4b4;
-      }
+.el-breadcrumb {
+  display: inline-block;
+  padding-left: 10px;
+}
+.box-card {
+  margin-bottom: 20px;
+}
+.my-autocomplete {
+  li {
+    line-height: normal;
+    padding: 7px;
+
+    .name {
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
+    .addr {
+      font-size: 12px;
+      color: #b4b4b4;
+    }
 
-      .highlighted .addr {
-        color: #ddd;
-      }
+    .highlighted .addr {
+      color: #ddd;
     }
   }
-  .el-card__body .text{
-    margin: 5px 0;
-  }
-  .el-card{
-    color: #1890ff;
-  }
-  .el-card__header{
-    padding: 15px 20px;
-  }
-  .el-menu-vertical-demo:not(.el-menu--collapse) {
-    width: 200px;
-    min-height: 400px;
-  }
+}
+.el-card__body .text {
+  margin: 5px 0;
+}
+.el-card {
+  color: #1890ff;
+}
+.el-card__header {
+  padding: 15px 20px;
+}
+.el-menu-vertical-demo:not(.el-menu--collapse) {
+  width: 200px;
+  min-height: 400px;
+}
 
-  .oneline {
-    line-height: 30px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
+.oneline {
+  line-height: 30px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>

+ 10 - 0
src/router/index.js

@@ -106,6 +106,16 @@ export const constantRoutes = [
           component: () => import('@/pages/other/file-add'),
           hidden: true
         },
+        {
+          path: '/file-confirm',
+          component: () => import('@/pages/other/file-confirm'),
+          hidden: true
+        },
+        {
+          path: '/file-publis',
+          component: () => import('@/pages/other/file-publish'),
+          hidden: true
+        },
         {
           path: '/file-info',
           component: () => import('@/pages/other/file-info'),

+ 5 - 6
src/store/modules/user.js

@@ -1,5 +1,5 @@
 import { login, getUserInfo } from '@/api/auth'
-import {getMyDepartmentList} from '@/api/user.js'
+import {loadDepartmentList, getDepartmentAccount} from '@/api/user.js'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import router, { resetRouter } from '@/router'
 import { authDB } from '@/db'
@@ -106,15 +106,14 @@ const actions = {
   },
 
   loadDepartment( {commit, state} ){
-    if( !state.token )  return;
-    getMyDepartmentList( {}).then( res=>{
+    let userId = authDB.get('userId')||0;
+    loadDepartmentList( {userId} ).then( res=>{
       if( res.code == 200){
-        commit('SET_DEPARTMENT', res.data.departments)
-        commit('SET_INFO', res.data.user)
+        commit('SET_DEPARTMENT', res.data)
       }
     })
-
   },
+
   // remove token
   resetToken({ commit }) {
     return new Promise(resolve => {

+ 14 - 2
vue.config.js

@@ -1,8 +1,8 @@
 'use strict'
 const path = require('path')
 const defaultSettings = require('./src/settings.js')
-const HOST = "http://smoa.ndjsxh.cn:8888"
-// const HOST = "http://localhost:8889"
+// const HOST = "http://smoa.ndjsxh.cn:8888"
+const HOST = "http://localhost:8889"
 function resolve(dir) {
   return path.join(__dirname, dir)
 }
@@ -138,5 +138,17 @@ module.exports = {
           config.optimization.runtimeChunk('single')
         }
       )
+  },
+  css: {
+    loaderOptions: {
+        css: {},
+        postcss: {
+            plugins: [
+                require('postcss-px2rem')({
+                    remUnit: 37.5
+                })
+            ]
+        }
+    }
   }
 }

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä