From fed36d52707c61dbff16bf75fceb6370cca54ea2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 18 Dec 2023 17:58:29 +0800
Subject: [PATCH] 住房管理和房屋管理更改
---
src/warterMarkVUE.js | 8
src/views/userHouse/houseList.vue | 1079 +++++++++++++++++++++++++++--------------------------
src/views/userHouse/houseHoldList.vue | 35 +
src/App.vue | 20
4 files changed, 603 insertions(+), 539 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 4659fa9..a5b920b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,19 +6,33 @@
<script>
import Watermark from "./warterMarkVUE"
+import { getStore } from "@/util/store"
export default {
name: "app",
data () {
- return {}
+ return {
+ globalUserInfo: getStore({ name: "userInfo" }),
+ }
},
watch: {},
created () {
- Watermark.set("饶城格格")
+ Watermark.set("饶城格格通" + ' ' + this.globalUserInfo.user_name + ' ' + this.getTime())
},
mounted () {
},
- methods: {},
+ methods: {
+ getTime () {
+ var date = new Date()
+ var Y = date.getFullYear() + '-'
+ var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
+ var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '
+ var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':'
+ var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':'
+ var s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds())
+ return Y + M + D + h + m + s
+ },
+ },
computed: {}
}
</script>
diff --git a/src/views/userHouse/houseHoldList.vue b/src/views/userHouse/houseHoldList.vue
index 543241f..f92c68d 100644
--- a/src/views/userHouse/houseHoldList.vue
+++ b/src/views/userHouse/houseHoldList.vue
@@ -32,6 +32,11 @@
<el-button type="text" @click="showStringDispose(row, 'idCardflag')"
v-text="textDispose(row, 'idCardflag', 'idCard')"></el-button>
</template>
+
+ <template slot-scope="{row}" slot="householdLabelList">
+ {{ labelDispose(row.householdLabelList) }}
+ </template>
+
<template slot-scope="{row}" slot="tenantName">
<el-tag>{{ row.tenantName }}</el-tag>
</template>
@@ -44,6 +49,8 @@
<template slot-scope="{row}" slot="userTypeName">
<el-tag>{{ row.userTypeName }}</el-tag>
</template>
+
+
</avue-crud>
<el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px" center>
@@ -139,6 +146,7 @@
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import Qs from "qs"
+import { lintOnSave } from "../../../vue.config"
export default {
data () {
@@ -171,6 +179,7 @@
dialogType: 'drawer',
dialogClickModal: false,
menuWidth: 280,
+ menuFixed: 'right',
column: [{
label: "姓名",
prop: "name",
@@ -185,12 +194,12 @@
slot: true,
},
{
+ width: 160,
label: "身份证号",
prop: "idCard",
search: true,
searchSpan: 4,
slot: true,
-
},
{
label: "性别",
@@ -230,6 +239,19 @@
{
label: "地址",
prop: "address",
+ display: false
+ },
+
+ {
+ label: "地址",
+ prop: "address",
+ display: false
+ },
+
+ {
+ width: 210,
+ label: "标签",
+ prop: "householdLabelList",
display: false
},
]
@@ -348,6 +370,12 @@
}
}
}
+ },
+
+ labelDispose () {
+ return (list) => {
+ return list.map(item => item.labelName).join(',')
+ }
}
},
mounted () { },
@@ -359,6 +387,8 @@
labelId: this.currentLabel.id
}
removeHouseholdLabel(params).then(res => {
+ this.onLoad(this.page)
+
this.$message({
type: "success",
message: "操作成功!"
@@ -372,7 +402,10 @@
this.labelForm.householdId = this.currentRow.id
this.labelForm.labelId = this.currentLabel.id
this.labelForm.lableType = 1
+
saveOrUpdateHouseholdLabel(this.labelForm).then(res => {
+ this.onLoad(this.page)
+
this.$message({
type: "success",
message: "操作成功!"
diff --git a/src/views/userHouse/houseList.vue b/src/views/userHouse/houseList.vue
index 4220ab9..e0c1a9a 100644
--- a/src/views/userHouse/houseList.vue
+++ b/src/views/userHouse/houseList.vue
@@ -1,586 +1,603 @@
<template>
- <el-row>
- <el-col :span="24">
- <basic-container>
- <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
- v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
- :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
- @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
- @refresh-change="refreshChange" @on-load="onLoad">
- <template slot="menuLeft">
- <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.user_delete"
- @click="handleDelete">删 除
- </el-button>
- <el-button type="success" size="small" plain v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-upload2" @click="handleImport">导入
- </el-button>
- <el-button type="warning" size="small" plain v-if="userInfo.role_name.includes('admin')"
- icon="el-icon-download" @click="handleExport">导出
- </el-button>
- </template>
- <template slot-scope="scope" slot="menu">
- <el-button type="text" icon="el-icon-circle-plus-outline" size="small" v-if="permission.househould_manager"
- @click="handleHouseholdManager(scope.row)">住户管理
- </el-button>
- <el-button type="text" icon="el-icon-circle-plus-outline" size="small" v-if="permission.househould_manager"
- @click="manageLabel(scope.row)">标签
- </el-button>
- </template>
+ <el-row>
+ <el-col :span="24">
+ <basic-container>
+ <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
+ v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate"
+ @row-save="rowSave" :before-open="beforeOpen" :page.sync="page" @search-change="searchChange"
+ @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
+ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+ <template slot="menuLeft">
+ <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.user_delete"
+ @click="handleDelete">删 除
+ </el-button>
+ <el-button type="success" size="small" plain v-if="userInfo.role_name.includes('admin')"
+ icon="el-icon-upload2" @click="handleImport">导入
+ </el-button>
+ <el-button type="warning" size="small" plain v-if="userInfo.role_name.includes('admin')"
+ icon="el-icon-download" @click="handleExport">导出
+ </el-button>
+ </template>
+ <template slot-scope="scope" slot="menu">
+ <el-button type="text" icon="el-icon-circle-plus-outline" size="small"
+ v-if="permission.househould_manager" @click="handleHouseholdManager(scope.row)">住户管理
+ </el-button>
+ <el-button type="text" icon="el-icon-circle-plus-outline" size="small"
+ v-if="permission.househould_manager" @click="manageLabel(scope.row)">标签
+ </el-button>
+ </template>
- <template slot-scope="{row}" slot="tenantName">
- <el-tag>{{ row.tenantName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="roleName">
- <el-tag>{{ row.roleName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="deptName">
- <el-tag>{{ row.deptName }}</el-tag>
- </template>
- <template slot-scope="{row}" slot="userTypeName">
- <el-tag>{{ row.userTypeName }}</el-tag>
- </template>
- </avue-crud>
- <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px">
+ <template slot-scope="{row}" slot="tenantName">
+ <el-tag>{{ row.tenantName }}</el-tag>
+ </template>
+ <template slot-scope="{row}" slot="roleName">
+ <el-tag>{{ row.roleName }}</el-tag>
+ </template>
+ <template slot-scope="{row}" slot="deptName">
+ <el-tag>{{ row.deptName }}</el-tag>
+ </template>
+ <template slot-scope="{row}" slot="userTypeName">
+ <el-tag>{{ row.userTypeName }}</el-tag>
+ </template>
- <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id" ref="treeRole"
- :default-checked-keys="roleTreeObj" :props="props">
- </el-tree>
+ <template slot-scope="{row}" slot="userHouseLabelVOList">
+ {{ labelDispose(row.userHouseLabelVOList) }}
+ </template>
+ </avue-crud>
+ <el-dialog title="用户角色配置" append-to-body :visible.sync="roleBox" width="345px">
- <span slot="footer" class="dialog-footer">
- <el-button @click="roleBox = false">取 消</el-button>
- <el-button type="primary" @click="submitRole">确 定</el-button>
- </span>
- </el-dialog>
+ <el-tree :data="roleGrantList" show-checkbox check-strictly default-expand-all node-key="id"
+ ref="treeRole" :default-checked-keys="roleTreeObj" :props="props">
+ </el-tree>
- <el-dialog title="标签管理" append-to-body :visible.sync="labelFlag" center width="600px">
- <div id="" class="grid-container2">
- <div class="grid-item" :style="{ backgroundColor: item.color}" v-for="(item,index) in labelData "
- @click="changLabel(item)">
- {{item.name}}
- </div>
- </div>
- <!-- <span slot="footer" class="dialog-footer">
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="roleBox = false">取 消</el-button>
+ <el-button type="primary" @click="submitRole">确 定</el-button>
+ </span>
+ </el-dialog>
+
+ <el-dialog title="标签管理" append-to-body :visible.sync="labelFlag" center width="600px">
+ <div id="" class="grid-container2">
+ <div class="grid-item" :style="{ backgroundColor: item.color }" v-for="(item, index) in labelData "
+ @click="changLabel(item)">
+ {{ item.name }}
+ </div>
+ </div>
+ <!-- <span slot="footer" class="dialog-footer">
<el-button @click="labelFlag = false">取 消</el-button>
<el-button type="primary" @click="submitRole">确 定</el-button>
</span> -->
- </el-dialog>
+ </el-dialog>
- <el-dialog :title="'编辑标签 ' + currentLabel.name" append-to-body :visible.sync="editLabelFlge" width="655px">
- <avue-form :option="labelOption" v-model="labelForm" :submit="onsubmit">
- </avue-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="editLabelFlge = false">取 消</el-button>
- <el-button type="primary" @click="onsubmit">确 定</el-button>
- </span>
- </el-dialog>
+ <el-dialog :title="'编辑标签 ' + currentLabel.name" append-to-body :visible.sync="editLabelFlge"
+ width="655px">
+ <avue-form :option="labelOption" v-model="labelForm" :submit="onsubmit">
+ </avue-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="editLabelFlge = false">取 消</el-button>
+ <el-button type="primary" @click="onsubmit">确 定</el-button>
+ </span>
+ </el-dialog>
- <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
- <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
- <template slot="excelTemplate">
- <el-button type="primary" @click="handleTemplate">
- 点击下载<i class="el-icon-download el-icon--right"></i>
- </el-button>
- </template>
- </avue-form>
- </el-dialog>
- <el-dialog title="住户管理" append-to-body :visible.sync="householdManagerVisible" width="70%" height="60%">
- <householdManager ref="householdManager" />
- </el-dialog>
- </basic-container>
- </el-col>
- </el-row>
+ <el-dialog title="用户数据导入" append-to-body :visible.sync="excelBox" width="555px">
+ <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
+ </el-button>
+ </template>
+ </avue-form>
+ </el-dialog>
+ <el-dialog title="住户管理" append-to-body :visible.sync="householdManagerVisible" width="70%" height="60%">
+ <householdManager ref="householdManager" />
+ </el-dialog>
+ </basic-container>
+ </el-col>
+ </el-row>
</template>
<script>
- import {
+import {
getList,
remove,
add,
update,
getDetatil,
getDetatils
- } from "@/api/userHouse/list/house.js";
- import {
+} from "@/api/userHouse/list/house.js"
+import {
removeHouseholdLabel,
saveOrUpdateHouseholdLabel
- } from "@/api/userHouse/list/userHouseList.js";
- import {
+} from "@/api/userHouse/list/userHouseList.js"
+import {
getLabelList,
- } from '@/api/label/label'
- import {
+} from '@/api/label/label'
+import {
exportBlob
- } from "@/api/common";
- import {
+} from "@/api/common"
+import {
mapGetters
- } from "vuex";
- import website from '@/config/website';
- import {
+} from "vuex"
+import website from '@/config/website'
+import {
getToken
- } from '@/util/auth';
- import {
+} from '@/util/auth'
+import {
downloadXls
- } from "@/util/util";
- import {
+} from "@/util/util"
+import {
dateNow
- } from "@/util/date";
- import NProgress from 'nprogress';
- import 'nprogress/nprogress.css';
- import func from "@/util/func";
- import householdManager from "./components/householdManager";
- import Qs from "qs";
- export default {
+} from "@/util/date"
+import NProgress from 'nprogress'
+import 'nprogress/nprogress.css'
+import func from "@/util/func"
+import householdManager from "./components/householdManager"
+import Qs from "qs"
+export default {
components: {
- householdManager
+ householdManager
},
- data() {
- return {
- labelData: [],
- labelForm: {},
- userHouseLabelVOList: [],
- currentLabel: {},
- labelOption: {
- submitBtn: false,
- emptyBtn: false,
- column: [{
- label: '级别',
- prop: 'color',
- type: 'radio',
- button: true,
- row: true,
- dicData: [{
- label: '撤销',
- value: '#EBEDF0'
- }, {
- label: '绿',
- value: '#30D17C'
- }, {
- label: '黄',
- value: '#FFB42B'
- }, {
- label: '红',
- value: '#EA1F1F'
- }],
- rules: [{
- required: true,
- message: "请选择",
- trigger: "blur"
- }]
- }, {
- row: true,
- label: '备注',
- prop: 'remark',
- type: 'input'
- }]
- },
- editLabelFlge: false,
- labelFlag: false,
- householdManagerVisible: false,
- form: {},
- search: {},
- excelBox: false,
- selectionList: [],
- query: {},
- loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0
- },
- option: {
- height: 'auto',
- calcHeight: 80,
- tip: false,
- searchShow: true,
- searchMenuSpan: 6,
- border: true,
- index: true,
- selection: true,
- viewBtn: true,
- dialogType: 'drawer',
- dialogClickModal: false,
- menuWidth: 280,
- column: [{
- label: "房屋编号",
- prop: "houseCode",
- width: 180,
- hide: true,
- display: false
+ data () {
+ return {
+ labelData: [],
+ labelForm: {},
+ userHouseLabelVOList: [],
+ currentLabel: {},
+ labelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [{
+ label: '级别',
+ prop: 'color',
+ type: 'radio',
+ button: true,
+ row: true,
+ dicData: [{
+ label: '撤销',
+ value: '#EBEDF0'
+ }, {
+ label: '绿',
+ value: '#30D17C'
+ }, {
+ label: '黄',
+ value: '#FFB42B'
+ }, {
+ label: '红',
+ value: '#EA1F1F'
+ }],
+ rules: [{
+ required: true,
+ message: "请选择",
+ trigger: "blur"
+ }]
+ }, {
+ row: true,
+ label: '备注',
+ prop: 'remark',
+ type: 'input'
+ }]
},
- {
- label: "地址",
- prop: "address",
- width: 180,
- display: false
+ editLabelFlge: false,
+ labelFlag: false,
+ householdManagerVisible: false,
+ form: {},
+ search: {},
+ excelBox: false,
+ selectionList: [],
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
},
- {
- label: "小区",
- prop: "districtName",
- search: true,
- rules: [{
- required: true,
- message: "请选择小区",
- trigger: "blur",
- }, ],
- },
- {
- label: "手机",
- prop: "phone",
- rules: [{
- required: true,
- message: "请输入绑定手机",
- trigger: "blur",
- }, ],
- },
- {
- label: "幢",
- prop: "building",
- hide: true
- },
- {
- label: "单元",
- prop: "unit",
- hide: true
- },
- {
- label: "室",
- prop: "room",
- hide: true
- },
- {
- label: "楼层",
- prop: "floor",
- type: "number",
- rules: [{
- required: true,
- message: "请输入楼层",
- trigger: "blur",
- }, ],
- },
- {
- label: "面积",
- prop: "area",
- type: "number",
- },
- {
- label: "物业费",
- prop: "propertyPrice",
- type: "number",
- },
- {
- label: "服务到期",
- prop: "serviceDue",
- type: "datetime",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- },
- ]
- },
- data: [],
- excelForm: {},
- excelOption: {
- submitBtn: false,
- emptyBtn: false,
- column: [{
- label: '模板上传',
- prop: 'excelFile',
- type: 'upload',
- drag: true,
- loadText: '模板上传中，请稍等',
- span: 24,
- propsHttp: {
- res: 'data'
- },
- tip: '请上传 .xls,.xlsx 标准格式文件',
- action: "/api/blade-system/user/import-user"
- },
- {
- label: "数据覆盖",
- prop: "isCovered",
- type: "switch",
- align: "center",
- width: 80,
- dicData: [{
- label: "否",
- value: 0
+ option: {
+ height: 'auto',
+ calcHeight: 80,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ selection: true,
+ viewBtn: true,
+ dialogType: 'drawer',
+ dialogClickModal: false,
+ menuWidth: 340,
+ column: [{
+ label: "房屋编号",
+ prop: "houseCode",
+ width: 180,
+ hide: true,
+ display: false
},
{
- label: "是",
- value: 1
- }
- ],
- value: 0,
- slot: true,
- rules: [{
- required: true,
- message: "请选择是否覆盖",
- trigger: "blur"
- }]
+ label: "地址",
+ prop: "address",
+ width: 180,
+ display: false
+ },
+ {
+ label: "小区",
+ prop: "districtName",
+ search: true,
+ rules: [{
+ required: true,
+ message: "请选择小区",
+ trigger: "blur",
+ },],
+ },
+ {
+ label: "手机",
+ prop: "phone",
+ rules: [{
+ required: true,
+ message: "请输入绑定手机",
+ trigger: "blur",
+ },],
+ },
+ {
+ label: "幢",
+ prop: "building",
+ hide: true
+ },
+ {
+ label: "单元",
+ prop: "unit",
+ hide: true
+ },
+ {
+ label: "室",
+ prop: "room",
+ hide: true
+ },
+ {
+ label: "楼层",
+ prop: "floor",
+ type: "number",
+ rules: [{
+ required: true,
+ message: "请输入楼层",
+ trigger: "blur",
+ },],
+ },
+ {
+ label: "面积",
+ prop: "area",
+ type: "number",
+ },
+ {
+ label: "物业费",
+ prop: "propertyPrice",
+ type: "number",
+ },
+ {
+ label: "服务到期",
+ prop: "serviceDue",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ },
+ {
+ width: 210,
+ label: "标签",
+ prop: "userHouseLabelVOList",
+ display: false
+ },
+ ]
},
- {
- label: '模板下载',
- prop: 'excelTemplate',
- formslot: true,
- span: 24,
+ data: [],
+ excelForm: {},
+ excelOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [{
+ label: '模板上传',
+ prop: 'excelFile',
+ type: 'upload',
+ drag: true,
+ loadText: '模板上传中，请稍等',
+ span: 24,
+ propsHttp: {
+ res: 'data'
+ },
+ tip: '请上传 .xls,.xlsx 标准格式文件',
+ action: "/api/blade-system/user/import-user"
+ },
+ {
+ label: "数据覆盖",
+ prop: "isCovered",
+ type: "switch",
+ align: "center",
+ width: 80,
+ dicData: [{
+ label: "否",
+ value: 0
+ },
+ {
+ label: "是",
+ value: 1
+ }
+ ],
+ value: 0,
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请选择是否覆盖",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: '模板下载',
+ prop: 'excelTemplate',
+ formslot: true,
+ span: 24,
+ }
+ ]
}
- ]
}
- };
},
watch: {},
computed: {
- ...mapGetters(["userInfo", "permission"]),
- permissionList() {
- return {
- addBtn: this.vaildData(this.permission.house_add, true),
- viewBtn: this.vaildData(this.permission.house_view, true),
- delBtn: this.vaildData(this.permission.house_delete, true),
- editBtn: this.vaildData(this.permission.house_edit, true)
- };
- }
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList () {
+ return {
+ addBtn: this.vaildData(this.permission.house_add, true),
+ viewBtn: this.vaildData(this.permission.house_view, true),
+ delBtn: this.vaildData(this.permission.house_delete, true),
+ editBtn: this.vaildData(this.permission.house_edit, true)
+ }
+ },
+
+ labelDispose () {
+ return (list) => {
+ return list.map(item => item.labelName).join(',')
+ }
+ }
},
- mounted() {},
+ mounted () { },
methods: {
- onsubmit() {
- if (this.labelForm.color === '#EBEDF0') {
- let params = {
- householdId: this.currentRow.id,
- labelId: this.currentLabel.id
- }
- removeHouseholdLabel(params).then(res => {
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- this.editLabelFlge = false
- this.manageLabel(this.currentRow)
- this.loading = false;
- })
- } else {
- this.labelForm.houseCode = this.currentRow.houseCode
- this.labelForm.householdId = this.currentRow.id
- this.labelForm.labelId = this.currentLabel.id
- this.labelForm.lableType = 2
- saveOrUpdateHouseholdLabel(this.labelForm).then(res => {
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- this.editLabelFlge = false
- this.manageLabel(this.currentRow)
- this.loading = false;
- })
- }
- },
-
- changLabel(item) {
- this.editLabelFlge = true
- this.currentLabel = item;
- this.labelForm.color = item.color
- this.labelForm.remark = item.remark
- },
- manageLabel(item) {
- this.currentRow = item
- this.labelFlag = true
- let params = {
- parentId: 1001
- }
- // 查询标签
- getLabelList(Object.assign(params)).then(res => {
- const data = res.data.data;
- this.loading = false;
- // 查询详情
- getDetatils({
- houseCode: item.houseCode
- }).then(res => {
- if (res.data.data) {
- this.userHouseLabelVOList = res.data.data.userHouseLabelVOList;
- this.loading = false;
- // 将细类放到一起
- data.forEach(f => {
- if (this.userHouseLabelVOList.length > 0) {
- this.userHouseLabelVOList.forEach(h => {
- if (Number(f.id) == h.labelId) {
- f['color'] = h.color
- f['remark'] = h.remark
- }
- })
+ onsubmit () {
+ if (this.labelForm.color === '#EBEDF0') {
+ let params = {
+ householdId: this.currentRow.id,
+ labelId: this.currentLabel.id
}
- })
+ removeHouseholdLabel(params).then(res => {
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ this.editLabelFlge = false
+ this.manageLabel(this.currentRow)
+ this.loading = false
+ })
+ } else {
+ this.labelForm.houseCode = this.currentRow.houseCode
+ this.labelForm.householdId = this.currentRow.id
+ this.labelForm.labelId = this.currentLabel.id
+ this.labelForm.lableType = 2
+ saveOrUpdateHouseholdLabel(this.labelForm).then(res => {
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ this.editLabelFlge = false
+ this.manageLabel(this.currentRow)
+ this.loading = false
+ })
}
- this.labelData = data;
- });
- });
- },
- handleHouseholdManager(row) {
- var that = this
- this.householdManagerVisible = true
- this.$nextTick(() => {
- that.$refs.householdManager.init(row)
- })
- },
- rowSave(row, done, loading) {
- add(row).then(() => {
- this.initFlag = false;
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- done();
- }, error => {
- window.console.log(error);
- loading();
- });
- },
- rowUpdate(row, index, done, loading) {
- update(row).then(() => {
- this.initFlag = false;
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- done();
- }, error => {
- window.console.log(error);
- loading();
- });
- },
- rowDel(row) {
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return remove(row.id);
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- });
- },
- searchReset() {
- this.query = {};
- this.treeDeptId = '';
- this.onLoad(this.page);
- },
- searchChange(params, done) {
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
- },
- selectionChange(list) {
- this.selectionList = list;
- },
- selectionClear() {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
- },
- handleDelete() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ },
+
+ changLabel (item) {
+ this.editLabelFlge = true
+ this.currentLabel = item
+ this.labelForm.color = item.color
+ this.labelForm.remark = item.remark
+ },
+ manageLabel (item) {
+ this.currentRow = item
+ this.labelFlag = true
+ let params = {
+ parentId: 1001
+ }
+ // 查询标签
+ getLabelList(Object.assign(params)).then(res => {
+ const data = res.data.data
+ this.loading = false
+ // 查询详情
+ getDetatils({
+ houseCode: item.houseCode
+ }).then(res => {
+ if (res.data.data) {
+ this.userHouseLabelVOList = res.data.data.userHouseLabelVOList
+ this.loading = false
+ // 将细类放到一起
+ data.forEach(f => {
+ if (this.userHouseLabelVOList.length > 0) {
+ this.userHouseLabelVOList.forEach(h => {
+ if (Number(f.id) == h.labelId) {
+ f['color'] = h.color
+ f['remark'] = h.remark
+ }
+ })
+ }
+ })
+ }
+ this.labelData = data
+ })
+ })
+ },
+ handleHouseholdManager (row) {
+ var that = this
+ this.householdManagerVisible = true
+ this.$nextTick(() => {
+ that.$refs.householdManager.init(row)
+ })
+ },
+ rowSave (row, done, loading) {
+ add(row).then(() => {
+ this.initFlag = false
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ done()
+ }, error => {
+ window.console.log(error)
+ loading()
+ })
+ },
+ rowUpdate (row, index, done, loading) {
+ update(row).then(() => {
+ this.initFlag = false
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ done()
+ }, error => {
+ window.console.log(error)
+ loading()
+ })
+ },
+ rowDel (row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(row.id)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ })
+ },
+ searchReset () {
+ this.query = {}
+ this.treeDeptId = ''
+ this.onLoad(this.page)
+ },
+ searchChange (params, done) {
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
+ },
+ selectionChange (list) {
+ this.selectionList = list
+ },
+ selectionClear () {
+ this.selectionList = []
+ this.$refs.crud.toggleSelection()
+ },
+ handleDelete () {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据")
+ return
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(this.ids)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ this.$refs.crud.toggleSelection()
+ })
+ },
+ handleImport () {
+ this.excelBox = true
+ },
+ uploadAfter (res, done, loading, column) {
+ window.console.log(column)
+ this.excelBox = false
+ this.refreshChange()
+ done()
+ },
+ handleExport () {
+ this.$confirm("是否导出房屋数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ }).then(() => {
+ NProgress.start()
+ var data = {
+ ...this.query
+ }
+ data = Qs.stringify(data)
+ exportBlob(
+ `/api/blade-house/house/export-house?${this.website.tokenHeader}=${getToken()}&` + data
+ ).then(res => {
+ downloadXls(res.data, `房屋数据表${dateNow()}.xlsx`)
+ NProgress.done()
+ })
+ })
+ },
+ handleTemplate () {
+ exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
+ downloadXls(res.data, "房屋数据模板.xlsx")
+ })
+ },
+ beforeOpen (done, type) {
+ if (["edit", "view"].includes(type)) {
+ getDetatil({
+ id: this.form.id
+ }).then(res => {
+ this.form = res.data.data
+ })
+ }
+ this.initFlag = true
+ done()
+ },
+ currentChange (currentPage) {
+ this.page.currentPage = currentPage
+ },
+ sizeChange (pageSize) {
+ this.page.pageSize = pageSize
+ },
+ refreshChange () {
+ this.onLoad(this.page, this.query)
+ },
+ onLoad (page, params = {}) {
+ this.loading = true
+ getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
+ this.loading = false
+ this.selectionClear()
+ })
}
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return remove(this.ids);
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- this.$refs.crud.toggleSelection();
- });
- },
- handleImport() {
- this.excelBox = true;
- },
- uploadAfter(res, done, loading, column) {
- window.console.log(column);
- this.excelBox = false;
- this.refreshChange();
- done();
- },
- handleExport() {
- this.$confirm("是否导出房屋数据?", "提示", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(() => {
- NProgress.start();
- var data = {
- ...this.query
- }
- data = Qs.stringify(data);
- exportBlob(
- `/api/blade-house/house/export-house?${this.website.tokenHeader}=${getToken()}&` + data
- ).then(res => {
- downloadXls(res.data, `房屋数据表${dateNow()}.xlsx`);
- NProgress.done();
- })
- });
- },
- handleTemplate() {
- exportBlob(`/api/blade-system/user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
- downloadXls(res.data, "房屋数据模板.xlsx");
- })
- },
- beforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- getDetatil({
- id: this.form.id
- }).then(res => {
- this.form = res.data.data;
- });
- }
- this.initFlag = true;
- done();
- },
- currentChange(currentPage) {
- this.page.currentPage = currentPage;
- },
- sizeChange(pageSize) {
- this.page.pageSize = pageSize;
- },
- refreshChange() {
- this.onLoad(this.page, this.query);
- },
- onLoad(page, params = {}) {
- this.loading = true;
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
- });
- }
}
- };
+}
</script>
<style>
- .box {
+.box {
height: 800px;
- }
+}
- .el-scrollbar {
+.el-scrollbar {
height: 100%;
- }
+}
- .box .el-scrollbar__wrap {
+.box .el-scrollbar__wrap {
overflow: scroll;
- }
+}
</style>
\ No newline at end of file
diff --git a/src/warterMarkVUE.js b/src/warterMarkVUE.js
index a57ed2b..d1e5537 100644
--- a/src/warterMarkVUE.js
+++ b/src/warterMarkVUE.js
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-12-18 11:02:55
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-12-18 11:23:55
+ * @LastEditTime: 2023-12-18 17:55:12
* @FilePath: \jczz_web\src\warterMarkVUE.js
* @Description:
*
@@ -22,8 +22,8 @@
//创建画布
let createCanvas = document.createElement("canvas");
// 设置canvas画布大小
- createCanvas.width = 200; //宽度
- createCanvas.height = 160; //高度
+ createCanvas.width = 320; //宽度
+ createCanvas.height = 200; //高度
//创建Context2D对象作为2D渲染的上下文。
let Context2D = createCanvas.getContext("2d");
@@ -33,7 +33,7 @@
Context2D.fillStyle = "#fff"; //水印颜色 HEX格式,可使用red 或者rgb格式
Context2D.textAlign = "center"; //水印水平位置
Context2D.textBaseline = "Middle"; //水印垂直位置
- Context2D.fillText(str, createCanvas.width / 2.8, createCanvas.height / 1);
+ Context2D.fillText(str, createCanvas.width / 3.2, createCanvas.height / 1);
//创建元素
let createDiv = document.createElement("div");
--
Gitblit v1.9.3