From 05ae88d2318dc8be1baa89a7a52929ec249f3fe6 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 20 Aug 2021 16:46:05 +0800
Subject: [PATCH] 保安单位智能分析 图表更改 装备管理加数量 派遣管理优化 字段 搜索
---
src/views/securityEquipment/car.js | 5
src/views/securityEquipment/equipments.js | 15 +
vue.config.js | 7
src/views/recruitmentManagement/index.vue | 1
src/views/dispatch/data.js | 100 +++++----
src/views/securityEquipment/gun.js | 5
src/views/securityAnalysis/index.vue | 14
src/views/dispatch/dispatch.vue | 2
src/views/dispatch/dispatchChildoperable.vue | 419 +----------------------------------------
9 files changed, 107 insertions(+), 461 deletions(-)
diff --git a/src/views/dispatch/data.js b/src/views/dispatch/data.js
index b807b64..65b27db 100644
--- a/src/views/dispatch/data.js
+++ b/src/views/dispatch/data.js
@@ -20,29 +20,34 @@
},
{
label: "保安公司",
- prop: "tenantName",
- // type: "tree",
- // dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=0",
- // props: {
- // label: "title",
- // value: "id"
- // },
+ prop: "deptId",
+ type: "tree",
+ dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ props: {
+ label: "title",
+ value: "id"
+ },
+ // hide: true,
// hide: !website.tenantMode,
// addDisplay: website.tenantMode,
// editDisplay: website.tenantMode,
// viewDisplay: website.tenantMode,
- // rules: [{
- // required: true,
- // message: "请输入所属保安单位",
- // trigger: "click"
- // }],
+ rules: [{
+ required: true,
+ message: "请选择保安公司",
+ trigger: "click"
+ }],
labelWidth: 110,
width: 200,
- editDisplay: false,
- addDisplay: false,
+ searchLabelWidth: 110,
+ search: true,
+ searchSpan: 4,
+ // editDisplay: false,
+ // addDisplay: false,
// hide: true,
// span: 11,
},
+
{
label: " 联系人",
prop: "linkman",
@@ -77,42 +82,53 @@
// // width: 110,
// // overHidden: true
// },
+ // {
+ // label: "所属辖区",
+ // prop: "jurisdiction",
+ // // multiple: true,
+ // labelWidth: 110,
+ // 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: "address",
+ // labelWidth: 110,
+ // // search: true,
+ // // width: 110,
+ // // overHidden: true
+ // },
{
- label: "所属辖区",
- prop: "jurisdiction",
- // multiple: true,
+ label: "合同生效时间",
+ prop: "startTime",
labelWidth: 110,
- 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: "address",
- labelWidth: 110,
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
// search: true,
- // width: 110,
+ // searchSpan: 4,
// overHidden: true
},
{
- label: "创建时间",
- prop: "createTime",
+ label: "合同到期时间",
+ prop: "endTime",
labelWidth: 110,
type: "date",
- format: "yyyy-MM-dd hh:mm:ss",
- valueFormat: "timestamp",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
// search: true,
// searchSpan: 4,
// overHidden: true
diff --git a/src/views/dispatch/dispatch.vue b/src/views/dispatch/dispatch.vue
index 5251a67..b59f93c 100644
--- a/src/views/dispatch/dispatch.vue
+++ b/src/views/dispatch/dispatch.vue
@@ -339,7 +339,7 @@
this.page.total = data.total;
this.data = data.records;
for (var k in this.data) {
- this.data[k]["deptId"] = that.userInfo.dept_id;
+ // this.data[k]["deptId"] = that.userInfo.dept_id;
this.data[k]["tenantName"] = that.userInfo.user_name;
}
window.localStorage.setItem("paqiandataS", JSON.stringify(this.data));
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index cf1bf5f..8935884 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -1,41 +1,6 @@
<template>
<basic-container>
<div class="dispatchChildoperable">
- <!-- <avue-tabs :option="optionTABS" @change="handleChangeTABS"></avue-tabs> -->
- <!-- <span v-if="typeTABS.prop === 'tab1'"> -->
- <!-- <avue-crud
- :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"
- @click="handleDelete"
- >删 除
- </el-button>
- </template>
- </avue-crud> -->
- <!-- <avue-form ref="form" v-model="obj0" :option="option0"> -->
- <!-- <template slot-scope="scope" slot="menuForm">
- <el-button @click="tip">自定义按钮</el-button>
- </template> -->
- <!-- </avue-form>
- </span>
- <span v-else-if="typeTABS.prop === 'tab2'"> -->
<avue-crud
:option="option1"
:data="data1"
@@ -50,93 +15,19 @@
@selection-change="selectionChange1"
@refresh-change="refreshChange1"
>
- <!-- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- plain
- icon="el-icon-delete"
- @click="handleDelete1"
- >删 除
- </el-button>
- </template> -->
</avue-crud>
- <!-- </span> -->
- <!-- <span v-else-if="typeTABS.prop === 'tab3'">选项卡内容3</span> -->
</div>
</basic-container>
</template>
<script>
-// import { column, column1 } from "./data";
-import {
- // getdata,
- // adddata,
- // update,
- // remove,
- getdata1,
- adddata1,
- update1,
- remove1,
-} from "@/api/dispatch/dispatch";
+import { getdata1, adddata1, update1, remove1 } from "@/api/dispatch/dispatch";
import { getDept } from "@/api/system/dept";
export default {
data() {
let baseUrl = "https://cli.avuejs.com/api/area";
return {
- // typeTABS: {}, //标签页
- // optionTABS: {
- // column: [
- // {
- // // icon: "el-icon-info",
- // label: "派遣服务公司详情",
- // prop: "tab1",
- // },
- // {
- // // icon: "el-icon-info",
- // label: "派遣记录",
- // prop: "tab2",
- // },
- // // {
- // // icon: "el-icon-info",
- // // label: "选项卡3",
- // // prop: "tab3",
- // // },
- // ],
- // },
-
- // id: "", //记录归属id
- // //基本信息
- // //保安单位信息表单
- // obj0: {
- // // title: "我是头部标题",
- // },
- // option0: {
- // emptyBtn: false,
- // submitBtn: false,
- // gutter: 30,
- // column: column,
- // },
- // loading: true, //派遣服务公司登记
- // selectionList: [],
- // page: {
- // pageSize: 10,
- // currentPage: 1,
- // total: 0,
- // },
- // query: {},
- // data: [],
- // option: {
- // card: true,
- // searchSize: "mini",
- // searchMenuSpan: 6,
- // height: 547,
- // menuWidth: 160,
- // align: "center",
- // selection: true,
- // column: column,
- // },
deptCategory: "",
deptId: "",
@@ -163,79 +54,31 @@
align: "center",
selection: true,
column: [
- // 派遣服务公司登记
- // {
- // label: "id",
- // prop: "id",
- // // search: true,
- // // searchSpan: 4,
- // // overHidden: true,
- // // hide: true,
- // // editDisplay: false,
- // // addDisplay: false
- // },
- // {
- // label: "保安公司",
- // prop: "deptId",
- // labelWidth: 120,
- // searchLabelWidth: 120,
- // searchSpan: 4,
- // dicUrl:
- // "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- // props: {
- // label: "title",
- // value: "id",
- // },
- // search: true,
- // overHidden: true,
- // type: "select",
- // rules: [
- // {
- // required: true,
- // message: "请输入保安公司",
- // trigger: "blur",
- // },
- // ],
// },
{
label: "派遣单位",
prop: "dispatcherCompany",
// addDisplay: false,
// editDisplay: false,
+ search: true,
+ labelWidth: 120,
+ searchSpan: 4,
+ width: 180,
},
// {
- // label: "派遣单位",
- // prop: "dispatcherUnitId",
- // labelWidth: 120,
- // searchLabelWidth: 120,
- // dicUrl: "/api/dispatcherUnit/page-tree",
- // props: {
- // label: "name",
- // value: "id",
- // },
- // hide: true,
- // searchSpan: 4,
- // search: true,
- // overHidden: true,
- // type: "tree",
- // rules: [
- // {
- // required: true,
- // message: "请输入保安公司",
- // trigger: "blur",
- // },
- // ],
- // },
{
label: "保安公司",
prop: "deptId",
search: true,
+ labelWidth: 120,
type: "select",
- cascaderItem: ["securityName"],
+ searchSpan: 4,
+ cascaderItem: ["name"],
props: {
label: "title",
value: "id",
},
+ width: 180,
dicUrl: `/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697`,
rules: [
{
@@ -247,8 +90,11 @@
},
{
label: "保安员",
- prop: "securityName",
+ prop: "name",
type: "select",
+ width: 70,
+ labelWidth: 120,
+ searchSpan: 3,
search: true,
// cell: true,
// hide: true,
@@ -266,47 +112,6 @@
],
},
- // {
- // width: 120,
- // label: "保安人名称",
- // prop: "area",
- // cell: true,
- // props: {
- // label: "name",
- // value: "code",
- // },
- // type: "select",
- // dicUrl: `${baseUrl}/getArea/{{key}}`,
- // rules: [
- // {
- // required: true,
- // message: "请选择地区",
- // trigger: "blur",
- // },
- // ],
- // },
- // {
- // label: "保安人名称",
- // prop: "name",
- // search: true,
- // searchSpan: 4,
- // labelWidth: 120,
- // searchLabelWidth: 120,
- // // overHidden: true
- // type: "tree",
- // dicUrl: "/api/blade-user/page-security",
- // props: {
- // label: "realName",
- // value: "postId",
- // },
- // rules: [
- // {
- // required: true,
- // message: "请输入保安人名称",
- // trigger: "click",
- // },
- // ],
- // },
{
label: "身份证",
prop: "cardid",
@@ -406,40 +211,11 @@
// searchSpan: 4,
// overHidden: true
},
- // {
- // label: "派遣单位",
- // // prop: "dispatcherCompany",
- // prop: "tenantName",
- // type: "tree",
- // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
- // props: {
- // label: "title",
- // value: "id"
- // },
- // // hide: !website.tenantMode,
- // // addDisplay: website.tenantMode,
- // // editDisplay: website.tenantMode,
- // // viewDisplay: website.tenantMode,
- // rules: [{
- // required: true,
- // message: "请输入派遣单位",
- // trigger: "click"
- // }],
- // search: true,
- // searchSpan: 4,
- // overHidden: true
- // },
],
},
};
},
computed: {
- // ids() {
- // let ids = [];
- // this.selectionList.forEach((ele) => {
- // ids.push(ele.id);
- // });
- // return ids.join(",");
// },
ids1() {
let ids1 = [];
@@ -462,129 +238,6 @@
}
// this.$message.success(JSON.stringify(column));
},
- //派遣服务公司登记
- // sizeChange(val) {
- // this.page1.currentPage = 1;
- // this.page1.pageSize = val;
- // // this.getData();
- // this.onLoad(this.page, this.query);
- // // this.$message.success("行数" + val);
- // },
- // currentChange(val) {
- // this.page1.currentPage = val;
- // // this.getData();
- // this.onLoad(this.page, this.query);
- // // this.$message.success("页码" + val);
- // },
- // rowSave(form, done, loading) {
- // var that = this;
- // var form = this.data[0];
- // delete form.id;
- // for (var k = 0; k < 13; k++) {
- // adddata(form).then(
- // (res) => {
- // this.onLoad(this.page);
- // this.$message({
- // type: "success",
- // message: "操作成功!",
- // });
- // done();
- // },
- // (error) => {
- // window.console.log(error);
- // loading();
- // }
- // );
- // }
- // },
- // searchChange(params, done) {
- // this.query = params;
- // this.page.currentPage = 1;
- // this.onLoad(this.page, params);
- // done();
- // },
- // searchReset() {
- // this.query = {};
- // this.onLoad(this.page);
- // },
- // rowUpdate(row, index, done, loading) {
- // console.log(row);
- // update(row).then(
- // () => {
- // 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: "操作成功!",
- // });
- // });
- // },
- // selectionChange(list) {
- // this.selectionList = list;
- // },
- // 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.crudrec.toggleSelection();
- // });
- // },
- // refreshChange() {
- // this.onLoad(this.page, this.query);
- // },
- // onLoad(page, params = {}) {
- // this.loading = true;
- // getdata(
- // page.currentPage,
- // page.pageSize,
- // Object.assign(params, this.query)
- // ).then((res) => {
- // // console.log(res);
- // const data = res.data.data;
- // this.page.total = data.total;
- // this.data = data.records;
- // console.log(this.data);
- // this.loading = false;
- // });
- // },
- //派遣服务公司登记
//派遣记录
sizeChange1(val) {
@@ -601,15 +254,6 @@
// this.$message.success("页码" + val);
},
rowSave1(form, done, loading) {
- // var that = this;
- // var form = this.data1[0];
- // delete form.id;
- // for (var k = 0; k < 13; k++) {
- // form["deptId"] = form.tenantName;
- // form["tenantName"] = form.$tenantName;
- // form["dispatcherUnitId"] = this.id;
- // console.log(form);
-
adddata1(form).then(
(res) => {
this.onLoad1(this.page1);
@@ -637,10 +281,6 @@
this.onLoad1(this.page1);
},
rowUpdate1(row, index, done, loading) {
- // row["deptId"] = row.tenantName;
- // row["tenantName"] = row.$tenantName;
- // row["dispatcherUnitId"] = this.id;
- // console.log(row, "row");
update1(row).then(
() => {
this.onLoad1(this.page1);
@@ -728,12 +368,6 @@
//
onLoad1(page, params = {}) {
this.loading1 = true;
- // params["cardid"] = this.cardid;
- // params["name"] = this.name;
- // params["dispatcherCompany"] = this.dispatcherCompany;
- // params["dispatcherUnitId"] = this.id;
- // console.log(params, "get");
- // console.log(page);
var values;
const { releaseTimeRange } = this.query1;
if (releaseTimeRange) {
@@ -768,12 +402,6 @@
});
},
//派遣记录
- // saveLock(name, val) {
- // localStorage.setItem(name, val);
- // },
- // readLock(name) {
- // return localStorage.getItem(name);
- // },
},
mounted() {
this.onLoad1(this.page1, this.query1);
@@ -811,27 +439,6 @@
// this.obj0.name = " 未选择派遣单位";
// }
},
- // onLoad(page, params = {}) {
- // this.deptId = JSON.parse(
- // window.localStorage.getItem("saber-userInfo")
- // ).content.dept_id;
-
- // //获取当前用户部门信息，判断是否为公安，如果是公安，则只能查看公告信息
- // var that = this;
- // getDept(this.deptId).then((res) => {
- // var deptCategory = res.data.data.deptCategory;
- // deptCategory == 1
- // ? (that.deptCategory = true)
- // : (that.deptCategory = false);
-
- // if (that.deptCategory) {
- // params["deptId"] = this.deptId;
- // }
- // let values = {
- // ...params,
- // };
- // })
- // }
};
</script>
diff --git a/src/views/recruitmentManagement/index.vue b/src/views/recruitmentManagement/index.vue
index e177e2c..fbbc4b2 100644
--- a/src/views/recruitmentManagement/index.vue
+++ b/src/views/recruitmentManagement/index.vue
@@ -59,6 +59,7 @@
searchSize: "mini",
searchMenuSpan: 6,
height: 583,
+ border: true,
menuWidth: 210,
align: "center",
selection: true,
diff --git a/src/views/securityAnalysis/index.vue b/src/views/securityAnalysis/index.vue
index efdb59a..63d6cd8 100644
--- a/src/views/securityAnalysis/index.vue
+++ b/src/views/securityAnalysis/index.vue
@@ -188,7 +188,7 @@
// orient: "vertical",
// left: "left", x: "center",
x: "center",
- y: "90%",
+ y: "83%",
},
series: [
{
@@ -408,8 +408,10 @@
trigger: "item",
},
legend: {
- orient: "vertical",
- left: "left",
+ // orient: "vertical",
+ // left: "left",
+ x: "center",
+ y: "90%",
},
series: [
{
@@ -472,8 +474,10 @@
trigger: "item",
},
legend: {
- orient: "vertical",
- left: "left",
+ // orient: "vertical",
+ // left: "left",
+ x: "center",
+ y: "83%",
},
series: [
{
diff --git a/src/views/securityEquipment/car.js b/src/views/securityEquipment/car.js
index 4807633..dbcc8d7 100644
--- a/src/views/securityEquipment/car.js
+++ b/src/views/securityEquipment/car.js
@@ -63,16 +63,19 @@
}]
},
{
- label: "保安公司",
+ label: "所属保安公司",
prop: "deptId",
rules: [{
required: true,
message: "请输入保安公司",
trigger: "blur"
}],
+ search: true,
// addDisplay: true,
// editDisplay: true,
// viewDisplay: true,
+ searchSpan: 4,
+ searchLabelWidth: 110,
overHidden: true,
// searchSpan: 4,
dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
diff --git a/src/views/securityEquipment/equipments.js b/src/views/securityEquipment/equipments.js
index d54209a..147536b 100644
--- a/src/views/securityEquipment/equipments.js
+++ b/src/views/securityEquipment/equipments.js
@@ -61,13 +61,26 @@
// search: true,
},
{
- label: "保安公司",
+ label: "数量",
+ prop: "num",
+ rules: [{
+ required: true,
+ message: "请输入数量",
+ trigger: "blur"
+ }]
+ // search: true,
+ },
+ {
+ label: "所属保安公司",
prop: "deptId",
+ searchSpan: 4,
+ searchLabelWidth: 110,
rules: [{
required: true,
message: "请输入组织机构",
trigger: "blur"
}],
+ search: true,
overHidden: true,
// addDisplay: true,
// editDisplay: true,
diff --git a/src/views/securityEquipment/gun.js b/src/views/securityEquipment/gun.js
index c3dceef..835bc36 100644
--- a/src/views/securityEquipment/gun.js
+++ b/src/views/securityEquipment/gun.js
@@ -69,8 +69,11 @@
search: true,
},
{
- label: "保安公司",
+ label: "所属保安公司",
prop: "deptId",
+ search: true,
+ searchSpan: 4,
+ searchLabelWidth: 110,
labelWidth: 160,
rules: [{
required: true,
diff --git a/vue.config.js b/vue.config.js
index ef3b4fa..3bc21b9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,14 +26,13 @@
// disableHostCheck: true,
proxy: {
'/api': {
- //本地服务接口地址
- // target: 'http://localhost',
- target: 'http://192.168.0.109:81',//钟W
+ // 本地服务接口地址
+ target: 'http://localhost:81',
+ // target: 'http://192.168.0.114:81',//钟日健W
// target: 'http://localhost:81',//原W
// target: 'http://192.168.0.108:81',//原W
// target: 'http://192.168.0.109:81',//唐N
//远程演示服务地址,可用于直接启动项目
- // target: 'https://saber.bladex.vip/api',
ws: true,
pathRewrite: {
'^/api': '/'
--
Gitblit v1.9.3