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 | 130 ++++++++++++++++++++++++-------------------
1 files changed, 73 insertions(+), 57 deletions(-)
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 69a30b7..dfd5052 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -26,13 +26,14 @@
:data="item"
:ind="item.type"
@open="openMain"
- v-show="showCard"
></examineCard>
+ <!-- v-show="showCard" -->
<!-- :background="" -->
</div>
</div>
+ <div class="zhezhao" v-show="useWhere != 'close' || ApprovalShow"></div>
<!-- 审批进度查询 -->
- <Approval class="Approval">
+ <Approval class="Approval" :data="dataCard">
<span slot="close">
<i
class="el-icon-close ApprovalClose breakApprovalClose"
@@ -40,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>
@@ -53,13 +54,6 @@
import examineCard from "@/components/examineCard/examineCard.vue"; //卡片
import Approval from "@/components/Approval/Approval.vue"; //审批进度查询
import cardPopup from "@/components/cardPopup/cardPopup.vue"; // 卡片弹窗
-import {
- // getDetail,
- getList,
- getListre,
- getListrek,
- getListrev,
-} from "@/api/permit/permit";
import { mapGetters } from "vuex";
import { resetRouter } from "@/router/router";
@@ -69,16 +63,12 @@
Approval: Approval,
cardPopup: cardPopup,
},
- computed: {
- ...mapGetters(["userInfo"]),
- },
data() {
return {
userName: "",
- showCard: false,
- zhezao: false,
data: [],
dataCard: [],
+ together: [],
out: true,
d: [],
};
@@ -88,45 +78,26 @@
},
created() {
this.cc();
- var page = {
- pageSize: 10,
- currentPage: 1,
- total: 0,
- };
- this.onLoad(page);
- 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 = {}) {
- 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);
- if (this.data.length >= 1) {
- // this.$store.commit("changehandle", false);
- } else {
- // this.$store.commit("changehandle", true);
- }
- this.showCard = true;
- this.data.forEach((item) => {
- for (const key in this.dataCard) {
- if (this.dataCard[key].type == item.ptype) {
- console.log("已申请名称", this.dataCard[key].menuName);
- }
- }
- });
- });
- });
- });
- });
- },
cc: function () {
this.userName = this.userInfo.user_name;
},
@@ -157,6 +128,7 @@
this.$store.commit("doitApprovalShow", true);
return;
}
+ // this.onLoad(this.page, {}, val);
this.$store.commit("changeuseWhere", val);
},
},
@@ -207,6 +179,10 @@
width: 100%;
height: calc(100% - 50px);
.title {
+ h2 {
+ position: relative;
+ left: 60px;
+ }
width: 100%;
height: 200px;
// border: 1px solid red;
@@ -227,7 +203,8 @@
}
}
.b_main {
- width: 1311px;
+ // width: 1105px;// 3个一行
+ width: 1475px; //4个一行
height: calc(100% - 220px);
// border: 1px solid red;
margin: 0 auto;
@@ -249,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 {
@@ -273,18 +258,18 @@
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 {
width: 100%;
- max-height: 682px;
- overflow-y: scroll;
+ max-height: 685px;
+ overflow-y: hidden;
overflow-x: hidden;
.f-b-o-in {
width: 100%;
@@ -316,4 +301,35 @@
.el-collapse-item__header {
font-size: 20px !important;
}
+
+.zhezhao {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ 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