From c5babe0fc3500f8b66215efff99a0fa1a3069512 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 03 Mar 2022 14:39:04 +0800
Subject: [PATCH] 新增地图，围栏管理页面新增
---
src/views/rail/rail.vue | 121 ++++++++++++++++++++++------------------
1 files changed, 66 insertions(+), 55 deletions(-)
diff --git a/src/views/rail/rail.vue b/src/views/rail/rail.vue
index fb16e24..018add1 100644
--- a/src/views/rail/rail.vue
+++ b/src/views/rail/rail.vue
@@ -29,12 +29,39 @@
size="small"
plain
icon="el-icon-delete"
- v-if="permission.contract_delete"
+ v-if="permission.rail_delete"
@click="handleDelete"
>删 除
</el-button>
</template>
+ <template slot-scope="{ type, row }" slot="menu">
+ <el-button
+ :type="type"
+ size="small"
+ icon="el-icon-folder-checked"
+ :disabled="row.applyStatus == 4"
+ @click="handleAudit(row)"
+ >查看围栏
+ </el-button>
+ </template>
+ <!-- 地图插入 -->
+ <template slot-scope="{ type, disabled }" slot="lineForm">
+ <div class="mapClassMain" style="width: 860px; height: 400px">
+ <Map ref="modalForm" />
+ </div>
+ </template>
</avue-crud>
+
+ <el-drawer title="电子地图" append-to-body="true" :visible.sync="showMap">
+ <iframe
+ id="mapDiv"
+ ref="mapDiv"
+ src="/map/index.html?openid=ClientManagement&ISinit=1"
+ frameborder="0"
+ width="100%"
+ height="100%"
+ ></iframe>
+ </el-drawer>
</basic-container>
</template>
@@ -44,9 +71,8 @@
add,
update,
remove
-} from "@/api/contract/contract";
+} from "@/api/rail/rail";
import { mapGetters } from "vuex";
-import { getToken } from "@/util/auth";
export default {
data() {
return {
@@ -64,16 +90,17 @@
index: true,
tip:false,
addBtn: true,
+ viewBtn: true,
searchSize: "mini",
searchMenuSpan: 6,
height: 583,
- menuWidth: 180,
+ menuWidth: 300,
border: true,
align: "center",
selection: true,
column: [
{
- label: "合同名称",
+ label: "围栏名称",
prop: "name",
search: true,
searchSpan: 4,
@@ -83,7 +110,7 @@
rules: [
{
required: true,
- message: "请选择合同名称",
+ message: "请输入围栏名称",
trigger: "click"
}
],
@@ -91,21 +118,21 @@
},
{
- label: "合同甲方",
- prop: "partya",
+ label: "类型",
+ prop: "type",
span: 12,
labelWidth: 145,
disabled: false,
rules: [
{
required: true,
- message: "请输入合同甲方",
+ message: "请选择类型",
trigger: "blur"
}
]
},
{
- label: "合同乙方",
+ label: "企业名称",
prop: "partyb",
span: 12,
labelWidth: 145,
@@ -113,55 +140,38 @@
rules: [
{
required: true,
- message: "请输入合同乙方",
+ message: "请输入企业名称",
trigger: "blur"
}
]
},
{
- label: "合同金额",
- prop: "money",
- span: 12,
- labelWidth: 145,
- disabled: false,
- rules: [
- {
- required: true,
- message: "请输入合同金额",
- trigger: "blur"
- }
- ]
- },
- {
- label: "签订日期",
- prop: "signedTime",
+ label: "创建日期",
+ prop: "createTime",
labelWidth: 145,
type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
+ format: "yyyy-MM-dd HH:mm:ss",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ addDisabled:false,
+ addDisplay:false,
rules: [
{
required: true,
- message: "请选择签订日期",
+ message: "请选择创建日期",
trigger: "blur"
}
]
},
{
- label: "纸质合同图片",
- prop: "urls",
- labelWidth: 145,
- type: "upload",
- dataType: "string",
+ label: "路线展示",
+ labelWidth: "0",
+ prop: "line",
+ className: "mapClass",
+ hide: true,
+ display: true,
span: 24,
- limit: 5,
- listType: "picture-card",
- tip: "只能上传jpg/png文件,最多上传5张",
- propsHttp: {
- res: "data",
- url: "url"
- },
- action: "/api/blade-resource/oss/endpoint/put-files"
+ formslot: true,
+ addDisplay: true,
}
],
...this.$store.state.control.clearOtherBut
@@ -174,10 +184,10 @@
...mapGetters(["userInfo", "permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.contract_add, false),
- viewBtn: this.vaildData(this.permission.contract_view, false),
- delBtn: this.vaildData(this.permission.contract_delete, false),
- editBtn: this.vaildData(this.permission.contract_edit, false)
+ addBtn: this.vaildData(this.permission.rail_add, false),
+ viewBtn: this.vaildData(this.permission.rail_view, false),
+ delBtn: this.vaildData(this.permission.rail_delete, false),
+ editBtn: this.vaildData(this.permission.rail_edit, false)
};
},
ids() {
@@ -327,14 +337,15 @@
// border: 1px solid #000;
box-sizing: border-box;
}
-// .el-card__body {
-// padding-bottom: 5px !important;
-// }
-// .avue-crud__tip,
-// .el-tag,
-// .el-tag--light {
-// padding: 0 !important;
-// }
+
+
+.mapClass div label {
+ display: none;
+}
+
+.mapClassMain {
+ padding-left: 25px !important;
+}
.lod {
position: absolute;
--
Gitblit v1.9.3