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

Merge pull request 'lukeyan' (#81) from lukeyan into master

Browse Source 
Reviewed-on: #81
pull/84/head^2
lukeyan 1 year ago
parent bd60367823 337910e683
commit e45d96fee1
10 changed files with 100 additions and 69 deletions
Show Stats Download Patch File Download Diff File

4
src/utils/request.js
Unescape View File

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

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

74
src/views/closeLoopDispose/components/myCourse.vue
Unescape View File

@ -104,10 +104,10 @@ export default {
word: "",
},
course_list: [
{ label: "进行中", value: "1" },
{ label: "审核通过", value: "2" },
{ label: "待审核", value: "1" },
{ label: "通过", value: "2" },
{ label: "驳回", value: "3" },
// { label: "处置中", value: "4" },
{ label: "处置中", value: "4" },
],
pickerOptions: {
shortcuts: [
@ -157,20 +157,28 @@ export default {
},
// 查询
search_data() {
console.log("this.search.course_time", this.search.course_time);
let param = {
pageSize: this.pageSize,
page: this.pageNum,
// isAsc: "desc",
// orderByColumn: "id",
startTime: this.dateConversion(this.search.course_time[0]),
endTime: this.dateConversion(this.search.course_time[1]),
startTime:
this.search.course_time == null
? ""
: this.dateConversion(this.search.course_time[0]),
endTime:
this.search.course_time == null
? ""
: this.dateConversion(this.search.course_time[1]),
searchKey: this.search.word,
procStatus: this.search.procStatus,
};
get_my_course(param).then((res) => {
console.log("get_data", res);
this.table_data = res.rows;
this.total = res.total;
// this.total = res.total;
this.total = 100;
});
},
// 重置查询
@ -184,7 +192,7 @@ export default {
// 详情点击跳转
check_details(val) {
console.log(val);
this.$emit("change_to_detail" ,val); // 通知跳转
this.$emit("change_to_detail", val); // 通知跳转
},
// 转换时间格式
dateConversion(value) {
@ -373,21 +381,21 @@ export default {
.btn {
margin-left: 8px;
margin-right: 2px;
}
.el-button {
width: 70px;
height: 4.1vh;
border: 1px solid #4a6072;
color: #fff;
border-radius: 0px !important;
background: #323f43;
}
.el-button:focus,
.el-button:hover {
color: #34e1b3;
border: 2px solid #137868;
background: url("~@/assets/companyFile/2121.png") no-repeat !important;
background-size: 100% 100% !important;
.el-button {
width: 70px;
height: 3.7vh !important;
border: 1px solid #4a6072;
color: #fff;
border-radius: 0px !important;
background: #323f43;
}
.el-button:focus,
.el-button:hover {
color: #34e1b3;
border: 2px solid #137868;
background: url("~@/assets/companyFile/2121.png") no-repeat !important;
background-size: 100% 100% !important;
}
}
}
.search_table {
@ -399,14 +407,16 @@ export default {
.table_pagination {
width: 96vw;
height: 5vh;
display: flex;
flex-direction: row-reverse;
/deep/.el-input--suffix .el-input__inner {
color: #fff;
border: 0.1px solid #277f79;
border-radius: 0px;
background: rgba(0, 0, 0, 0);
width: 5vw;
// height: 2.6vh;
// line-height: 2.6vh;
height: 2.6vh;
line-height: 2.6vh;
}
/deep/.el-input__icon {
color: #fff;
@ -414,42 +424,44 @@ export default {
height: 2.6vh;
}
/deep/.el-pagination {
margin-left: 65%;
margin-top: 2vh;
margin-top: 1vh;
.el-pagination__total {
color: #fff;
}
.el-input__inner {
border-radius: 0px;
border: 0.1px solid #277f79;
border: 0.1px solid #28847e;
background: #3c4b4a;
color: #fff;
}
.btn-prev {
border-radius: 0px;
border: 0.1px solid #277f79;
border: 0.1px solid #28847e;
background: #3c4b4a;
color: #fff;
}
ul {
li {
border: 0.1px solid #277f79;
border: 0.1px solid #28847e;
background: #3c4b4a;
color: #fff;
}
}
.btn-next {
border: 0.1px solid #277f79;
border: 0.1px solid #28847e;
border-radius: 0px;
background: #3c4b4a;
color: #fff;
}
.el-pager {
li {
border: 0.1px solid #34a6a6;
border: 0.1px solid #28847e;
background: #3c4b4a !important;
}
}
}
/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
border: 2px solid #76eae4;
}
}
</style>

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

@ -12,7 +12,7 @@
<el-breadcrumb-item v-if="is_flag === '1'">处置详情</el-breadcrumb-item>
</el-breadcrumb>
</div>
<el-tabs v-if="is_flag === '0'" v-model="activeName">
<el-tabs v-show="is_flag === '0'" v-model="activeName">
<el-tab-pane label="我的流程" name="first">
<MyCourse
ref="myCourse"
@ -26,7 +26,7 @@
<MyCourseDetail
:send_detail="send_detail"
ref="myCourseDetail"
v-else-if="is_flag === '1'"
v-show="is_flag === '1'"
></MyCourseDetail>
</el-card>
</template>

14
src/views/systemManagement/companyScore/components/companyTable.vue
Unescape View File

@ -3,12 +3,12 @@
<el-table
:data="table_data"
class="company_table"
height="660"
height="650"
:stripe="stripe"
:header-cell-style="table_header"
:cell-style="{ background: 'revert', 'text-align': 'center' }"
>
<el-table-column prop="companyName" label="企业名称" width="280">
<el-table-column prop="companyName" label="企业名称" width="270">
</el-table-column>
<el-table-column prop="score" label="平安指数"> </el-table-column>
<el-table-column label="指标得分">
@ -33,25 +33,25 @@
<el-table-column
prop="tbSafeCompanyStatisticsScoreDetails[3].score"
label="消防安全"
width="130"
width="120"
>
</el-table-column>
<el-table-column
prop="tbSafeCompanyStatisticsScoreDetails[4].score"
label="人员安全"
width="130"
width="120"
>
</el-table-column>
<el-table-column
prop="tbSafeCompanyStatisticsScoreDetails[5].score"
label="网络安全"
width="130"
width="120"
>
</el-table-column>
<el-table-column
prop="tbSafeCompanyStatisticsScoreDetails[6].score"
label="道路安全"
width="130"
width="120"
>
</el-table-column>
<el-table-column
@ -169,14 +169,12 @@ export default {
border: 0.1px solid #3f5564;
}
/deep/.el-table__body-wrapper::-webkit-scrollbar {
display: none;
width: 6px;
background-color: #5e666a;
border-radius: 4px;
}
/deep/.el-table__body-wrapper::-webkit-scrollbar-thumb {
display: none;
width: 5px;
background-color: #3c4b4a;
border-radius: 4px;

25
src/views/systemManagement/companyScore/components/detailsTable.vue
Unescape View File

@ -14,7 +14,7 @@
<el-table
:data="detail_table_data"
class="company_table"
height="320"
height="300"
:header-cell-style="table_header"
:cell-style="{ background: 'revert', 'text-align': 'center' }"
>
@ -27,7 +27,7 @@
</el-table-column>
<el-table-column prop="operation" label="操作">
<template slot-scope="scope">
<el-button size="small" class="operation" @click="open(scope.row)"
<el-button size="small" class="operation" @click="open(scope.row)"
>编辑
</el-button>
<el-button size="small" class="operation" @click="open_delete(scope.row)"
@ -111,6 +111,7 @@ export default {
pageSize: 10,
pageNum: 1,
total: 0,
dateTime:'', // 记录时间 根据时间条件控制是否可编辑
};
},
async created() {
@ -191,6 +192,17 @@ export default {
this.total = res.total;
});
},
// 获取当前时间
get_today() {
let date = new Date();
let y = date.getFullYear();
let m = date.getMonth() + 1;
m = m < 10 ? "0" + m : m;
let d = date.getDate();
d = d < 10 ? "0" + d : d;
this.dateTime =
y + "-" + m + "-" + d;
},
// 添加人数
add_detail() {
let param = {
@ -215,8 +227,13 @@ export default {
this.person_input = '' // input框刷新
},
open(val) {
console.log('valll',val);
this.$refs.detailsTableDialog.open(val)
this.get_today()
let now_time = val.updateTime.slice(0,10)
if ( this.dateTime === now_time) {
this.$refs.detailsTableDialog.open(val)
} else {
this.$message.warning('只可编辑当天数据')
}
},
open_delete(val) {
console.log('valll2',val);

3
src/views/systemManagement/companyScore/components/detailsTableDialog.vue
Unescape View File

@ -35,13 +35,14 @@ export default {
methods: {
open(val) {
this.visible = true;
console.log("val", val);
console.log("val12_111", val);
this.input_title = val.levelIndexThree;
this.input_num = val.numValue;
this.param = {
companyId: val.companyId,
safeRuleId: val.safeRuleId,
numValue: val.numValue,
id:val.id,
levelIndexThree: val.levelIndexThree
}
},

35
src/views/systemManagement/companyScore/index.vue
Unescape View File

@ -51,6 +51,7 @@
class="search_right_input"
placeholder="输入企业名称"
v-model="search_company"
clearable
>
</el-input>
<el-button @click="search" icon="el-icon-search"></el-button>
@ -68,7 +69,6 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:page-sizes="[5, 10]"
:pager-count="5"
:page-size="pageSize"
:current-page="pageNum"
layout="total, sizes, prev, pager, next, jumper"
@ -114,8 +114,8 @@ export default {
label: "年度",
},
],
jump_params:{}, // 跳转时携带入参
show_value:'',
jump_params: {}, // 跳转时携带入参
show_value: "",
table_data: [],
pageSize: 10,
pageNum: 1,
@ -148,7 +148,7 @@ export default {
} else if (val === "season") {
this.search_date = "2";
// date_select选中season的时候就会触发get_season_param
console.log('this.statistics_date_2',this.statistics_date);
console.log("this.statistics_date_2", this.statistics_date);
} else if (val === "year") {
this.search_date = "3";
this.statistics_date = this.year_date = `${year}`;
@ -160,19 +160,19 @@ export default {
console.log("month", val);
this.statistics_date = val; // 查询statisticsDate赋值
},
getValue(val,value) {
getValue(val, value) {
// 日历季度选择
console.log("val123", val);
console.log("val123", value);
this.statistics_date = val.date; // 查询statisticsDate赋值
this.show_value = value
this.show_value = value;
},
// date_select选中season的时候就会触发
get_season_param(param,val) {
console.log('param_sss',param);
console.log('val_Sss',val);
get_season_param(param, val) {
console.log("param_sss", param);
console.log("val_Sss", val);
this.statistics_date = param;
this.show_value = val
this.show_value = val;
},
year_change(val) {
// 日历年度选择
@ -199,7 +199,7 @@ export default {
showValue: this.show_value,
scoreType: this.date_state,
statisticsDate: this.statistics_date,
}
};
getSafeCompany(params)
.then((res) => {
this.table_data = res.rows;
@ -332,35 +332,38 @@ export default {
}
.el-input__inner {
border-radius: 0px;
border: 0.1px solid #277f79;
border: 0.1px solid #28847e;
background: #3c4b4a;
color: #fff;
}
.btn-prev {
border-radius: 0px;
border: 0.1px solid #277f79;
border: 0.1px solid #28847e;
background: #3c4b4a;
color: #fff;
}
ul {
li {
border: 0.1px solid #277f79;
border: 0.1px solid #28847e;
background: #3c4b4a;
color: #fff;
}
}
.btn-next {
border: 0.1px solid #277f79;
border: 0.1px solid #28847e;
border-radius: 0px;
background: #3c4b4a;
color: #fff;
}
.el-pager {
li {
border: 0.1px solid #34a6a6;
border: 0.1px solid #28847e;
background: #3c4b4a !important;
}
}
}
/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
border: 2px solid #76eae4;
}
}
</style>

6
src/views/systemManagement/safeIndex/components/indexmassageTwo.vue
Unescape View File

@ -201,7 +201,7 @@ export default {
/deep/.text_levelform.el-form {
width: 32.5vw;
margin-top: 2vh;
height: 14vh;
// height: 14vh;
display: flex;
flex-wrap: wrap;
.el-form-item {
@ -213,7 +213,7 @@ export default {
}
}
/deep/.el-input__inner {
width: 3vw;
width: 4vw;
border-radius: 0px;
font-size: 16px;
background: #3c4b4a;
@ -224,7 +224,7 @@ export default {
.el-form-item__content {
.el-input {
.el-input__inner {
width: 3vw;
width: 4vw;
border: 0px;
border-radius: 0px;
background: rgba(165, 42, 42, 0);

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

@ -368,7 +368,7 @@ export default {
}
}
/deep/.el-input__inner {
width: 3.5vw;
width: 4vw;
border-radius: 0px;
font-size: 16px;
background: #3c4b4a;
@ -379,7 +379,7 @@ export default {
.el-form-item__content {
.el-input {
.el-input__inner {
width: 3.5vw;
width: 4vw;
border: 0px;
border-radius: 0px;
background: rgba(165, 42, 42, 0);

Write Preview
Loading…
Cancel
Save