Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

assets/css/iview-reset.less

@@ -96,7 +96,8 @@
 
 .ivu-page-item-active:hover {
     background-color: @primary-color;
-    color: white;
+    // background-color: #d7e8fb;
+    a {color: white!important;}
 }
 
 .ivu-page-item-active>a {

layouts/basic-layout/product.vue

@@ -24,13 +24,13 @@
                   </ul>
                 </td>
               </tr>
-              <tr v-for="(item,i) in filterSider">
+              <tr v-for="(item,i) in filterSider" :key="i">
                 <td class="t_title">
                   <b class="title">{{item.title}}</b>
                 </td>
                 <td>
                   <ul class="table_row_ul">
-                    <li v-for="(li) in item.children">
+                    <li v-for="(li,i) in item.children" :key="i">
                       <a
                         @click="goPage(item,li)"
                         :class="{'active': li.id === isActive}"
@@ -56,6 +56,9 @@
         </BreadcrumbItem>
         <BreadcrumbItem>{{homeMenu}}</BreadcrumbItem>
         <BreadcrumbItem :to="parthto" class="white">{{homeMenuItem}}</BreadcrumbItem>
+        <Tooltip :content="content" placement="top-start" :class="showStar?'icon-show':'icom-hide'">
+          <Icon type="md-star" @click="shoucang" />
+        </Tooltip>
       </Breadcrumb>
       <i-header-search v-if="showSearch && !headerMenu && !isMobile && !showBreadcrumb" />
       <div class="header_right">
@@ -125,7 +128,7 @@ export default {
     iHeaderSetting,
     iHeaderNotice,
     iTabs,
-    iHeaderBug
+    iHeaderBug,
   },
   data() {
     return {
@@ -136,10 +139,12 @@ export default {
       oldScrollTop: 0,
       isDelayHideSider: false, // hack，当从隐藏侧边栏的 header 切换到正常 header 时，防止 Logo 抖动
       loadRouter: true,
-
+      showStar: null,
+      content: "收藏",
+      menuId: null,
       homeMenu: "",
       homeMenuItem: "",
-      parthto: ""
+      parthto: "",
     };
   },
   computed: {
@@ -166,7 +171,7 @@ export default {
       "showLog",
       "showI18n",
       "showReload",
-      "enableSetting"
+      "enableSetting",
     ]),
     ...mapState("admin/page", ["keepAlive"]),
     ...mapGetters("admin/menu", ["hideSider", "filterSider"]),
@@ -193,8 +198,8 @@ export default {
           "i-layout-header-stick": this.isHeaderStick && !this.isMobile,
           "i-layout-header-with-menu": this.headerMenu,
           "i-layout-header-with-hide-sider":
-            this.hideSider || this.isDelayHideSider
-        }
+            this.hideSider || this.isDelayHideSider,
+        },
       ];
     },
     headerStyle() {
@@ -206,20 +211,20 @@ export default {
       return this.isMobile || !this.headerFix
         ? {}
         : {
-            width: `calc(100% - ${menuWidth}px)`
+            width: `calc(100% - ${menuWidth}px)`,
           };
     },
     siderClasses() {
       return {
         "i-layout-sider-fix": this.siderFix,
-        "i-layout-sider-dark": this.siderTheme === "dark"
+        "i-layout-sider-dark": this.siderTheme === "dark",
       };
     },
     contentClasses() {
       return {
         "i-layout-content-fix-with-header": this.headerFix,
         "i-layout-content-with-tabs": this.tabs,
-        "i-layout-content-with-tabs-fix": this.tabs && this.tabsFix
+        "i-layout-content-with-tabs-fix": this.tabs && this.tabsFix,
       };
     },
     insideClasses() {
@@ -228,7 +233,7 @@ export default {
         "i-layout-inside-fix-with-sider-collapse":
           this.siderFix && this.menuCollapse,
         "i-layout-inside-with-hide-sider": this.hideSider,
-        "i-layout-inside-mobile": this.isMobile
+        "i-layout-inside-mobile": this.isMobile,
       };
     },
     drawerClasses() {
@@ -238,7 +243,7 @@ export default {
     },
     menuSideWidth() {
       return this.menuCollapse ? 80 : Setting.menuSideWidth;
-    }
+    },
   },
   watch: {
     hideSider() {
@@ -248,13 +253,35 @@ export default {
       }, 0);
     },
     $route(to, from) {
+      // alert(to.path)
       if (to.name === from.name) {
         // 相同路由，不同参数，跳转时，重载页面
         if (Setting.sameRouteForceUpdate) {
           this.handleReload();
         }
       }
+      console.warn("to-from", to, from, this.filterSider);
+      //获取收藏列表，判断的当前路由是否收藏
+      let star = false;
+      // console.warn("to-from======", this.$store.state.collect);
+      this.$store.state.collect.map((u) => {
+        if (u.url == to.path) {
+          star = true;
+        } else {
+          star = false;
+        }
+      });
+      this.showStar = star;
+      // alert(this.showStar);
+
+      //获取菜单path并与当前路由比对，获取当前菜单id
+      let dataTemp = this.$u.treeToList(this.filterSider);
+      dataTemp.forEach((data) => {
+        if (data.path == to.path) {
+          this.menuId = data.id;
         }
+      });
+    },
   },
   methods: {
     ...mapMutations("admin/layout", ["updateMenuCollapse"]),
@@ -333,7 +360,30 @@ export default {
       this.homeMenu = "";
       this.homeMenuItem = "";
       this.isActive = 0;
+    },
+    shoucang() {
+      if (this.showStar) {
+        let url = `${systemUrl}/favorite/delete`;
+        let menuId = [];
+        menuId.push(this.menuId);
+        this.$api.post(url, menuId).then((r) => {
+          if (r.success) {
+            this.showStar = false;
+            this.$Message.success("已取消收藏");
+            this.content = "收藏";
           }
+        });
+      } else {
+        let url = `${systemUrl}/favorite/create`;
+        this.$api.post(url, { menuId: this.menuId }).then((r) => {
+          if (r.result) {
+            this.showStar = true;
+            this.$Message.success("收藏成功");
+            this.content = "取消收藏";
+          }
+        });
+      }
+    },
   },
   mounted() {
     document.addEventListener("scroll", this.handleScroll, { passive: true });
@@ -343,7 +393,7 @@ export default {
   },
   created() {
     if (this.isTablet && this.showSiderCollapse) this.updateMenuCollapse(true);
-  }
+  },
 };
 </script>
 
@@ -507,5 +557,14 @@ export default {
       line-height: 50px;
     }
   }
+  .icon-show {
+    color: #2680eb;
+    font-size: 20px;
+    cursor: pointer;
+  }
+  .icom-hide {
+    cursor: pointer;
+    font-size: 20px;
+  }
 }
 </style>
\ No newline at end of file

pages/aps/results/api.js

@@ -4,6 +4,9 @@ export default {
     paged(params) {
         return Api.get(`${apsUrl}/scheduletotal/getall`, params);
     },
+    getalldetails(params) {
+        return Api.get(`${apsUrl}/scheduletotal/getalldetails`, params);
+    },
     getall(params) {
         return Api.get(`${apsUrl}/schema/getall`, params);
     },

pages/aps/results/compare.vue

@@ -29,7 +29,7 @@
           <ul class="right_ul">
             <li class="right_ul_title">
               <span class="case">{{li.scheduleId}}</span>
-              <span class="case_time">2020-03-22 13:26:35</span>
+              <span class="case_time">{{li.planDate}}&nbsp;</span>
             </li>
             <li>{{li.deferNum}}&nbsp;</li>
             <li>{{li.deferTime}}&nbsp;</li>
@@ -101,8 +101,15 @@ export default {
     items(){
       var items=[];
       this.schemas.map(p=>{
+        if(this.list.length>0){
           var info=this.list.filter(u=>u.scheduleId==p.schedule_Id)[0];
           items.push(info);
+          items.forEach(itr=>{
+            if(itr.scheduleId==p.schedule_Id){
+              itr.planDate = p.plan_Date
+            }
+          })
+        }else{ return }
       })
       return items;
     }

pages/aps/results/gantt.vue

 <template>
   <div class="q-pa-sm">
-    <div class="pr mt50" v-if="tasks.length==0" >
-<Spin size="large" fix ></Spin>
+    <div class="pr mt50" v-if="tasks.length==0">
+      <Spin size="large" fix></Spin>
     </div>
 
     <gantt-elastic
@@ -58,7 +58,7 @@ let tasks = [
     start: getDate(-24 * 5),
     duration: 15 * 24 * 60 * 60 * 1000,
     percent: 85,
-    type: "project"
+    type: "project",
     //collapsed: true,
   },
   {
@@ -75,9 +75,9 @@ let tasks = [
     style: {
       base: {
         fill: "#1EBC61",
-        stroke: "#0EAC51"
-      }
-    }
+        stroke: "#0EAC51",
+      },
+    },
   },
   {
     id: 3,
@@ -88,7 +88,7 @@ let tasks = [
     start: getDate(-24 * 3),
     duration: 2 * 24 * 60 * 60 * 1000,
     percent: 100,
-    type: "task"
+    type: "task",
   },
   {
     id: 4,
@@ -99,7 +99,7 @@ let tasks = [
     duration: 2 * 24 * 60 * 60 * 1000,
     percent: 50,
     type: "task",
-    dependentOn: [3]
+    dependentOn: [3],
   },
   {
     id: 5,
@@ -114,9 +114,9 @@ let tasks = [
     style: {
       base: {
         fill: "#0287D0",
-        stroke: "#0077C0"
-      }
-    }
+        stroke: "#0077C0",
+      },
+    },
   },
   {
     id: 6,
@@ -132,9 +132,9 @@ let tasks = [
     style: {
       base: {
         fill: "#8E44AD",
-        stroke: "#7E349D"
-      }
-    }
+        stroke: "#7E349D",
+      },
+    },
   },
   {
     id: 7,
@@ -147,7 +147,7 @@ let tasks = [
     duration: 4 * 60 * 60 * 1000,
     percent: 20,
     type: "task",
-    collapsed: true
+    collapsed: true,
   },
   {
     id: 8,
@@ -159,7 +159,7 @@ let tasks = [
     start: getDate(24 * 3),
     duration: 1 * 24 * 60 * 60 * 1000,
     percent: 0,
-    type: "task"
+    type: "task",
   },
   {
     id: 9,
@@ -175,9 +175,9 @@ let tasks = [
     style: {
       base: {
         fill: "#8E44AD",
-        stroke: "#7E349D"
-      }
-    }
+        stroke: "#7E349D",
+      },
+    },
   },
   {
     id: 10,
@@ -187,7 +187,7 @@ let tasks = [
     start: getDate(24 * 5),
     duration: 24 * 60 * 60 * 1000,
     percent: 0,
-    type: "task"
+    type: "task",
   },
   {
     id: 11,
@@ -197,7 +197,7 @@ let tasks = [
     start: getDate(24 * 6),
     duration: 24 * 60 * 60 * 1000,
     percent: 0,
-    type: "task"
+    type: "task",
   },
   {
     id: 12,
@@ -208,7 +208,7 @@ let tasks = [
     duration: 24 * 60 * 60 * 1000,
     percent: 0,
     type: "task",
-    parentId: 11
+    parentId: 11,
   },
   {
     id: 13,
@@ -218,7 +218,7 @@ let tasks = [
     start: getDate(24 * 8),
     duration: 24 * 60 * 60 * 1000,
     percent: 0,
-    type: "task"
+    type: "task",
   },
   {
     id: 14,
@@ -228,7 +228,7 @@ let tasks = [
     start: getDate(24 * 9),
     duration: 24 * 60 * 60 * 1000,
     percent: 0,
-    type: "task"
+    type: "task",
   },
   {
     id: 15,
@@ -238,45 +238,45 @@ let tasks = [
     start: getDate(24 * 16),
     duration: 24 * 60 * 60 * 1000,
     percent: 0,
-    type: "task"
-  }
+    type: "task",
+  },
 ];
 let options = {
   taskMapping: {
-    progress: "percent"
+    progress: "percent",
   },
   maxRows: 100,
   maxHeight: 500,
   title: {
     label: "Your project title as html (link or whatever...)",
-    html: false
+    html: false,
   },
   row: {
-    height: 24
+    height: 24,
   },
   calendar: {
     hour: {
-      display: true
-    }
+      display: true,
+    },
   },
   chart: {
     progress: {
-      bar: false
+      bar: false,
     },
     expander: {
-      display: true
-    }
+      display: true,
+    },
   },
   taskList: {
     expander: {
-      straight: false
+      straight: false,
     },
     columns: [
       {
         id: 1,
         label: "ID",
         value: "id",
-        width: 40
+        width: 40,
       },
       {
         id: 2,
@@ -288,64 +288,64 @@ let options = {
         events: {
           click({ data, column }) {
             this.$Message.info(data.name);
-          }
-        }
+          },
+        },
       },
       {
         id: 3,
         label: "设备编号",
         value: "EquipmentNo",
         width: 160,
-        html: true
+        html: true,
       },
       {
         id: 4,
         label: "计划开始时间",
-        value: task => dayjs(task.start).format("YYYY-MM-DD"),
-        width: 100
+        value: (task) => dayjs(task.start).format("YYYY-MM-DD"),
+        width: 100,
       },
       {
         id: 5,
         label: "计划结束时间",
-        value: task => dayjs(task.endTime).format("YYYY-MM-DD"),
-        width: 100
+        value: (task) => dayjs(task.endTime).format("YYYY-MM-DD"),
+        width: 100,
       },
 
       {
         id: 6,
         label: "计划数量",
         value: "plan_qty",
-        width: 68
+        width: 68,
       },
       {
         id: 7,
         label: "投入数量",
         value: "put_into_qty",
-        width: 68
+        width: 68,
       },
       {
         id: 8,
         label: "派工数量",
         value: "dispatch_qty",
-        width: 68
-      },
-      {
-        id: 9,
-        label: "%",
-        value: "progress",
-        width: 35,
-        style: {
-          "task-list-header-label": {
-            "text-align": "center",
-            width: "100%"
+        width: 100,
       },
-          "task-list-item-value-container": {
-            "text-align": "center",
-            width: "100%"
-          }
-        }
-      }
-    ]
+      // {
+      //   id: 9,
+      //   label: "%",
+      //   value: "progress",
+      //   width: 35,
+      //   style: {
+      //     "task-list-header-label": {
+      //       "text-align": "center",
+      //       width: "100%",
+      //     },
+      //     "task-list-item-value-container": {
+      //       "text-align": "center",
+      //       width: "100%",
+      //     },
+      //   },
+      // },
+    ],
   },
   locale: {
     weekdays: ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
@@ -361,8 +361,8 @@ let options = {
       "九月",
       "十月",
       "十一月",
-      "十二月"
-    ]
+      "十二月",
+    ],
     // name: "en",
     // Now: "Now",
     // "X-Scale": "Zoom-X",
@@ -370,25 +370,25 @@ let options = {
     // "Task list width": "Task list",
     // "Before/After": "Expand",
     // "Display task list": "Task list"
-  }
+  },
 };
 
 export default {
   name: "Gantt",
   components: {
     GanttElastic,
-    GanttHeader
+    GanttHeader,
   },
   props: {
-    id: String
+    id: String,
   },
 
   data() {
     return {
-      tasks:[],
+      tasks: [],
       options,
       dynamicStyle: {},
-      lastId: 16
+      lastId: 16,
     };
   },
   created() {
@@ -399,62 +399,55 @@ export default {
   methods: {
     gantData() {
       if (this.id) {
-        Api.paged({ scheduleId: this.id })
-          .then(r => {
+        Api.getalldetails({ scheduleId: this.id })
+          .then((r) => {
             if (r.result) {
-              var parentId = r.result[0].id; //父级id
               var list = [];
+              r.result.map((u) => {
+                var parentId = u.id; //父级id
                 var obj = {
-                id: r.result[0].id,
+                  id: u.id,
                   // parentId: 0,
-                name: r.result[0].part_name,
-                start:GetTimeByTimeStr(r.result[0].plan_start) ,
+                  name: u.part_name,
+                  start: GetTimeByTimeStr(u.plan_start),
                   // endTime: GetTimeByTimeStr(r.result[0].plan_finish),
                   EquipmentNo: "/",
-                duration: GetTimeByTimeStr(r.result[0].plan_finish)-GetTimeByTimeStr(r.result[0].plan_start),
+                  duration:
+                    GetTimeByTimeStr(u.plan_finish) -
+                    GetTimeByTimeStr(u.plan_start),
                   percent: 85,
-                plan_qty: r.result[0].plan_qty,
+                  plan_qty: u.plan_qty,
                   put_into_qty: "/",
                   dispatch_qty: "/",
-                type: "project"
+                  type: "project",
                 };
                 list.push(obj);
-              Api.getdetail({
-                part_task_pk: r.result[0].id,
-                scheduleId: this.id
-              }).then(r => {
-                if (r.result) {
-                  for (var i = 0; i < r.result.length; i++) {
-                    var start=GetTimeByTimeStr(r.result[i].plan_start);
-                    var jg= GetTimeByTimeStr(r.result[i].plan_finish)- start;
+                if (u.children) {
+                  u.children.map((p,i) => {
+                    var start = GetTimeByTimeStr(p.plan_start);
+                    var jg = GetTimeByTimeStr(p.plan_finish) - start;
                     let temp = {
-                      id: r.result[i].op_task_pk,
-                      name: r.result[i].task_name,
-                      EquipmentNo: r.result[i].equip_id,
-                      // parentId: i<5?parentId:368,
+                      id: p.op_task_pk,
+                      name:p.task_name,
+                      EquipmentNo:p.equip_id,
                       parentId: parentId,                    
-                      // start: r.result[i].plan_start,
-                      // endTime: r.result[i].plan_finish,
-                      // endTime: "2020-7-30",
                       start: start,
                       duration: jg,
-                      percent: i*9,
-                      put_into_qty: r.result[i].put_into_qty,
-                      dispatch_qty: r.result[i].dispatch_qty,
-                      type:i%2?"task":'milestone',
-                      //  type: "milestone",
+                      percent: i * 9,
+                      put_into_qty:p.put_into_qty,
+                      dispatch_qty:p.dispatch_qty,
+                      type: i % 2 ? "task" : "milestone",
                     };
                     list.push(temp);
-                  }
-                    this.tasksUpdate(list);
-              console.warn(list)
+                  });
                 }
               });
-           
+              this.tasksUpdate(list);
             }
           })
-          .catch(error => {
-            this.$Message.error("请求失败");
+          .catch((error) => {
+            console.warn("err",error)
+            this.$Message.error("请求失败222");
           });
       }
     },
@@ -468,7 +461,7 @@ export default {
         start: getDate(24 * 3),
         duration: 1 * 24 * 60 * 60 * 1000,
         percent: 50,
-        type: "project"
+        type: "project",
       });
     },
     tasksUpdate(tasks) {
@@ -481,7 +474,7 @@ export default {
     },
     styleUpdate(style) {
       this.dynamicStyle = style;
-    }
-  }
+    },
+  },
 };
 </script>

pages/home/api.js

@@ -22,7 +22,5 @@ export default {
     list(params) {
         return Api.post(`${systemUrl}/newmessage/list`, params); //获取列表信息
     },
-    favoriteList(params) {
-        return Api.post(`${systemUrl}/favorite/list`, params); //获取收藏列表信息
-    },
+   
 }
\ No newline at end of file

pages/home/index.vue

@@ -8,7 +8,7 @@
       <div class="user-text">
         <p>你好：{{userData.userName}}，欢迎登录MES系统!</p>
         <p>
-          <span>{{userData.departmentTitle}}</span> &nbsp &nbsp
+          <span class="mr20">{{userData.departmentTitle}}</span>
           <span>{{userData.roleTitles}}</span>
         </p>
       </div>
@@ -16,37 +16,9 @@
         <div class="bg-b">
           <Icon type="ios-arrow-back" />
         </div>
-        <!-- <div class="bg" v-for="(item,index) in listFavorite" :key="index">
-           <Icon :type="item.icon" />
+        <div class="bg" v-for="(item,i) in collect" :key="i" @click="toPage(item)">
+          <Icon :type="item.icon||'md-mail'" />
           <p>{{item.title}}</p>
-        </div>-->
-        <div class="bg">
-          <Icon type="ios-cube" />
-          <p>电子对账单</p>
-        </div>
-        <div class="bg">
-          <Icon type="md-mail" />
-          <p>站内邮件</p>
-        </div>
-        <div class="bg">
-          <Icon type="md-map" />
-          <p>站内邮件</p>
-        </div>
-        <div class="bg">
-          <Icon type="ios-cube" />
-          <p>电子对账单</p>
-        </div>
-        <div class="bg">
-          <Icon type="ios-cube" />
-          <p>电子对账单</p>
-        </div>
-        <div class="bg">
-          <Icon type="md-mail" />
-          <p>站内邮件</p>
-        </div>
-        <div class="bg">
-          <Icon type="md-mail" />
-          <p>站内邮件</p>
         </div>
         <div class="bg-l">
           <Icon type="ios-arrow-forward" />
@@ -93,7 +65,7 @@ import Api from "./api";
 import Approval from "./component/approval";
 import UnreadMessage from "./component/unreadMessage";
 import StaChart from "./component/staChart";
-
+import { mapState } from "vuex";
 export default {
   components: {
     Approval,
@@ -110,10 +82,17 @@ export default {
       imgPath: true,
     };
   },
+  async fetch({ store, params }) {
+    await store.dispatch("collectList"); // 加载数据字典
+  },
   created() {
     this.get();
     this.getUserInfoFn();
-    this.getList();
+    console.log(this.$store.state.collect);
+    //  this.getList();
+  },
+  computed: {
+    ...mapState({ collect: "collect" }),
   },
   methods: {
     getUserInfoFn() {
@@ -139,27 +118,24 @@ export default {
       this.$api.get(url).then((r) => {
         list = r.result;
         list.forEach((data) => {
-          // console.log(data.totalUrl)
+          console.log(data.totalUrl);
           let ulrt = `http://${address}:` + data.totalUrl;
           data.totalUrl = 0;
           this.$api.get(ulrt).then((r) => {
             return (data.totalUrl = r.result);
           });
         });
-        console.log(list);
+
         this.listTask = list;
       });
     },
-    getList() {
-      let conditions = [];
-      Api.favoriteList({ conditions: conditions }).then((r) => {
-        this.listFavorite = r.result;
-      });
-    },
+
     goPage(u) {
-      // alert(u.menuUrl)
       this.$router.push(u.menuUrl);
     },
+    toPage(u) {
+      this.$router.push(u.url);
+    },
   },
 };
 </script>
@@ -207,11 +183,12 @@ export default {
       }
       .bg {
         text-align: center;
-        width: 100px;
+        width: 120px;
         float: left;
         .ivu-icon {
           font-size: 35px;
           color: #2680eb;
+          cursor: pointer;
         }
         p {
           margin-top: 8px;

pages/resourceManagement/productionResources/set.vue

@@ -61,7 +61,7 @@ export default {
       formItem: {
         equip_name: "",
         equip_id: "",
-        isimportant: "",
+        isimportant: 1,
         capabilityValue: ""
       },
       formItem1: {
@@ -113,7 +113,7 @@ export default {
         this.formItem.equip_name = r.result.title;
         this.formItem.equip_id = r.result.code;
         this.formItem.capabilityValue = r.result.capabilityValue;
-        this.formItem.isimportant = r.result.isimportant + "";
+        this.formItem.isimportant = r.result.isimportant || "1";
         this.formItem1.calendarwork_pk = r.result.calKey;
         this.formItem2.calendarovertime_pk = r.result.holidayKey;
         this.formItem1.equip_pk = r.result.id;

pages/technology/setProcess/details.vue

@@ -14,12 +14,7 @@ export default {
   data() {
     return {
       data1: [],
-
-      // easySearch: {
-      //   keys: { op: "unicode,name,code", value: null },
-      // },
       columns: [
-        // { type: "selection", width: 70, align: "center" },
         {
           title: "#",
           type: "index",

store/index.js

@@ -11,6 +11,7 @@ export const state = () => ({
   },
   departments:{},//部门列表
   cart: [],
+  collect:[],//用户收藏
   count: 0,
   countAps: 0, //aps排产
   countAi: 0, //智能排产
@@ -66,6 +67,9 @@ export const mutations = {
   addUser(state, user) {
     state.userMap.push(user);
   },
+  setCollect(state, collectData) {
+    state.collect = collectData;
+  },
   setDictionary(state, dictionary) {
     state.dictionary = dictionary;
   },
@@ -94,6 +98,16 @@ export const mutations = {
 }
 
 export const actions = {
+  async collectList({
+    commit
+  }) {
+
+    let {
+      result
+    } = await Api.post(`${systemUrl}/favorite/listbyuser`);
+    console.warn("result", result)
+    commit("setCollect", result);
+  },
   async loadUser({
     commit
   }, key) {