ZheJiangNingBo
/
pingAnQiYeWeb
7
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request '赋分算法修改' (#88) from lukeyan into master

Browse Source 
Reviewed-on: #88
pull/91/head^2
lukeyan 1 year ago
parent 10232565b1 81076fe6fd
commit 04bd564179
7 changed files with 243 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
src/api/closeLoopDispose/index.js
Unescape View File

@ -27,7 +27,7 @@ export function get_backlog(data) {
// 待办任务查询 // 待办任务查询
export function get_backlog_company_tree(params) { export function get_backlog_company_tree(params) {
return request({ return request({
url: '/system/dept/list', url: 'closedloopdisposal/workflow/dept/list',
method: 'get', method: 'get',
params params
}) })

6
src/utils/request.js
Unescape View File

@ -4,10 +4,10 @@ import vm from "../main";
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
const request = axios.create({ const request = axios.create({
baseURL: 'http://172.18.113.50:8080/zhapi', //baseURL: 'http://172.18.113.50:8080/zhapi',
// baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强 //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强
//baseURL: 'http://192.168.0.188:8888/zhapi', //baseURL: 'http://192.168.0.188:8888/zhapi',
// baseURL: `http://${window.location.host}/zhapi`, baseURL: `http://${window.location.host}/zhapi`,
timeout: 50000, timeout: 50000,
headers: { 'content-type': 'application/json' }, headers: { 'content-type': 'application/json' },
}) })

3
src/views/closeLoopDispose/components/backlog.vue
Unescape View File

@ -126,6 +126,9 @@ export default {
total: 0, total: 0,
}; };
}, },
created() {
this.search_data();
},
methods: { methods: {
search_data() { search_data() {
let param = { let param = {

148
src/views/closeLoopDispose/components/backlogDetailDialog.vue
Unescape View File

@ -19,10 +19,30 @@
<i class="el-icon-search"></i> <i class="el-icon-search"></i>
</div> </div>
</div> </div>
<!-- 部门树 -->
<div class="section_tree">
<el-tree
ref="company_tree"
:data="tree_data"
:props="defaultProps"
show-checkbox
node-key="id"
:default-expand-all="defaultExpandAll"
@check="handle_check"
>
<span
slot-scope="{ node }"
:title="node.label"
class="el-tree-node__label node-label"
>
{{ node.label }}
</span>
</el-tree>
</div>
</div> </div>
<div class="form_btn" slot="footer"> <div class="form_btn" slot="footer">
<el-button @click="save_delete">取 消</el-button> <el-button @click="close">取 消</el-button>
<el-button @click="close">确 定</el-button> <el-button @click="enter">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
@ -34,21 +54,38 @@ export default {
return { return {
visible: false, visible: false,
section_search: "", section_search: "",
tree_data: [],
defaultProps: {
children: "children",
label: "name",
},
defaultExpandAll: true, // 控制公司树默认展开
company_list: [],
}; };
}, },
methods: { methods: {
open() { open() {
this.visible = true; this.visible = true;
this.handle_click();
}, },
handle_click() { handle_click() {
let param = { let param = {
deptName: this.section_search, deptName: this.section_search,
}; };
get_backlog_company_tree(param).then(res=>{ get_backlog_company_tree(param).then((res) => {
console.log('res_ppp',res); this.tree_data = res.data;
}); });
}, },
save_delete() {}, handle_check(data, checkedData) {
console.log("data", data);
console.log("checkedData", checkedData);
this.company_list = checkedData.checkedNodes // 获取选中公司的数组
},
// 确定关闭弹窗
enter() {
this.$emit('push_data',this.company_list)
this.visible = false;
},
close() { close() {
this.visible = false; this.visible = false;
}, },
@ -130,6 +167,26 @@ export default {
} }
} }
} }
.section_tree {
margin-top: 1vh;
margin-left: 8px;
width: 550px;
// border: 0.1px solid #5b748c;
height: 49vh;
// overflow-y: auto;
}
// .section_tree::-webkit-scrollbar {
// display: none;
// width: 6px;
// background-color: #5e666a;
// border-radius: 4px;
// }
// .section_tree::-webkit-scrollbar-thumb {
// display: none;
// width: 5px;
// background-color: #3c4b4a;
// border-radius: 4px;
// }
} }
.el-button { .el-button {
width: 120px; width: 120px;
@ -144,5 +201,86 @@ export default {
background: url("~@/assets/companyFile/btn05.png") no-repeat !important; background: url("~@/assets/companyFile/btn05.png") no-repeat !important;
background-size: 100% 100% !important; background-size: 100% 100% !important;
} }
.el-tree {
/* 树形数据过长添加滚动条 */
height: 49vh;
overflow: auto;
// box-shadow: 5px 5px 10px #126a58;
border-radius: 0px;
// background: #293738;
background: rgba(0, 0, 0, 0);
border: 0.1px solid #485f6c;
color: #fff !important;
.el-tree-node__content {
height: 50px;
}
.el-tree-node__label.node-label {
display: flex;
font-size: 18px;
}
/* 去掉树形数据前面的三角形 */
.el-icon-caret-right:before {
content: "";
}
.node-label {
/* 树形数据横向过长添加展开 */
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/* hover节点时的背景颜色 */
.el-tree-node__content:hover {
background: #495461;
color: #fff;
text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
}
/* 节点选中的背景颜色 */
.el-tree-node:focus > .el-tree-node__content {
background: #495461;
color: #fff;
text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
}
// 没有展开且有子节点
.el-tree.el-icon-caret-right:before {
background: url("~@/assets/companyFile/add.png") no-repeat;
content: "";
display: block;
width: 23px;
height: 23px;
font-size: 23px;
background-size: 23px;
}
// 已经展开且有子节点
.el-tree.el-tree-node__expand-icon.expanded.el-icon-caret-right:before {
background: url("~@/assets/companyFile/add.png") no-repeat;
content: "";
display: block;
width: 23px;
height: 23px;
font-size: 23px;
background-size: 23px;
}
// 没有子节点 minus
.el-tree.el-tree-node__expand-icon.is-leaf::before {
background: url("~@/assets/companyFile/minus.png") no-repeat;
content: "";
display: block;
width: 23px;
height: 23px;
font-size: 23px;
background-size: 23px;
}
}
.el-tree::-webkit-scrollbar {
width: 9px;
background-color: #5e666a;
border-radius: 4px;
}
.el-tree::-webkit-scrollbar-thumb {
width: 8px;
background-color: #3c4b4a;
border-radius: 4px;
}
} }
</style> </style>

79
src/views/closeLoopDispose/components/backlogDetailForm.vue
Unescape View File

@ -68,11 +68,21 @@
<el-input type="textarea" v-model="form.suggest"></el-input> <el-input type="textarea" v-model="form.suggest"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="抄送部门"> <el-form-item label="抄送部门">
<el-input <!-- <el-input
v-model="form.section" v-model="form.section"
> >
<i slot="suffix" class="el-input__icon el-icon-search" @click="handle_click()"></i> <i slot="suffix" class="el-input__icon el-icon-search" @click="handle_click()"></i>
</el-input> </el-input> -->
<div class="push_company">
<div class="push_tags">
<el-tag v-for="tag in tags" :key="tag.name">
{{ tag.name }}
</el-tag>
</div>
<div class="icon_btn">
<i class="el-icon-search" @click="handle_click()"></i>
</div>
</div>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button>处置完成</el-button> <el-button>处置完成</el-button>
@ -127,15 +137,18 @@
</div> </div>
</div> </div>
</div> </div>
<BacklogDetailDialog ref="backlogDetailDialog"></BacklogDetailDialog> <BacklogDetailDialog
ref="backlogDetailDialog"
@push_data="push_data"
></BacklogDetailDialog>
</div> </div>
</template> </template>
<script> <script>
import BacklogDetailDialog from './backlogDetailDialog' import BacklogDetailDialog from "./backlogDetailDialog";
import { get_my_course_record } from "@/api/closeLoopDispose"; import { get_my_course_record } from "@/api/closeLoopDispose";
export default { export default {
name: "BacklogDetailForm", name: "BacklogDetailForm",
components:{ components: {
BacklogDetailDialog, BacklogDetailDialog,
}, },
props: { props: {
@ -194,6 +207,9 @@ export default {
{ label: "通过", value: "2" }, { label: "通过", value: "2" },
{ label: "驳回", value: "3" }, { label: "驳回", value: "3" },
{ label: "处置中", value: "4" }, { label: "处置中", value: "4" },
],
tags: [
], ],
process_status: "", // 流程状态展示 process_status: "", // 流程状态展示
}; };
@ -215,7 +231,14 @@ export default {
}, },
methods: { methods: {
handle_click() { handle_click() {
this.$refs.backlogDetailDialog.open() this.$refs.backlogDetailDialog.open();
},
// 树中选中单位的数据
push_data(val) {
console.log("dalog", val);
this.tags = val
// let list = val.map((item) => item.name);
// this.form.section = list.slice(0, 3).toString();
}, },
}, },
}; };
@ -526,14 +549,37 @@ export default {
} }
/deep/.el-form { /deep/.el-form {
margin-top: 1vh; margin-top: 1vh;
overflow: auto;
height: 24.5vh;
// border: 0.1px solid #3f5564;
.el-form-item { .el-form-item {
.push_company {
border: 0.1px solid #3f5564;
// height: 4vh;
display: flex;
justify-content: space-between;
.icon_btn {
width: 42px !important;
height: 4vh;
// border: 0.1px solid #3f5564;
color: #3f5564;
text-align: center;
line-height: 4vh;
cursor: pointer;
font-size: 16px;
}
.icon_btn:focus,
.icon_btn:hover {
text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
}
}
.el-form-item__label { .el-form-item__label {
text-align: center; text-align: center;
color: #fff; color: #fff;
} }
} }
.el-form-item__content { .el-form-item__content {
width: 25vw; width: 26vw;
.el-input__inner { .el-input__inner {
width: 25vw; width: 25vw;
border-radius: 0px; border-radius: 0px;
@ -602,4 +648,23 @@ export default {
background: #323f43 !important; background: #323f43 !important;
} }
} }
.el-form::-webkit-scrollbar {
display: none;
width: 6px;
background-color: #5e666a;
border-radius: 4px;
}
.el-form::-webkit-scrollbar-thumb {
display: none;
width: 5px;
background-color: #3c4b4a;
border-radius: 4px;
}
.el-tag {
color: #fff;
border-radius: 0px;
background: rgba(0, 0, 0, 0);
border: 0.1px solid #3f5564;
text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
}
</style> </style>

2
src/views/closeLoopDispose/index.vue
Unescape View File

@ -19,7 +19,7 @@
@change_to_detail="change_to_detail" @change_to_detail="change_to_detail"
></MyCourse> ></MyCourse>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="代办任务" name="second"> <el-tab-pane label="待办任务" name="second">
<Backlog <Backlog
ref="backlog" ref="backlog"
@change_backlog_detail="change_backlog_detail" @change_backlog_detail="change_backlog_detail"

40
src/views/systemManagement/safeIndex/index.vue
Unescape View File

@ -15,9 +15,9 @@
<!-- 综合指数算法表单 --> <!-- 综合指数算法表单 -->
<div class="index_form"> <div class="index_form">
<el-form v-if="!btn_flag" ref="form" :model="form" class="form"> <el-form v-if="!btn_flag" ref="form" :model="form" class="form">
<el-form-item label="内部治安管理 ×" prop="rate_one"> <el-form-item label="内部治安安全 ×" prop="rate_one">
<label slot="label" <label slot="label"
>内部治安管理&nbsp;&nbsp;&nbsp;&nbsp;×</label >内部治安安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
> >
<el-input v-model="form.rate_one"></el-input> <el-input v-model="form.rate_one"></el-input>
</el-form-item> </el-form-item>
@ -33,21 +33,21 @@
> >
<el-input v-model="form.rate_three"></el-input> <el-input v-model="form.rate_three"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="+ 道路交通安全秩序管理 ×" prop="rate_four"> <el-form-item label="+ 道路安全 ×" prop="rate_four">
<label slot="label" <label slot="label"
>+&nbsp;&nbsp;&nbsp;&nbsp;道路交通安全秩序管理&nbsp;&nbsp;&nbsp;&nbsp;×</label >+&nbsp;&nbsp;&nbsp;&nbsp;道路安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
> >
<el-input v-model="form.rate_four"></el-input> <el-input v-model="form.rate_four"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="+ 防攻击安全管理 ×" prop="rate_five"> <el-form-item label="+ 防攻击安全 ×" prop="rate_five">
<label slot="label" <label slot="label"
>+&nbsp;&nbsp;&nbsp;&nbsp;防攻击安全管理&nbsp;&nbsp;&nbsp;&nbsp;×</label >+&nbsp;&nbsp;&nbsp;&nbsp;防攻击安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
> >
<el-input v-model="form.rate_five"></el-input> <el-input v-model="form.rate_five"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="+ 网络安全管理 ×" prop="rate_six"> <el-form-item label="+ 网络安全 ×" prop="rate_six">
<label slot="label" <label slot="label"
>+&nbsp;&nbsp;&nbsp;&nbsp;网络安全管理&nbsp;&nbsp;&nbsp;&nbsp;×</label >+&nbsp;&nbsp;&nbsp;&nbsp;网络安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
> >
<el-input v-model="form.rate_six"></el-input> <el-input v-model="form.rate_six"></el-input>
</el-form-item> </el-form-item>
@ -63,9 +63,9 @@
> >
<el-input v-model="form.rate_eight"></el-input> <el-input v-model="form.rate_eight"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="+ 列管物品 ×" prop="rate_nine"> <el-form-item label="+ 列管物品安全 ×" prop="rate_nine">
<label slot="label" <label slot="label"
>+&nbsp;&nbsp;&nbsp;&nbsp;列管物品&nbsp;&nbsp;&nbsp;&nbsp;×</label >+&nbsp;&nbsp;&nbsp;&nbsp;列管物品安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
> >
<el-input v-model="form.rate_nine"></el-input> <el-input v-model="form.rate_nine"></el-input>
</el-form-item> </el-form-item>
@ -77,9 +77,9 @@
class="text_form" class="text_form"
:disabled="disabled" :disabled="disabled"
> >
<el-form-item label="内部治安管理 ×" prop="rate_one"> <el-form-item label="内部治安安全 ×" prop="rate_one">
<label slot="label" <label slot="label"
>内部治安管理&nbsp;&nbsp;&nbsp;&nbsp;×</label >内部治安安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
> >
<el-input v-model="form.rate_one"></el-input> <el-input v-model="form.rate_one"></el-input>
</el-form-item> </el-form-item>
@ -95,21 +95,21 @@
> >
<el-input v-model="form.rate_three"></el-input> <el-input v-model="form.rate_three"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="+ 道路交通安全秩序管理 ×" prop="rate_four"> <el-form-item label="+ 道路安全 ×" prop="rate_four">
<label slot="label" <label slot="label"
>+&nbsp;&nbsp;&nbsp;&nbsp;道路交通安全秩序管理&nbsp;&nbsp;&nbsp;&nbsp;×</label >+&nbsp;&nbsp;&nbsp;&nbsp;道路安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
> >
<el-input v-model="form.rate_four"></el-input> <el-input v-model="form.rate_four"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="+ 防攻击安全管理 ×" prop="rate_five"> <el-form-item label="+ 防攻击安全 ×" prop="rate_five">
<label slot="label" <label slot="label"
>+&nbsp;&nbsp;&nbsp;&nbsp;防攻击安全管理&nbsp;&nbsp;&nbsp;&nbsp;×</label >+&nbsp;&nbsp;&nbsp;&nbsp;防攻击安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
> >
<el-input v-model="form.rate_five"></el-input> <el-input v-model="form.rate_five"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="+ 网络安全管理 ×" prop="rate_six"> <el-form-item label="+ 网络安全 ×" prop="rate_six">
<label slot="label" <label slot="label"
>+&nbsp;&nbsp;&nbsp;&nbsp;网络安全管理&nbsp;&nbsp;&nbsp;&nbsp;×</label >+&nbsp;&nbsp;&nbsp;&nbsp;网络安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
> >
<el-input v-model="form.rate_six"></el-input> <el-input v-model="form.rate_six"></el-input>
</el-form-item> </el-form-item>
@ -125,9 +125,9 @@
> >
<el-input v-model="form.rate_eight"></el-input> <el-input v-model="form.rate_eight"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="+ 列管物品 ×" prop="rate_nine"> <el-form-item label="+ 列管物品安全 ×" prop="rate_nine">
<label slot="label" <label slot="label"
>+&nbsp;&nbsp;&nbsp;&nbsp;列管物品&nbsp;&nbsp;&nbsp;&nbsp;×</label >+&nbsp;&nbsp;&nbsp;&nbsp;列管物品安全&nbsp;&nbsp;&nbsp;&nbsp;×</label
> >
<el-input v-model="form.rate_nine"></el-input> <el-input v-model="form.rate_nine"></el-input>
</el-form-item> </el-form-item>

Write Preview
Loading…
Cancel
Save