diff --git a/src/utils/request.js b/src/utils/request.js
index fc5caac..d1c0520 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -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' },
})
diff --git a/src/views/closeLoopDispose/components/backlog.vue b/src/views/closeLoopDispose/components/backlog.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/closeLoopDispose/components/myCourse.vue b/src/views/closeLoopDispose/components/myCourse.vue
index 283ccce..deeb2dd 100644
--- a/src/views/closeLoopDispose/components/myCourse.vue
+++ b/src/views/closeLoopDispose/components/myCourse.vue
@@ -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;
+ }
}
\ No newline at end of file
diff --git a/src/views/closeLoopDispose/index.vue b/src/views/closeLoopDispose/index.vue
index 0930e0f..d23dddd 100644
--- a/src/views/closeLoopDispose/index.vue
+++ b/src/views/closeLoopDispose/index.vue
@@ -12,7 +12,7 @@
处置详情
-
+
diff --git a/src/views/systemManagement/companyScore/components/companyTable.vue b/src/views/systemManagement/companyScore/components/companyTable.vue
index a5f0922..8d84df0 100644
--- a/src/views/systemManagement/companyScore/components/companyTable.vue
+++ b/src/views/systemManagement/companyScore/components/companyTable.vue
@@ -3,12 +3,12 @@
-
+
@@ -33,25 +33,25 @@
@@ -27,7 +27,7 @@
- 编辑
@@ -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;
+ }
}
\ No newline at end of file
diff --git a/src/views/systemManagement/safeIndex/components/indexmassageTwo.vue b/src/views/systemManagement/safeIndex/components/indexmassageTwo.vue
index c51954e..55a0a96 100644
--- a/src/views/systemManagement/safeIndex/components/indexmassageTwo.vue
+++ b/src/views/systemManagement/safeIndex/components/indexmassageTwo.vue
@@ -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);
diff --git a/src/views/systemManagement/safeIndex/index.vue b/src/views/systemManagement/safeIndex/index.vue
index cbe9fd0..5eb0d29 100644
--- a/src/views/systemManagement/safeIndex/index.vue
+++ b/src/views/systemManagement/safeIndex/index.vue
@@ -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);