From 2a0832dc0aedfef9b7cf38329eb75f390331e7ff Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 08 May 2024 17:30:42 +0800
Subject: [PATCH] 无诈调整
---
vue.config.js | 4 +-
src/components/Approval/Approval.vue | 4 +-
src/components/cardPopup/cardPopuponce.vue | 72 +++++++++++++++++++++++++++++++++++-
src/components/cardPopup/cardPopup.vue | 5 --
4 files changed, 74 insertions(+), 11 deletions(-)
diff --git a/src/components/Approval/Approval.vue b/src/components/Approval/Approval.vue
index dc701bd..fecc4cf 100644
--- a/src/components/Approval/Approval.vue
+++ b/src/components/Approval/Approval.vue
@@ -252,8 +252,8 @@
this.openOnceShow = false;
},
onLoad(page, params = {}) {
- console.log("userId*****" + window.localStorage.getItem("saber-userInfo"))
- console.log("userId2*****" + JSON.parse(window.localStorage.getItem("saber-userInfo")).content.user_id)
+ // console.log("userId*****" + window.localStorage.getItem("saber-userInfo"))
+ // console.log("userId2*****" + JSON.parse(window.localStorage.getItem("saber-userInfo")).content.user_id)
this.loading = true;
params.createUser = JSON.parse(window.localStorage.getItem("saber-userInfo")).content.user_id
getList(
diff --git a/src/components/cardPopup/cardPopup.vue b/src/components/cardPopup/cardPopup.vue
index 240c6f3..9b77dd4 100644
--- a/src/components/cardPopup/cardPopup.vue
+++ b/src/components/cardPopup/cardPopup.vue
@@ -407,11 +407,6 @@
patrolGroupTree(data).then((res) => {
console.log("*****res********" + JSON.stringify(res))
this.patrolGroup = res.data.data
- // this.qx();
- // this.$message({
- // message: "暂存申请成功",
- // type: "success"
- // });
});
},
diff --git a/src/components/cardPopup/cardPopuponce.vue b/src/components/cardPopup/cardPopuponce.vue
index 61b9c8b..6ff6599 100644
--- a/src/components/cardPopup/cardPopuponce.vue
+++ b/src/components/cardPopup/cardPopuponce.vue
@@ -13,7 +13,7 @@
<avue-form ref="form1" v-model="obj0" :option="option" @submit="submit" class="cardButs"></avue-form>
</el-collapse-item>
<el-collapse-item title="附件上传" name="2">
- <div v-for="(item,index) in this.obj0.taskPlaceRecordVOList">
+ <div v-for="(item,index) in patrolGroup">
<div style="font-weight: bold;font-size: 20px;">
{{item.title}}
</div>
@@ -22,6 +22,8 @@
{{index1+1}} {{item1.title}}
</div>
<div style="margin: 10px;">
+ <el-button v-if="item1.images" @click="handleExport(item1.images)" size="small"
+ type="primary">下载文件</el-button>
<!-- <el-upload class="upload-demo" :limit="1" :data="item1" :on-change="handleChange"
:http-request="uploadFile">
<el-button size="small" type="primary">点击上传</el-button>
@@ -39,6 +41,12 @@
import {
ourDatas
} from "@/views/home/ourDatas";
+ import {
+ add,
+ patrolGroupTree,
+ selectIn,
+ uploadFile
+ } from "@/api/recordOur/outCardPopup";
import attach from "@/components/attach/attach";
import {
mapGetters
@@ -63,6 +71,7 @@
submitBtn: true,
gutter: 50,
column: [{
+ disabled: true,
labelWidth: 100,
label: "场所名称",
prop: "placeName",
@@ -73,6 +82,7 @@
trigger: "blur"
}]
}, {
+ disabled: true,
labelWidth: 100,
label: "负责人名称",
prop: "principal",
@@ -84,6 +94,7 @@
}]
},
{
+ disabled: true,
labelWidth: 100,
label: "负责人电话",
prop: "principalPhone",
@@ -95,6 +106,7 @@
}]
},
{
+ disabled: true,
labelWidth: 100,
// width: 160,
overHidden: true,
@@ -123,6 +135,7 @@
}, ],
},
{
+ disabled: true,
labelWidth: 100,
label: "派出所名称",
prop: "pcsName",
@@ -134,7 +147,7 @@
}]
},
{
- // width: 156,
+ disabled: true,
labelWidth: 100,
overHidden: true,
label: "社区名称",
@@ -218,8 +231,63 @@
// console.log(cloum);
this.paredData.jurisdiction = this.paredData.$jurisdiction;
this.obj0 = this.paredData;
+ this.getPatrolGroupTree()
console.log("this.obj0******************" + JSON.stringify(this.obj0));
},
+ methods: {
+ handleExport(url) {
+ var elemIF = document.createElement('iframe')
+ elemIF.src = url;
+ elemIF.style.display = 'none'
+ document.body.appendChild(elemIF)
+ },
+ getPatrolGroupTree() {
+ let data = {
+ childType: 6,
+ type: 2
+ }
+ patrolGroupTree(data).then((res) => {
+ // console.log("*****res********" + JSON.stringify(res))
+ this.patrolGroup = res.data.data
+ this.patrolGroup.forEach(item => {
+ // console.log(item)
+ item.children.forEach(items => {
+ console.log(items)
+ this.obj0.taskPlaceRecordVOList.forEach(itemss => {
+ console.log("************789**************" + JSON.stringify(itemss))
+ if (items.id === itemss.itemId.toString()) {
+ items.images = itemss.imageUrls
+ console.log("************123**************")
+ }
+ })
+ })
+ })
+ // for (var i = 0; i < this.patrolGroup.length; i++) {
+ // for (var i = 0; i < this.patrolGroup[i].children.length; i++) {
+ // for (var i = 0; i < this.obj0.taskPlaceRecordVOList.length; i++) {
+ // console.log(this.patrolGroup[i].children[i].id)
+ // if (this.patrolGroup[i].children[i].id === this.obj0.taskPlaceRecordVOList[i].itemId) {
+ // this.patrolGroup[i].children[i].images = this.obj0.taskPlaceRecordVOList[i].imageUrls
+ // }
+ // }
+ // }
+ // }
+
+
+ // for (let var1 in this.patrolGroup) {
+ // console.log(var1.id)
+ // for (let var2 in var1.children) {
+ // console.log(var2.id)
+ // for (let var3 in this.obj0.taskPlaceRecordVOList) {
+ // if (var2.id === var3.itemId) {
+ // var2.images = var3.imageUrls
+ // }
+ // }
+ // }
+ // }
+ });
+ },
+ }
};
</script>
<style lang="scss" scoped>
diff --git a/vue.config.js b/vue.config.js
index dc7e87c..9f3699e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -28,9 +28,9 @@
proxy: {
'/api': {
//本地服务接口地址
- target: 'http://localhost:9528',
+ // target: 'http://localhost:9528',
//远程演示服务地址,可用于直接启动项目
- // target: 'https://srgdjczzxtpt.com:2080/api',
+ target: 'https://srgdjczzxtpt.com:2080/api',
// target: "http://61.131.136.25:2080/api",
// target: 'http://60.220.177.113:2081/api',
ws: true,
--
Gitblit v1.9.3