From 3a82aab402e8cdee192ab47405f2a01973bd4dab Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 11 Apr 2022 11:46:25 +0800
Subject: [PATCH] 文件存储地址修改

---
 src/views/home/index.vue |   99 +++++++++++++++++++++++--------------------------
 1 files changed, 47 insertions(+), 52 deletions(-)

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 803c696..dfd5052 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -41,7 +41,7 @@
         ></i>
       </span>
     </Approval>
-    <cardPopup class="crossRegion" :data="dataCard">
+    <cardPopup class="crossRegion" :data="dataCard" :together="together">
       <span slot="close">
         <i class="el-icon-close ApprovalClose" @click="openClose"> </i>
       </span>
@@ -68,72 +68,36 @@
       userName: "",
       data: [],
       dataCard: [],
+      together: [],
       out: true,
       d: [],
     };
   },
   computed: {
-    ...mapGetters(["userInfo", "ApprovalShow", "useWhere", "canDoIt"]),
+    ...mapGetters(["userInfo", "ApprovalShow", "useWhere"]),
   },
   created() {
     this.cc();
-    this.dataCard = ourDatas;
+    // this.dataCard = ourDatas;
     var cando = [];
+    var normal = [];
+    var both = [];
     for (var k in ourDatas) {
+      if (ourDatas[k].fromWhere != undefined) {
+        both.push(ourDatas[k]);
+        continue;
+      }
+      normal.push(ourDatas[k]);
       cando.push({
         opens: true,
         type: ourDatas[k].type,
       });
     }
+    this.dataCard = normal;
+    this.together = both;
     this.$store.commit("setcanDoIt", cando);
   },
   methods: {
-    // onLoad(page, params = {}, val) {
-    // params["cardid"] = this.userInfo.Id;
-    // getList(page.currentPage, page.pageSize, params).then((res) => {
-    //   const data = res.data.data;
-    //   this.data = data.records;
-    //   getListre(page.currentPage, page.pageSize, params).then((ress) => {
-    //     this.data = this.data.concat(ress.data.data.records);
-    //     getListrek(page.currentPage, page.pageSize, params).then((resk) => {
-    //       this.data = this.data.concat(resk.data.data.records);
-    //       getListrev(page.currentPage, page.pageSize, params).then((resv) => {
-    //         this.data = this.data.concat(resv.data.data.records);
-    //         console.log("已有申请数量:", this.data.length);
-    //         console.log(val);
-    //         if (this.data.length == 0) {
-    //           this.$store.commit("changecanDoIt", {
-    //             o: true,
-    //             ptype: val,
-    //           });
-    //           console.log("一条数据都没有");
-    //           this.$store.commit("changeuseWhere", val);
-    //           return;
-    //         }
-    //         this.data.forEach((item) => {
-    //           if (item.ptype == val) {
-    //             if (item.type == 0 || item.type == 2) {
-    //               this.$store.commit("changecanDoIt", {
-    //                 o: false,
-    //                 ptype: val,
-    //               });
-    //               console.log("有数据");
-    //               this.$store.commit("changeuseWhere", val);
-    //             } else {
-    //               this.$store.commit("changecanDoIt", {
-    //                 o: true,
-    //                 ptype: val,
-    //               });
-    //               console.log("无数据");
-    //               this.$store.commit("changeuseWhere", val);
-    //             }
-    //           }
-    //         });
-    //       });
-    //     });
-    //   });
-    // });
-    // },
     cc: function () {
       this.userName = this.userInfo.user_name;
     },
@@ -239,7 +203,8 @@
       }
     }
     .b_main {
-      width: 1311px;
+      // width: 1105px;// 3个一行
+      width: 1475px; //4个一行
       height: calc(100% - 220px);
       // border: 1px solid red;
       margin: 0 auto;
@@ -261,6 +226,14 @@
     left: calc(50% - 621px);
     width: 1243px;
     // height: 766px;
+  }
+  .OnceChouse {
+    position: absolute;
+    top: calc(50% - 200px);
+    left: calc(50% - 300px);
+    width: 600px;
+    height: 400px;
+    // background-color: #fff;
   }
 
   .ApprovalClose {
@@ -285,12 +258,12 @@
   width: calc(100% - 10px);
   height: 40px;
   position: relative;
-  top: 10px;
+  top: 13px;
   color: #fff;
   border-radius: 10px 10px 0 0;
   text-align: center;
   line-height: 40px;
-  left: 0;
+  left: 1px;
   background-color: #25aff3;
 }
 .first-box-outer {
@@ -337,4 +310,26 @@
   height: 100%;
   background-color: rgba($color: #7a7a7a, $alpha: 0.1);
 }
+
+//单选大小
+.el-radio__inner {
+  width: 25px;
+  height: 25px;
+}
+.el-radio__inner::after {
+  width: 8px;
+  height: 8px;
+  // left: calc(50% - 4px);
+  // top: calc(50% - 4px);
+}
+.el-radio__label {
+  font-size: 16px;
+  font-weight: 700;
+  font: Helvetica Neue, Helvetica, PingFang SC, \5fae\8f6f\96c5\9ed1, Tahoma,
+    Arial, sans-serif;
+}
+.choseTitle {
+  padding: 15px 28px;
+  font-size: 14px;
+}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3