Browse Source

Merge branch 'master' into develop

scorpio 2 years ago
parent
commit
d009eb9498
3 changed files with 20 additions and 1 deletions
  1. 1 1
      src/page/login.vue
  2. 4 0
      src/utils/tools.js
  3. 15 0
      src/views/home/component/form_dialog.vue

+ 1 - 1
src/page/login.vue

@@ -85,7 +85,7 @@
                 <div class='flex flex-col mt-10 flex-center'>
                   <span class='grey-6'>由梧桐研究院提供技术支持</span>
                   <span class='grey-6 mt-5'>使用问题请咨询:13908866200</span>
-                  <el-button color='#558FF1' @click='download("https://wutong-1302848345.cos.ap-chengdu.myqcloud.com/wtzx/8603b7c51440450785de29a162e84b10.pdf")' style='width: 160px' plain class='mt-10 blockss'>
+                  <el-button color='#558FF1' @click='download("https://wutong-1302848345.cos.ap-chengdu.myqcloud.com/wtzx/f1372710ca1f4245b1d2d54067b403c0.pdf")' style='width: 160px' plain class='mt-10 blockss'>
                     点击下载用户指南
                   </el-button>
                   <span class='grey-6 mt-5 font-12 mt-20'>为了获得最佳体验,您可以<span class='blue pointer'

+ 4 - 0
src/utils/tools.js

@@ -64,3 +64,7 @@ export const deepClone = data => {
   }
   return obj
 }
+
+export const unique = (arr) => {
+  return arr.filter((item, index) => arr.indexOf(item) === index)
+}

+ 15 - 0
src/views/home/component/form_dialog.vue

@@ -178,6 +178,7 @@
 import BaseButton from '@/components/base-button.vue'
 import uploads from '@/components/uploads.vue'
 import { useStore } from '@/store/user.js'
+import { unique } from '@/utils/tools.js'
 
 export default {
   name: 'form_dialog',
@@ -420,9 +421,23 @@ export default {
       } else {
         this.fieldType[index].params = tmps
       }
+      // list to params
+      const keys = unique(this.fieldType[index].params.map(sub => sub.type))
+      console.log(keys)
+      for (const key in keys) {
+        const tmp = this.fieldType[index].params = this.groupBy(this.fieldType[index].params, key)
+        console.log(tmp)
+      }
+
       this.fieldType[index].count = this.fieldType[index].params.filter(e => e.checked).length
       this.fieldType[index].checkAll = this.fieldType[index].count === this.fieldType[index].params.length
     },
+    groupBy (xs, key) {
+      return xs.reduce(function (rv, x) {
+        (rv[x[key]] = rv[x[key]] || []).push(x)
+        return rv
+      }, {})
+    },
     importExcel () {
       if (this.attaches && this.attaches.length === 0) {
         this.$message.error('请选择要上传的文件')