From 79d9fc857559982b00b68b2d709807bdc4cd286f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 11 Apr 2022 10:58:17 +0800
Subject: [PATCH] minio 地址修改
---
src/views/securityEquipment/car.vue | 206 ++++++++++++++++++++++++++-------------------------
1 files changed, 106 insertions(+), 100 deletions(-)
diff --git a/src/views/securityEquipment/car.vue b/src/views/securityEquipment/car.vue
index 5e6bdce..772c618 100644
--- a/src/views/securityEquipment/car.vue
+++ b/src/views/securityEquipment/car.vue
@@ -1,65 +1,68 @@
<template>
- <basic-container>
- <div
- :class="[
- 'equipments',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'equipments',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ v-if="visible"
+ :option="option"
+ :data="data"
+ :page.sync="page"
+ ref="crudrec"
+ :permission="permissionList"
+ @on-load="onLoad"
+ :table-loading="loading"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @row-update="rowUpdate"
+ @row-del="rowDel"
+ @selection-change="selectionChange"
+ @refresh-change="refreshChange"
>
- <avue-crud
- v-if="visible"
- :option="option"
- :data="data"
- :page.sync="page"
- ref="crudrec"
- @on-load="onLoad"
- :table-loading="loading"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @row-update="rowUpdate"
- @row-del="rowDel"
- @selection-change="selectionChange"
- @refresh-change="refreshChange"
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ v-if="permission.car_delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ v-if="permission.car_import"
+ @click="handleImport"
+ >批量导入
+ </el-button>
+ </template>
+ </avue-crud>
+ <el-dialog
+ title="车辆导入"
+ append-to-body
+ :visible.sync="excelBox"
+ width="555px"
+ >
+ <avue-form
+ :option="excelOption"
+ v-model="excelForm"
+ :upload-after="uploadAfter"
>
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- plain
- icon="el-icon-delete"
- @click="handleDelete"
- >删 除
- </el-button>
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- @click="handleImport"
- >批量导入
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
</el-button>
</template>
- </avue-crud>
- <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>
- </div>
+ </avue-form>
+ </el-dialog>
</basic-container>
</template>
@@ -67,21 +70,9 @@
import { data, column } from "./car";
import { getdata, adddata, update, remove } from "@/api/car/car";
import { mapGetters } from "vuex";
+import { getToken } from "@/util/auth";
export default {
props: ["fromDeptId", "windowHeight"],
- watch: {
- windowHeight() {
- if (!this.windowHeight) {
- return;
- }
- this.option.height = this.windowHeight - 320;
- this.visible = false;
- this.$nextTick(() => {
- this.visible = true;
- this.refreshChange();
- });
- },
- },
data() {
return {
visible: true,
@@ -100,18 +91,18 @@
loadText: "文件上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/car/import-car?deptId=" + this.deptIds,
+ action: "/api/car/import-car?deptId=" + this.deptIds
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
loading: true,
@@ -119,7 +110,7 @@
page: {
pageSize: 10,
currentPage: 1,
- total: 0,
+ total: 0
},
query: {},
data: [],
@@ -136,22 +127,31 @@
selection: true,
labelWidth: 110,
column: column,
- ...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.clearOtherBut
},
- useifid: 266,
+ useifid: 266
};
},
computed: {
- ...mapGetters(["userInfo"]),
+ ...mapGetters(["permission", "userInfo"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.car_add, false),
+ viewBtn: this.vaildData(this.permission.car_view, true),
+ delBtn: this.vaildData(this.permission.car_delete, false),
+ editBtn: this.vaildData(this.permission.car_edit, false)
+ };
+ },
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
this.deptIds = this.userInfo.dept_id;
},
created() {
@@ -169,7 +169,7 @@
//查询保安单位信息（包含子级）
const column = this.findObject(this.option.column, "deptId");
column.addDisplay = true;
- column.editDisplay = true;
+ column.editDisplay = true;
// column.search = false;
//默认全部展开
column.defaultExpandAll = true;
@@ -179,7 +179,7 @@
//赋值
column.value = that.userInfo.dept_id;
this.useifid = this.userInfo.dept_id;
- } else if (roleName == "公安管理员" || roleName == "administrator") {
+ } else if (roleName == "公安管理员" || roleName == "administrator" || roleName == "民警") {
var columnDept = that.findObject(that.option.column, "deptId");
columnDept.dicUrl =
"/api/blade-system/dept/security_lazy-tree?jurisdiction=" +
@@ -203,7 +203,9 @@
done();
},
handleTemplate() {
- window.open(`/api/car/export-template-car`);
+ window.open(
+ `/api/car/export-template-car?${this.website.tokenHeader}=${getToken()}`
+ );
},
sizeChange(val) {
this.page1.currentPage = 1;
@@ -228,11 +230,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -264,11 +266,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -278,7 +280,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -287,7 +289,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -302,7 +304,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -311,7 +313,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec.toggleSelection();
});
@@ -353,11 +355,14 @@
}
//公安局进入
- if (this.userInfo.role_name == "公安管理员") {
+ if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警") {
params["jurisdiction"] = that.userInfo.jurisdiction;
}
//保安公司进入
- if (this.userInfo.role_name == "保安公司管理员" || this.userInfo.role_name == "分公司管理员") {
+ if (
+ this.userInfo.role_name == "保安公司管理员" ||
+ this.userInfo.role_name == "分公司管理员"
+ ) {
params["deptId"] = that.userInfo.dept_id;
//导入action 修改
const importColumn = that.findObject(
@@ -372,10 +377,10 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
- data.records.forEach((item) => {
+ data.records.forEach(item => {
if (item.numberType == -1) {
item.numberType = null;
}
@@ -384,11 +389,12 @@
}
});
this.data = data.records;
- console.log(this.data);
+ this.$store.commit("setWindowSizeHeightAdd");
+ // console.log(this.data);
this.loading = false;
});
- },
- },
+ }
+ }
};
</script>
@@ -407,4 +413,4 @@
// .el-tag--light {
// padding: 0 !important;
// }
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3