From 29c70ac9c7d7f23471cd6dfdb305c3aa99f1dccc Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 18 Sep 2021 10:49:14 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory
---
src/views/securityCompany/security.vue | 6
src/views/securityCompany/armed.vue | 2
src/views/securityCompany/confess.vue | 6
src/views/securityCompany/computents/service.vue | 2
src/views/securityGuardManagement/register.vue | 50 -
src/views/base/region.vue | 765 +++++++++++++++++++---------------
src/views/securityCompany/companyDetails.vue | 46 +
src/views/securityUnitOperation/operationAnalysis.vue | 2
src/views/securityCompany/train.vue | 6
src/views/securityCompany/computents/enclosure.vue | 2
src/views/management/computents/dispatch.vue | 5
src/views/management/computents/achievement.vue | 4
src/views/securityCompany/computents/punish.vue | 2
src/views/Juris/jurs.vue | 22
src/views/management/computents/performance.vue | 262 ++---------
src/views/securityUnitOperation/economicAnalysis.vue | 2
src/api/management/peopleDetails.js | 16
src/views/authority/role.vue | 6
src/views/securityCompany/dispatch.vue | 6
src/views/management/computents/honor.vue | 4
src/views/home/index.vue | 8
src/views/securityCompany/regulatoryInformation.vue | 4
src/views/management/peopleDetails.vue | 36 +
src/views/securityCompany/computents/equipment.vue | 2
src/views/securityCompany/computents/staff.vue | 2
src/views/management/computents/train.vue | 4
src/views/securityCompany/securityCrossRegion.vue | 6
27 files changed, 642 insertions(+), 636 deletions(-)
diff --git a/src/api/management/peopleDetails.js b/src/api/management/peopleDetails.js
index 47201f1..c94a383 100644
--- a/src/api/management/peopleDetails.js
+++ b/src/api/management/peopleDetails.js
@@ -10,43 +10,43 @@
})
}
-export const dispatchList = (cardid) => {
+export const dispatchList = (securityid) => {
return request({
url: '/api/dispatcher/page',
method: 'get',
params: {
- cardid
+ securityid
}
})
}
-export const honorchList = (cardid) => {
+export const honorchList = (securityid) => {
return request({
url: '/api/honor/list',
method: 'get',
params: {
- cardid
+ securityid
}
})
}
-export const trainList = (cardid) => {
+export const trainList = (securityid) => {
return request({
url: '/api/train/selectTrainInfo',
method: 'post',
params: {
- cardid
+ securityid
}
})
}
-export const examinationList = (cardid) => {
+export const examinationList = (securityid) => {
return request({
url: '/api/examination/selectExaminationInfo',
method: 'post',
params: {
- cardid
+ securityid
}
})
}
diff --git a/src/views/Juris/jurs.vue b/src/views/Juris/jurs.vue
index 6dc4878..bdf3e14 100644
--- a/src/views/Juris/jurs.vue
+++ b/src/views/Juris/jurs.vue
@@ -192,15 +192,19 @@
methods: {
initData() {
getDeptTree().then((res) => {
- const column = this.findObject(this.option.column, "parentId");
- column.dicData = res.data.data;
+ try {
+ const column = this.findObject(this.option.column, "parentId");
+ column.dicData = res.data.data;
+ } catch {}
});
},
handleAdd(row) {
this.parentId = row.id;
- const column = this.findObject(this.option.column, "parentId");
- column.value = row.id;
- column.addDisabled = true;
+ try {
+ const column = this.findObject(this.option.column, "parentId");
+ column.value = row.id;
+ column.addDisabled = true;
+ } catch {}
this.$refs.crud.rowAdd();
},
rowSave(row, done, loading) {
@@ -317,9 +321,11 @@
},
beforeClose(done) {
this.parentId = "";
- const column = this.findObject(this.option.column, "parentId");
- column.value = "";
- column.addDisabled = false;
+ try {
+ const column = this.findObject(this.option.column, "parentId");
+ column.value = "";
+ column.addDisabled = false;
+ } catch {}
done();
},
currentChange(currentPage) {
diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue
index 8e3c427..762324e 100644
--- a/src/views/authority/role.vue
+++ b/src/views/authority/role.vue
@@ -256,8 +256,10 @@
methods: {
initData(roleId) {
getRoleTreeById(roleId).then((res) => {
- const column = this.findObject(this.option.column, "parentId");
- column.dicData = res.data.data;
+ try {
+ const column = this.findObject(this.option.column, "parentId");
+ column.dicData = res.data.data;
+ } catch {}
});
},
submit() {
diff --git a/src/views/base/region.vue b/src/views/base/region.vue
index 2027d70..eb93a0b 100644
--- a/src/views/base/region.vue
+++ b/src/views/base/region.vue
@@ -4,7 +4,11 @@
<div class="box">
<el-scrollbar>
<basic-container>
- <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"/>
+ <avue-tree
+ :option="treeOption"
+ :data="treeData"
+ @node-click="nodeClick"
+ />
</basic-container>
</el-scrollbar>
</div>
@@ -12,26 +16,75 @@
<el-col :span="15">
<basic-container>
<el-button-group>
- <el-button v-if="permission.region_add" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addChildren">新增下级</el-button>
- <el-button v-if="permission.region_delete" type="primary" size="small" icon="el-icon-delete" @click="handleDelete">删除</el-button>
- <el-button v-if="permission.region_import" type="primary" size="small" icon="el-icon-upload2" @click="handleImport">导入</el-button>
- <el-button v-if="permission.region_export" type="primary" size="small" icon="el-icon-download" @click="handleExport">导出</el-button>
- <el-button v-if="permission.region_debug" type="primary" size="small" icon="el-icon-video-play" @click="handleDebug">调试</el-button>
+ <el-button
+ v-if="permission.region_add"
+ type="primary"
+ size="small"
+ icon="el-icon-circle-plus-outline"
+ @click="addChildren"
+ >新增下级</el-button
+ >
+ <el-button
+ v-if="permission.region_delete"
+ type="primary"
+ size="small"
+ icon="el-icon-delete"
+ @click="handleDelete"
+ >删除</el-button
+ >
+ <el-button
+ v-if="permission.region_import"
+ type="primary"
+ size="small"
+ icon="el-icon-upload2"
+ @click="handleImport"
+ >导入</el-button
+ >
+ <el-button
+ v-if="permission.region_export"
+ type="primary"
+ size="small"
+ icon="el-icon-download"
+ @click="handleExport"
+ >导出</el-button
+ >
+ <el-button
+ v-if="permission.region_debug"
+ type="primary"
+ size="small"
+ icon="el-icon-video-play"
+ @click="handleDebug"
+ >调试</el-button
+ >
</el-button-group>
</basic-container>
<basic-container>
- <avue-form ref="form" :option="regionOption" v-model="regionForm" @submit="handleSubmit">
+ <avue-form
+ ref="form"
+ :option="regionOption"
+ v-model="regionForm"
+ @submit="handleSubmit"
+ >
<template slot="code" slot-scope="{}">
- <el-input placeholder="请输入 区划子编号" v-model="regionForm.subCode">
- <template slot="prepend">{{regionForm.parentCode}}</template>
+ <el-input
+ placeholder="请输入 区划子编号"
+ v-model="regionForm.subCode"
+ >
+ <template slot="prepend">{{ regionForm.parentCode }}</template>
</el-input>
</template>
</avue-form>
- <el-dialog title="行政区划数据导入"
- append-to-body
- :visible.sync="excelBox"
- width="555px">
- <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+ <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>
@@ -39,11 +92,13 @@
</template>
</avue-form>
</el-dialog>
- <el-dialog title="行政区划数据调试"
- append-to-body
- :visible.sync="debugBox"
- width="350px">
- <avue-form :option="debugOption" v-model="debugForm"/>
+ <el-dialog
+ title="行政区划数据调试"
+ append-to-body
+ :visible.sync="debugBox"
+ width="350px"
+ >
+ <avue-form :option="debugOption" v-model="debugForm" />
</el-dialog>
</basic-container>
</el-col>
@@ -51,367 +106,403 @@
</template>
<script>
- import {getLazyTree, getDetail, submit, remove} from "@/api/base/region";
- import {mapGetters} from "vuex";
- import {validatenull} from "@/util/validate";
- import {getToken} from "@/util/auth";
+import { getLazyTree, getDetail, submit, remove } from "@/api/base/region";
+import { mapGetters } from "vuex";
+import { validatenull } from "@/util/validate";
+import { getToken } from "@/util/auth";
- export default {
- data() {
- return {
- topCode: '00',
- treeCode: '',
- treeParentCode: '',
- treeData: [],
- treeOption: {
- nodeKey: 'id',
- lazy: true,
- treeLoad: function (node, resolve) {
- const parentCode = (node.level === 0) ? "00" : node.data.id;
- getLazyTree(parentCode).then(res => {
- resolve(res.data.data.map(item => {
+export default {
+ data() {
+ return {
+ topCode: "00",
+ treeCode: "",
+ treeParentCode: "",
+ treeData: [],
+ treeOption: {
+ nodeKey: "id",
+ lazy: true,
+ treeLoad: function (node, resolve) {
+ const parentCode = node.level === 0 ? "00" : node.data.id;
+ getLazyTree(parentCode).then((res) => {
+ resolve(
+ res.data.data.map((item) => {
return {
...item,
- leaf: !item.hasChildren
- }
- }))
- });
- },
- addBtn: false,
- menu: false,
- size: 'small',
- props: {
- labelText: '标题',
- label: 'title',
- value: 'value',
- children: 'children'
- }
+ leaf: !item.hasChildren,
+ };
+ })
+ );
+ });
},
- regionForm: {},
- regionOption: {
- labelWidth: 100,
- column: [
- {
- label: "父区划编号",
- prop: "parentCode",
- span: 24,
- disabled: true,
- rules: [{
+ addBtn: false,
+ menu: false,
+ size: "small",
+ props: {
+ labelText: "标题",
+ label: "title",
+ value: "value",
+ children: "children",
+ },
+ },
+ regionForm: {},
+ regionOption: {
+ labelWidth: 100,
+ column: [
+ {
+ label: "父区划编号",
+ prop: "parentCode",
+ span: 24,
+ disabled: true,
+ rules: [
+ {
required: true,
message: "请输入父区划编号",
- trigger: "blur"
- }]
- },
- {
- label: "父区划名称",
- prop: "parentName",
- span: 24,
- disabled: true,
- },
- {
- label: "区划编号",
- prop: "code",
- formslot: true,
- span: 24,
- rules: [{
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "父区划名称",
+ prop: "parentName",
+ span: 24,
+ disabled: true,
+ },
+ {
+ label: "区划编号",
+ prop: "code",
+ formslot: true,
+ span: 24,
+ rules: [
+ {
required: true,
message: "请输入区划编号",
- trigger: "blur"
- }]
- },
- {
- label: "区划子编号",
- prop: "subCode",
- display: false,
- },
- {
- label: "区划名称",
- prop: "name",
- span: 24,
- rules: [{
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "区划子编号",
+ prop: "subCode",
+ display: false,
+ },
+ {
+ label: "区划名称",
+ prop: "name",
+ span: 24,
+ rules: [
+ {
required: true,
message: "请输入区划名称",
- trigger: "blur"
- }]
- },
- {
- label: "区划等级",
- prop: "regionLevel",
- type: "radio",
- dicUrl: "/api/blade-system/dict/dictionary?code=region",
- props: {
- label: "dictValue",
- value: "dictKey"
+ trigger: "blur",
},
- dataType: "number",
- span: 24,
- rules: [{
+ ],
+ },
+ {
+ label: "区划等级",
+ prop: "regionLevel",
+ type: "radio",
+ dicUrl: "/api/blade-system/dict/dictionary?code=region",
+ props: {
+ label: "dictValue",
+ value: "dictKey",
+ },
+ dataType: "number",
+ span: 24,
+ rules: [
+ {
required: true,
message: "请选择区划等级",
- trigger: "blur"
- }]
- },
- {
- label: "区划排序",
- prop: "sort",
- type: "number",
- span: 24,
- rules: [{
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "区划排序",
+ prop: "sort",
+ type: "number",
+ span: 24,
+ rules: [
+ {
required: true,
message: "请输入区划排序",
- trigger: "blur"
- }]
- },
- {
- label: "区划备注",
- prop: "remark",
- type: "textarea",
- minRows: 6,
- span: 24,
- },
- ]
- },
- excelBox: false,
- excelForm: {},
- excelOption: {
- submitBtn: false,
- emptyBtn: false,
- column: [
- {
- label: '模板上传',
- prop: 'excelFile',
- type: 'upload',
- drag: true,
- loadText: '模板上传中，请稍等',
- span: 24,
- propsHttp: {
- res: 'data'
+ trigger: "blur",
},
- tip: '请上传 .xls,.xlsx 标准格式文件',
- action: "/api/blade-system/region/import-region"
- },
- {
- 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,
- }
- ]
- },
- debugBox: false,
- debugForm: {},
- debugOption: {
- labelWidth: 50,
- submitBtn: false,
- emptyBtn: false,
- column: [
- {
- label: '省份',
- prop: 'province',
- type: 'select',
- props: {
- label: 'name',
- value: 'code'
- },
- cascaderItem: ['city', 'district'],
- dicUrl: '/api/blade-system/region/select',
- span: 24,
- },
- {
- label: '地市',
- prop: 'city',
- type: 'select',
- props: {
- label: 'name',
- value: 'code'
- },
- dicFlag: false,
- dicUrl: '/api/blade-system/region/select?code={{key}}',
- span: 24,
- },
- {
- label: '区县',
- prop: 'district',
- type: 'select',
- props: {
- label: 'name',
- value: 'code'
- },
- dicFlag: false,
- dicUrl: '/api/blade-system/region/select?code={{key}}',
- span: 24,
- }
- ]
- }
- };
- },
- watch: {
- 'regionForm.subCode'() {
- this.regionForm.code = this.regionForm.parentCode + this.regionForm.subCode;
+ ],
+ },
+ {
+ label: "区划备注",
+ prop: "remark",
+ type: "textarea",
+ minRows: 6,
+ span: 24,
+ },
+ ],
},
- 'excelForm.isCovered'() {
- if (this.excelForm.isCovered !== '') {
+ excelBox: false,
+ 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/region/import-region",
+ },
+ {
+ 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,
+ },
+ ],
+ },
+ debugBox: false,
+ debugForm: {},
+ debugOption: {
+ labelWidth: 50,
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: "省份",
+ prop: "province",
+ type: "select",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ cascaderItem: ["city", "district"],
+ dicUrl: "/api/blade-system/region/select",
+ span: 24,
+ },
+ {
+ label: "地市",
+ prop: "city",
+ type: "select",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ dicFlag: false,
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 24,
+ },
+ {
+ label: "区县",
+ prop: "district",
+ type: "select",
+ props: {
+ label: "name",
+ value: "code",
+ },
+ dicFlag: false,
+ dicUrl: "/api/blade-system/region/select?code={{key}}",
+ span: 24,
+ },
+ ],
+ },
+ };
+ },
+ watch: {
+ "regionForm.subCode"() {
+ this.regionForm.code =
+ this.regionForm.parentCode + this.regionForm.subCode;
+ },
+ "excelForm.isCovered"() {
+ if (this.excelForm.isCovered !== "") {
+ try {
const column = this.findObject(this.excelOption.column, "excelFile");
column.action = `/api/blade-system/region/import-region?isCovered=${this.excelForm.isCovered}`;
- }
+ } catch {}
}
},
- computed: {
- ...mapGetters(["permission"]),
- permissionList() {
- return {
- addBtn: this.vaildData(this.permission.region_add, false),
- viewBtn: this.vaildData(this.permission.region_view, false),
- delBtn: this.vaildData(this.permission.region_delete, false),
- editBtn: this.vaildData(this.permission.region_edit, false)
- };
- },
- ids() {
- let ids = [];
- this.selectionList.forEach(ele => {
- ids.push(ele.id);
- });
- return ids.join(",");
- }
+ },
+ computed: {
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.region_add, false),
+ viewBtn: this.vaildData(this.permission.region_view, false),
+ delBtn: this.vaildData(this.permission.region_delete, false),
+ editBtn: this.vaildData(this.permission.region_edit, false),
+ };
},
- methods: {
- initTree() {
- this.treeData = [];
- getLazyTree(this.topCode).then(res => {
- this.treeData = res.data.data.map(item => {
- return {
- ...item,
- leaf: !item.hasChildren
- }
- })
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ },
+ methods: {
+ initTree() {
+ this.treeData = [];
+ getLazyTree(this.topCode).then((res) => {
+ this.treeData = res.data.data.map((item) => {
+ return {
+ ...item,
+ leaf: !item.hasChildren,
+ };
});
- },
- nodeClick(data) {
+ });
+ },
+ nodeClick(data) {
+ try {
const column = this.findObject(this.regionOption.column, "parentCode");
column.disabled = true;
this.treeCode = data.id;
this.treeParentCode = data.parentId;
- getDetail(this.treeCode).then(res => {
+ getDetail(this.treeCode).then((res) => {
this.regionForm = res.data.data;
- this.regionForm.subCode = this.regionForm.code.replace(this.regionForm.parentCode, '');
- })
- },
- addChildren() {
- if (validatenull(this.regionForm.code) || validatenull(this.regionForm.name)) {
- this.$message.warning("请先选择一项区划");
- return;
- }
- this.regionForm.parentCode = this.regionForm.code;
- this.regionForm.parentName = this.regionForm.name;
- this.regionForm.code = '';
- this.regionForm.subCode = '';
- this.regionForm.name = '';
- this.regionForm.regionLevel = (this.regionForm.regionLevel === 5) ? 5 : this.regionForm.regionLevel + 1;
- },
- handleSubmit(form, done, loading) {
- const parentCode = form.parentCode === this.topCode ? '' : form.parentCode;
- form.code = parentCode + form.subCode;
- submit(form).then(() => {
+ this.regionForm.subCode = this.regionForm.code.replace(
+ this.regionForm.parentCode,
+ ""
+ );
+ });
+ } catch {}
+ },
+ addChildren() {
+ if (
+ validatenull(this.regionForm.code) ||
+ validatenull(this.regionForm.name)
+ ) {
+ this.$message.warning("请先选择一项区划");
+ return;
+ }
+ this.regionForm.parentCode = this.regionForm.code;
+ this.regionForm.parentName = this.regionForm.name;
+ this.regionForm.code = "";
+ this.regionForm.subCode = "";
+ this.regionForm.name = "";
+ this.regionForm.regionLevel =
+ this.regionForm.regionLevel === 5 ? 5 : this.regionForm.regionLevel + 1;
+ },
+ handleSubmit(form, done, loading) {
+ const parentCode =
+ form.parentCode === this.topCode ? "" : form.parentCode;
+ form.code = parentCode + form.subCode;
+ submit(form).then(
+ () => {
this.$message({
type: "success",
- message: "操作成功!"
+ message: "操作成功!",
});
this.initTree();
- this.regionForm.subCode = '';
+ this.regionForm.subCode = "";
this.$refs.form.resetForm();
done();
- }, error => {
+ },
+ (error) => {
loading();
window.console.log(error);
- });
- },
- handleDelete() {
- if (validatenull(this.regionForm.code)) {
- this.$message.warning("请先选择一项区划");
- return;
}
- this.$confirm(`确定将 [${this.regionForm.name}] 数据删除?`, {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
+ );
+ },
+ handleDelete() {
+ if (validatenull(this.regionForm.code)) {
+ this.$message.warning("请先选择一项区划");
+ return;
+ }
+ this.$confirm(`确定将 [${this.regionForm.name}] 数据删除?`, {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(this.treeCode);
})
- .then(() => {
- return remove(this.treeCode);
- })
- .then(() => {
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- this.initTree();
- this.regionForm.subCode = '';
- this.$refs.form.resetForm();
+ .then(() => {
+ this.$message({
+ type: "success",
+ message: "操作成功!",
});
- },
- uploadAfter(res, done, loading, column) {
- window.console.log(column);
- this.excelBox = false;
- this.initTree();
- done();
- },
- handleDebug() {
- this.debugBox = true;
- },
- handleImport() {
- this.excelBox = true;
- },
- handleExport() {
- this.$confirm("是否导出行政区划数据?", "提示", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(() => {
- window.open(`/api/blade-system/region/export-region?${this.website.tokenHeader}=${getToken()}`);
+ this.initTree();
+ this.regionForm.subCode = "";
+ this.$refs.form.resetForm();
});
- },
- handleTemplate() {
- window.open(`/api/blade-system/region/export-template?${this.website.tokenHeader}=${getToken()}`);
- },
- }
- };
+ },
+ uploadAfter(res, done, loading, column) {
+ window.console.log(column);
+ this.excelBox = false;
+ this.initTree();
+ done();
+ },
+ handleDebug() {
+ this.debugBox = true;
+ },
+ handleImport() {
+ this.excelBox = true;
+ },
+ handleExport() {
+ this.$confirm("是否导出行政区划数据?", "提示", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ }).then(() => {
+ window.open(
+ `/api/blade-system/region/export-region?${
+ this.website.tokenHeader
+ }=${getToken()}`
+ );
+ });
+ },
+ handleTemplate() {
+ window.open(
+ `/api/blade-system/region/export-template?${
+ this.website.tokenHeader
+ }=${getToken()}`
+ );
+ },
+ },
+};
</script>
<style>
- .box {
- height: 800px;
- }
+.box {
+ height: 800px;
+}
- .el-scrollbar {
- height: 100%;
- }
+.el-scrollbar {
+ height: 100%;
+}
- .box .el-scrollbar__wrap {
- overflow: scroll;
- }
+.box .el-scrollbar__wrap {
+ overflow: scroll;
+}
</style>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 3241cba..9731665 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1111,16 +1111,16 @@
this.gridData.title = "资格异常人员清单";
this.getQualificationPages(1);
} else if (type === "wg") {
- this.gridData.title = "违规经营公司清单";
+ this.gridData.title = "违规经营公司清单（持证人数低于50%、缴纳社保人数低于50%）";
this.getWgTable();
} else if (type === "jy") {
- this.gridData.title = "经营不善公司清单";
+ this.gridData.title = "经营不善公司清单（服务对象数量为0）";
this.getJyTable();
} else if (type === "ym") {
- this.gridData.title = "有名无实公司清单";
+ this.gridData.title = "有名无实公司清单（保安员数量为0）";
this.getYmTable();
} else if (type === "jg") {
- this.gridData.title = "受监管处罚公司清单";
+ this.gridData.title = "受监管处罚公司清单（保安公司存在被处罚记录）";
this.getPunishList(1);
}
},
diff --git a/src/views/management/computents/achievement.vue b/src/views/management/computents/achievement.vue
index ac08990..eb919ef 100644
--- a/src/views/management/computents/achievement.vue
+++ b/src/views/management/computents/achievement.vue
@@ -13,6 +13,7 @@
@search-reset="equipmentSearchReset"
@current-change="equipmentCurrentChange"
@size-change="equipmentSizeChange"
+ @refresh-change="refreshchange"
>
</avue-crud>
</template>
@@ -144,6 +145,9 @@
};
},
methods: {
+ refreshchange() {
+ this.punishOnLoad(this.equipmentPage, this.equipmentQuery);
+ },
equipmentOnLoad(page, params = {}) {
this.equipmentLoading = true;
getLisperexamScore(
diff --git a/src/views/management/computents/dispatch.vue b/src/views/management/computents/dispatch.vue
index 665dcc8..8a6969c 100644
--- a/src/views/management/computents/dispatch.vue
+++ b/src/views/management/computents/dispatch.vue
@@ -13,6 +13,7 @@
@search-reset="equipmentSearchReset"
@current-change="equipmentCurrentChange"
@size-change="equipmentSizeChange"
+ @refresh-change="refreshchange"
>
</avue-crud>
</template>
@@ -40,6 +41,7 @@
searchMenuSpan: 3,
index: false,
viewBtn: true,
+ height: 529,
//dialogType: 'drawer',
dialogClickModal: false,
// 操作栏宽度
@@ -213,6 +215,9 @@
};
},
methods: {
+ refreshchange() {
+ this.equipmentOnLoad(this.equipmentPage, this.equipmentQuery);
+ },
equipmentOnLoad(page, params = {}) {
this.equipmentLoading = true;
getLisperdispatch(
diff --git a/src/views/management/computents/honor.vue b/src/views/management/computents/honor.vue
index 85283be..7ac03d8 100644
--- a/src/views/management/computents/honor.vue
+++ b/src/views/management/computents/honor.vue
@@ -13,6 +13,7 @@
@search-reset="punishSearchReset"
@current-change="punishCurrentChange"
@size-change="punishSizeChange"
+ @refresh-change="refreshchange"
>
</avue-crud>
</template>
@@ -117,6 +118,9 @@
};
},
methods: {
+ refreshchange() {
+ this.punishOnLoad(this.punishPage, this.punishQuery);
+ },
punishOnLoad(page, params = {}) {
this.punishLoading = true;
getListhonor(
diff --git a/src/views/management/computents/performance.vue b/src/views/management/computents/performance.vue
index f43a885..24e53ae 100644
--- a/src/views/management/computents/performance.vue
+++ b/src/views/management/computents/performance.vue
@@ -13,6 +13,7 @@
@search-reset="staffSearchReset"
@current-change="staffCurrentChange"
@size-change="staffSizeChange"
+ @refresh-change="refreshchange"
>
</avue-crud>
</template>
@@ -47,221 +48,73 @@
column: [
{
- label: "姓名",
- prop: "name",
- // search: true,
- // searchSpan: 4,
- // display: false,
- // width: 78,
- searchSpan: 3,
- search: true,
- },
- // {
- // label: "身份证号",
- // prop: "securityid",
- // // search: true,
- // // searchSpan: 4,
- // // display: false,
- // // width: 78,
- // },
- {
- label: "工作态度",
- prop: "workingattitude",
- searchSpan: 3,
- search: true,
- // type: "select",
- // search: true,
- // searchSpan: 4,
- // searchLabelWidth: 50,
- // dicData: [
- // {
- // label: "女",
- // value: 2,
- // },
- // {
- // label: "男",
- // value: 1,
- // },
- // ],
- // slot: true,
- // display: false,
- // width: 48,
- },
- // {
- // label: "保安公司",
- // prop: "deptName",
- // // width: 120,
- // search: true,
- // searchSpan: 4,
- // overHidden: true,
- // slot: true,
- // display: false,
- // },
- // {
- // label: "工作能力",
- // prop: "workingability",
- // // display: false,
- // // searchSpan: 4,
- // // searchLabelWidth: 110,
- // searchSpan: 3,
- // search: true,
- // },
- {
- label: "工作成效",
- prop: "achievements",
- // slot: true,
- // display: false,
- // width: 138,
- },
- {
- label: "评分",
- prop: "score",
- searchSpan: 3,
- search: true,
- // slot: true,
- // display: false,
- // width: 92,
+ label: "id",
+ prop: "id",
+ hide: true,
+ editDisplay: false,
+ addDisplay: false,
},
{
label: "时间",
- prop: "time",
- // slot: true,
- // display: false,
- // width: 82,
type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
- labelWidth: 120,
- searchSpan: 4,
- search: true,
- overHidden: true,
+ prop: "time",
+ formslot: true,
+ },
+ // {
+ // label: '工作态度',
+ // prop: "workingattitude",
+ // formslot: true,
+ // },
+ {
+ label: "工作表现",
+ prop: "achievements",
+ formslot: true,
+ },
+ {
+ label: "表现评定",
+ prop: "score",
+ type: "select",
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=scoreType",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ dicData: [
+ {
+ label: "优秀",
+ value: 0,
+ },
+ {
+ label: "良好",
+ value: 1,
+ },
+ {
+ label: "一般",
+ value: 2,
+ },
+ {
+ label: "差",
+ value: 3,
+ },
+ ],
+ dataType: "number",
+ slot: true,
rules: [
{
required: true,
- message: "请输入时间",
- trigger: "click",
+ message: "请选择表现",
+ trigger: "blur",
},
],
},
// {
- // label: "所属角色",
- // prop: "roleName",
- // slot: true,
- // display: false,
- // width: 78,
- // hide: true,
- // },
-
- // {
- // label: "所属辖区",
- // prop: "jurisdiction",
- // // multiple: true,
- // minWidth: 60,
- // type: "tree",
- // dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
- // props: {
- // label: "title",
- // value: "id",
- // },
- // checkStrictly: true,
- // slot: true,
- // rules: [
- // {
- // required: true,
- // message: "请选择所属辖区",
- // trigger: "click",
- // },
- // ],
- // },
- // {
- // label: "是否在职",
- // prop: "status",
- // type: "select",
- // search: true,
- // searchSpan: 3,
- // dicData: [
- // {
- // label: "否",
- // value: 0,
- // },
- // {
- // label: "是",
- // value: 1,
- // },
- // ],
- // slot: true,
- // display: false,
- // width: 70,
- // },
- // {
- // label: "是否持证",
- // prop: "hold",
- // type: "select",
- // search: true,
- // searchSpan: 3,
- // dicData: [
- // {
- // label: "是",
- // value: "0",
- // },
- // {
- // label: "否",
- // value: "1",
- // },
- // {
- // label: "已吊销",
- // value: "2",
- // },
- // ],
- // slot: true,
- // display: false,
- // width: 70,
- // },
+ // label: '服务公司',
+ // prop: "departmentName",
+ // formslot: true,
+ // }
],
- // [
- // {
- // label: "投资人姓名",
- // prop: "shareholder",
- // slot: true,
- // display: false,
- // },
- // {
- // label: "投资比例",
- // prop: "shareholdingratio",
- // slot: true,
- // display: false,
- // formatter: function (row, value) {
- // return (value = value + "%");
- // },
- // },
- // {
- // label: "出资金额",
- // prop: "capital",
- // slot: true,
- // display: false,
- // formatter: function (row, value) {
- // return (value = value + "万元");
- // },
- // },
- // {
- // label: "投资时间",
- // prop: "capitaltime",
- // slot: true,
- // display: false,
- // },
- // {
- // label: "身份证号",
- // prop: "cardid",
- // slot: true,
- // display: false,
- // },
- // {
- // label: "联系电话",
- // prop: "cell",
- // slot: true,
- // display: false,
- // },
- // ],
},
staffSearch: {},
staffLoading: true,
@@ -276,8 +129,11 @@
};
},
methods: {
+ refreshchange() {
+ this.staffOnLoad(this.staffPage, this.staffQuery);
+ },
staffOnLoad(page, params = {}) {
- console.log(this.form,111);
+ console.log(this.form, 111);
this.staffLoading = true;
getLisperformance(
page.currentPage,
@@ -292,7 +148,7 @@
for (var k in this.staffData) {
this.staffData[k]["name"] = this.form.realName;
}
- console.log(this.staffData,'staffData');
+ console.log(this.staffData, "staffData");
this.staffLoading = false;
this.$refs.staffCrud.refreshTable();
this.$refs.staffCrud.doLayout();
diff --git a/src/views/management/computents/train.vue b/src/views/management/computents/train.vue
index 4f2d8c8..e50ad32 100644
--- a/src/views/management/computents/train.vue
+++ b/src/views/management/computents/train.vue
@@ -13,6 +13,7 @@
@search-reset="serviceSearchReset"
@current-change="serviceCurrentChange"
@size-change="serviceSizeChange"
+ @refresh-change="refreshchange"
>
</avue-crud>
</template>
@@ -122,6 +123,9 @@
};
},
methods: {
+ refreshchange() {
+ this.punishOnLoad(this.servicePage, this.serviceQuery);
+ },
serviceOnLoad(page, params = {}) {
this.serviceLoading = true;
getLispertrain(
diff --git a/src/views/management/peopleDetails.vue b/src/views/management/peopleDetails.vue
index 0ee59df..49388b5 100644
--- a/src/views/management/peopleDetails.vue
+++ b/src/views/management/peopleDetails.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-07-05 16:31:54
* @Last Modified by: liu
- * @Last Modified time: 2021-09-16 16:51:30
+ * @Last Modified time: 2021-09-18 10:33:58
* menu-name 保安详细资料
*/
<template>
@@ -200,6 +200,8 @@
import honor from "./computents/honor.vue"; //处罚信息
import train from "./computents/train.vue"; //服务对象
import achievement from "./computents/achievement.vue"; //服务对象
+
+import { getListSecurity } from "@/api/system/user";
export default {
components: {
dispatch: dispatch,
@@ -217,6 +219,7 @@
honorchData: [],
trainData: [],
examinationData: [],
+ finalDeptid: "",
};
},
created() {
@@ -238,6 +241,12 @@
}
this.form = this.$route.query;
+ this.finalDeptid = this.form.cardid;
+ this.getFromData({
+ currentPage: 1,
+ pageSize: 10,
+ });
+ // console.log(this.form, "form");
},
mounted() {
// this.$store.state.tags.tag.label = '保安详细资料'
@@ -258,7 +267,16 @@
}
},
methods: {
+ getFromData(page, params = {}) {
+ var that = this;
+ params["cardid"] = this.finalDeptid;
+ getListSecurity(page.currentPage, page.pageSize, params).then((res) => {
+ // console.log(res.data.data.records[0], "多次获取该单位信息");
+ that.form = res.data.data.records[0];
+ });
+ },
handleClick(tab) {
+ console.log(tab.index);
if (tab.index == 1) {
this.getManifestationData();
} else if (tab.index == 2) {
@@ -269,11 +287,17 @@
this.getTrainData();
} else if (tab.index == 5) {
this.getExaminationData();
+ } else if (tab.index == 0) {
+ this.getFromData({
+ currentPage: 1,
+ pageSize: 10,
+ });
}
},
getManifestationData() {
- manifestationList(this.form.cardid).then((res) => {
+ manifestationList(this.form.id).then((res) => {
this.manifestationData = res.data.data.records;
+ console.log(this.manifestationData, " this.manifestationData ");
this.manifestationData.forEach((item) => {
item.name = this.form.realName;
item.time = item.time.substring(0, 10);
@@ -281,17 +305,17 @@
});
},
getDispatchData() {
- dispatchList(this.form.cardid).then((res) => {
+ dispatchList(this.form.id).then((res) => {
this.dispatchData = res.data.data.records;
});
},
getHonorchData() {
- honorchList(this.form.cardid).then((res) => {
+ honorchList(this.form.id).then((res) => {
this.honorchData = res.data.data.records;
});
},
getTrainData() {
- trainList(this.form.cardid).then((res) => {
+ trainList(this.form.id).then((res) => {
this.trainData = res.data.data;
this.trainData.forEach((item) => {
@@ -304,7 +328,7 @@
});
},
getExaminationData() {
- examinationList(this.form.cardid).then((res) => {
+ examinationList(this.form.id).then((res) => {
this.examinationData = res.data.data;
this.examinationData.forEach((item) => {
diff --git a/src/views/securityCompany/armed.vue b/src/views/securityCompany/armed.vue
index 50e1534..bedeb99 100644
--- a/src/views/securityCompany/armed.vue
+++ b/src/views/securityCompany/armed.vue
@@ -401,7 +401,7 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
- console.log(this.data);
+ // console.log(this.data);
this.loading = false;
this.selectionClear();
});
diff --git a/src/views/securityCompany/companyDetails.vue b/src/views/securityCompany/companyDetails.vue
index ea92175..bb47c32 100644
--- a/src/views/securityCompany/companyDetails.vue
+++ b/src/views/securityCompany/companyDetails.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-07-05 16:31:54
* @Last Modified by: liu
- * @Last Modified time: 2021-09-17 16:46:18
+ * @Last Modified time: 2021-09-18 09:16:59
* menu-name 保安公司详细资料
*/
<template>
@@ -374,6 +374,7 @@
var w = 160,
s = 12;
return {
+ finalDeptid: "",
businessLicenseUrl: "",
licenceUrl: "",
@@ -582,8 +583,14 @@
this.form = this.$route.query;
// console.log(this.$route.query, "this.$route.query.");
// console.log(this.form, "obj1");
- this.businessLicenseUrl = this.form.businessLicense;
- this.licenceUrl = this.form.licence;
+ this.finalDeptid = this.form.departmentid;
+ // console.log(this.finalDeptid, " this.finalDeptid");
+ // this.businessLicenseUrl = this.form.businessLicense;
+ // this.licenceUrl = this.form.licence;
+ this.getFromData({
+ currentPage: 1,
+ pageSize: 10,
+ });
}
// usejurisdiction().then((res) => {
// const data = res.data.data;
@@ -593,6 +600,16 @@
// });
},
methods: {
+ getFromData(page, params = {}) {
+ var that = this;
+ params["departmentid"] = this.finalDeptid;
+ getList(page.currentPage, page.pageSize, params).then((res) => {
+ // console.log(res.data.data.records[0], "多次获取该单位信息");
+ that.form = res.data.data.records[0];
+ this.businessLicenseUrl = res.data.data.records[0].businessLicense;
+ this.licenceUrl = res.data.data.records[0].licence;
+ });
+ },
// inspects(d, val) {
// var a = "";
// var doit = (d, val) => {
@@ -615,17 +632,24 @@
// return a;
// },
handleClick(tab) {
- if (tab.index == 1) {
+ if (tab.index == 2) {
this.investorSearchReset();
- } else if (tab.index == 2) {
- this.manageSearchReset();
} else if (tab.index == 3) {
- this.getHonorchData();
- } else if (tab.index == 4) {
- this.getTrainData();
- } else if (tab.index == 5) {
- this.getExaminationData();
+ this.manageSearchReset();
+ } else {
+ this.getFromData({
+ currentPage: 1,
+ pageSize: 10,
+ });
}
+ // else if (tab.index == 3) {
+ // this.getHonorchData();
+ // } else if (tab.index == 4) {
+ // this.getTrainData();
+ // } else if (tab.index == 5) {
+ // this.getExaminationData();
+ // }
+ //
},
getManifestationData() {
manifestationList(this.form.cardid).then((res) => {
diff --git a/src/views/securityCompany/computents/enclosure.vue b/src/views/securityCompany/computents/enclosure.vue
index 60e5300..2a342bb 100644
--- a/src/views/securityCompany/computents/enclosure.vue
+++ b/src/views/securityCompany/computents/enclosure.vue
@@ -389,7 +389,7 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
- console.log(this.data, "getListeenclosure");
+ // console.log(this.data, "getListeenclosure");
this.loading = false;
this.selectionClear();
});
diff --git a/src/views/securityCompany/computents/equipment.vue b/src/views/securityCompany/computents/equipment.vue
index ec37f9c..5e8f660 100644
--- a/src/views/securityCompany/computents/equipment.vue
+++ b/src/views/securityCompany/computents/equipment.vue
@@ -195,7 +195,7 @@
this.equipmentPage.total = data.total;
this.equipmentData = data.records;
- console.log(this.equipmentData, "this.equipmentData");
+ // console.log(this.equipmentData, "this.equipmentData");
this.equipmentLoading = false;
this.$refs.equipmentCrud.refreshTable();
this.$refs.equipmentCrud.doLayout();
diff --git a/src/views/securityCompany/computents/punish.vue b/src/views/securityCompany/computents/punish.vue
index ba9b52a..dff98e7 100644
--- a/src/views/securityCompany/computents/punish.vue
+++ b/src/views/securityCompany/computents/punish.vue
@@ -123,7 +123,7 @@
this.punishPage.total = data.total;
this.punishData = data.records;
- console.log(this.punishData, "pu");
+ // console.log(this.punishData, "pu");
this.punishLoading = false;
this.$refs.punishCrud.refreshTable();
this.$refs.punishCrud.doLayout();
diff --git a/src/views/securityCompany/computents/service.vue b/src/views/securityCompany/computents/service.vue
index 2e74048..c4be985 100644
--- a/src/views/securityCompany/computents/service.vue
+++ b/src/views/securityCompany/computents/service.vue
@@ -182,7 +182,7 @@
this.servicePage.total = data.total;
this.serviceData = data.records;
- console.log(this.serviceData, "this.serviceData");
+ // console.log(this.serviceData, "this.serviceData");
this.serviceLoading = false;
this.$refs.serviceCrud.refreshTable();
this.$refs.serviceCrud.doLayout();
diff --git a/src/views/securityCompany/computents/staff.vue b/src/views/securityCompany/computents/staff.vue
index 41da349..ba958c9 100644
--- a/src/views/securityCompany/computents/staff.vue
+++ b/src/views/securityCompany/computents/staff.vue
@@ -274,7 +274,7 @@
this.staffPage.total = data.total;
this.staffData = data.records;
- console.log(this.staffData, "staffData");
+ // console.log(this.staffData, "staffData");
this.staffLoading = false;
this.$refs.staffCrud.refreshTable();
this.$refs.staffCrud.doLayout();
diff --git a/src/views/securityCompany/confess.vue b/src/views/securityCompany/confess.vue
index fa09112..af5ad58 100644
--- a/src/views/securityCompany/confess.vue
+++ b/src/views/securityCompany/confess.vue
@@ -1,8 +1,8 @@
/*
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
- * @Last Modified by: Morpheus
- * @Last Modified time: 2021-07-10 16:01:42
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-09-18 09:14:24
* menu-name 保安服务公司查询
*/
<template>
@@ -401,7 +401,7 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
- console.log(this.data);
+ // console.log(this.data);
this.loading = false;
this.selectionClear();
});
diff --git a/src/views/securityCompany/dispatch.vue b/src/views/securityCompany/dispatch.vue
index 6d7f22d..de6782f 100644
--- a/src/views/securityCompany/dispatch.vue
+++ b/src/views/securityCompany/dispatch.vue
@@ -1,8 +1,8 @@
/*
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
- * @Last Modified by: Morpheus
- * @Last Modified time: 2021-07-10 16:06:03
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-09-18 09:14:26
* menu-name 派遣公司查询
*/
<template>
@@ -260,7 +260,7 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
- console.log(this.data, "dis");
+ // console.log(this.data, "dis");
this.loading = false;
this.selectionClear();
});
diff --git a/src/views/securityCompany/regulatoryInformation.vue b/src/views/securityCompany/regulatoryInformation.vue
index 87741f4..7f1f12a 100644
--- a/src/views/securityCompany/regulatoryInformation.vue
+++ b/src/views/securityCompany/regulatoryInformation.vue
@@ -1,8 +1,8 @@
/*
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
- * @Last Modified by: Morpheus
- * @Last Modified time: 2021-07-10 16:06:14
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-09-18 09:14:31
* menu-name 监管信息
*/
<template>
diff --git a/src/views/securityCompany/security.vue b/src/views/securityCompany/security.vue
index 7ccc517..c14338d 100644
--- a/src/views/securityCompany/security.vue
+++ b/src/views/securityCompany/security.vue
@@ -1,8 +1,8 @@
/*
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
- * @Last Modified by: Morpheus
- * @Last Modified time: 2021-07-10 16:01:42
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-09-18 09:14:42
* menu-name 保安服务公司查询
*/
<template>
@@ -408,7 +408,7 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
- console.log(this.data);
+ // console.log(this.data);
this.loading = false;
this.selectionClear();
});
diff --git a/src/views/securityCompany/securityCrossRegion.vue b/src/views/securityCompany/securityCrossRegion.vue
index c8202e3..ce685a6 100644
--- a/src/views/securityCompany/securityCrossRegion.vue
+++ b/src/views/securityCompany/securityCrossRegion.vue
@@ -1,8 +1,8 @@
/*
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
- * @Last Modified by: Morpheus
- * @Last Modified time: 2021-07-10 16:01:42
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-09-18 09:14:43
* menu-name 保安服务公司查询
*/
<template>
@@ -401,7 +401,7 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
- console.log(this.data);
+ // console.log(this.data);
this.loading = false;
this.selectionClear();
});
diff --git a/src/views/securityCompany/train.vue b/src/views/securityCompany/train.vue
index c158763..d86820f 100644
--- a/src/views/securityCompany/train.vue
+++ b/src/views/securityCompany/train.vue
@@ -1,8 +1,8 @@
/*
* @Author: Morpheus
* @Date: 2021-07-07 17:30:05
- * @Last Modified by: Morpheus
- * @Last Modified time: 2021-07-10 16:01:42
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-09-18 09:14:55
* menu-name 保安服务公司查询
*/
<template>
@@ -401,7 +401,7 @@
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
- console.log(this.data);
+ // console.log(this.data);
this.loading = false;
this.selectionClear();
});
diff --git a/src/views/securityGuardManagement/register.vue b/src/views/securityGuardManagement/register.vue
index a90f75f..f6d04c3 100644
--- a/src/views/securityGuardManagement/register.vue
+++ b/src/views/securityGuardManagement/register.vue
@@ -2,7 +2,7 @@
* @Author: Morpheus
* @Date: 2021-07-05 16:31:54
* @Last Modified by: liu
- * @Last Modified time: 2021-09-10 16:47:56
+ * @Last Modified time: 2021-09-18 09:42:02
* menu-name 保安员注册查询
*/
<template>
@@ -371,63 +371,41 @@
treeLoad: function (node, resolve) {
const parentId = node.level === 0 ? 0 : node.data.id;
-
-
if (parentId == 0) {
getDeptLazyTree(parentId).then((res) => {
-
resolve(
-
res.data.data.map((item) => {
-
return {
...item,
leaf: !item.hasChildren,
};
-
})
-
);
-
});
- } else if (parentId == '1372091709474910209') {
-
+ } else if (parentId == "1372091709474910209") {
getDeptLazyTree(parentId).then((res) => {
-
resolve(
-
res.data.data[0].children.map((item) => {
-
return {
...item,
leaf: !item.hasChildren,
};
-
})
-
);
-
});
} else {
getDeptLazyTree(parentId).then((res) => {
res.data.data = [];
resolve(
-
res.data.data.map((item) => {
-
return {
...item,
leaf: !item.hasChildren,
};
-
})
-
);
-
});
}
-
-
},
addBtn: false,
menu: false,
@@ -779,8 +757,10 @@
},
"excelForm.isCovered"() {
if (this.excelForm.isCovered !== "") {
- const column = this.findObject(this.excelOption.column, "excelFile");
- column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
+ try {
+ const column = this.findObject(this.excelOption.column, "excelFile");
+ column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
+ } catch {}
}
},
},
@@ -883,16 +863,22 @@
},
initData(tenantId) {
getRoleTree(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "roleId");
- column.dicData = res.data.data;
+ try {
+ const column = this.findObject(this.option.group, "roleId");
+ column.dicData = res.data.data;
+ } catch {}
});
getDeptTree(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "deptId");
- column.dicData = res.data.data;
+ try {
+ const column = this.findObject(this.option.group, "deptId");
+ column.dicData = res.data.data;
+ } catch {}
});
getPostList(tenantId).then((res) => {
- const column = this.findObject(this.option.group, "postId");
- column.dicData = res.data.data;
+ try {
+ const column = this.findObject(this.option.group, "postId");
+ column.dicData = res.data.data;
+ } catch {}
});
},
diff --git a/src/views/securityUnitOperation/economicAnalysis.vue b/src/views/securityUnitOperation/economicAnalysis.vue
index 999cdf0..ce44027 100644
--- a/src/views/securityUnitOperation/economicAnalysis.vue
+++ b/src/views/securityUnitOperation/economicAnalysis.vue
@@ -247,7 +247,7 @@
getCompanys({ jurisdiction: this.value1 }).then(res => {
if (res.data.code === 200) {
this.options2 = res.data.data;
- this.value2 = this.options2[0] ? this.options2[0].departmentid : "";
+ // this.value2 = this.options2[0] ? this.options2[0].departmentid : "";
this.changeCompanys();
}
});
diff --git a/src/views/securityUnitOperation/operationAnalysis.vue b/src/views/securityUnitOperation/operationAnalysis.vue
index ebaee46..4b88e6d 100644
--- a/src/views/securityUnitOperation/operationAnalysis.vue
+++ b/src/views/securityUnitOperation/operationAnalysis.vue
@@ -283,7 +283,7 @@
getCompanys({ jurisdiction: this.value1 }).then(res => {
if (res.data.code === 200) {
this.options2 = res.data.data;
- this.value2 = this.options2[0] ? this.options2[0].departmentid : "";
+ // this.value2 = this.options2[0] ? this.options2[0].departmentid : "";
this.enterpriseName = this.options2[0]
? this.options2[0].enterpriseName
: "";
--
Gitblit v1.9.3