Commit 7119d3e6 by liangzhen

问题修复

1 parent f7e4e08b
......@@ -138,6 +138,26 @@ export const routes = [
},
},
{
path: '/mainLayout/Compliance',
name: 'Compliance',
component: () => import('@/views/assessChecks/checkCompliance.vue'),
},
{
path: '/mainLayout/Compliancefz',
name: 'Compliancefz',
component: () => import('@/views/assessChecks/checkComplianceFZ.vue'),
},
{
path: '/mainLayout/Compliancexf',
name: 'Compliancexf',
component: () => import('@/views/assessChecks/checkComplianceXF.vue'),
},
// {
// path: '/mainLayout/Compliancefz',
// name: 'Compliancefz',
// component: () => import('@/views/mainLayout/checkComplianceFZ.vue'),
// },
{
path: '/compliance/checkRules',
name: 'checkRules',
component: () => import('@/views/compliance/checkRules.vue'),
......
......@@ -5,6 +5,9 @@ const state = {
const mutations = {
ADD_VISITED_VIEW: (state, view) => {
if(!view.meta.title){
return
}
if (state.visitedViews.some(v => v.path === view.path)) return
state.visitedViews.push(
Object.assign({}, view, {
......
......@@ -640,7 +640,7 @@ export default {
}
.el-form {
display: flex;
width: 100%;
width: 99%;
flex-wrap: wrap;
border-top: 2px solid #23c6c8;
border-left: 1px solid #dee5e7;
......
......@@ -786,7 +786,7 @@ export default {
}
.el-form {
display: flex;
width: 100%;
width:99%;
flex-wrap: wrap;
border-top: 2px solid #23c6c8;
border-left: 1px solid #dee5e7;
......
......@@ -166,10 +166,18 @@
prop="planReviewDate"
class="fromItem"
>
<el-input
v-model="ruleFormdialogBJ.planReviewDate"
<el-date-picker
disabled
></el-input>
v-model="ruleFormdialogBJ.planReviewDate"
type="datetime"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="{
disabledDate: (time) =>
time.getTime() < new Date(new Date().setHours(0, 0, 0, 0)),
}"
>
</el-date-picker>
</el-form-item>
<el-form-item label="工作组织情况:" class="textarea">
<el-input
......@@ -900,6 +908,7 @@ export default {
async add() {
this.dialogAdd = true;
this.addtableData = []; //每次新增清空不然点了还是这几个人
this.ruleFormdialogAdd={}
},
//详情
async detailsForm() {
......@@ -907,7 +916,6 @@ export default {
this.$message("请选择");
return;
}
console.log("222", this.checkedList);
this.dialogXQ = true;
this.checkedList[0].planReviewDate=new Date(this.checkedList[0].planReviewDate)
this.ruleFormdialogBJ = this.checkedList[0];
......
......@@ -84,7 +84,7 @@
><el-button
@click="adopt(item, index, itemfz)"
type="primary"
v-if="itemfz.type != '1'"
v-if="itemfz.type != '1'&&!item.checked"
>采纳</el-button
>
<el-button type="info" v-else>采纳</el-button>
......@@ -800,6 +800,15 @@ export default {
margin-left: 10px;
vertical-align: top;
}
.el-button--info {
color: #ffffff;
// background-color: #0d867f;
// border-color: #0d867f;
height: 35px;
line-height: 0.6;
margin-left: 10px;
vertical-align: top;
}
.el-icon-circle-plus {
font-size: 45px;
vertical-align: middle;
......
......@@ -203,7 +203,7 @@
<el-form-item label="工作组织情况:" class="textarea">
<el-input
type="textarea"
v-model="ruleFormdialog.desc"
v-model="ruleFormdialog.description"
disabled
></el-input>
</el-form-item>
......@@ -288,7 +288,7 @@
<el-form-item label="工作组织情况:" class="textarea">
<el-input
type="textarea"
v-model="ruleFormdialog.desc"
v-model="ruleFormdialog.description"
disabled
></el-input>
</el-form-item>
......@@ -970,7 +970,7 @@ export default {
}
.el-form {
display: flex;
width: 100%;
width:98%;
flex-wrap: wrap;
border-top: 2px solid #23c6c8;
border-left: 1px solid #dee5e7;
......@@ -1176,7 +1176,8 @@ export default {
.setscrolldialog {
width: 100%;
height: 290px;
overflow: auto;
overflow-x: auto;
overflow-y: hidden;
box-sizing: border-box;
/deep/ .el-table {
width: 96% !important;
......@@ -1298,5 +1299,10 @@ h3 {
.noclick{
opacity: 0.5;
}
.xqtitle{
text-align: left;
font-size: 18px;
border-bottom: 1px solid gainsboro;
padding-bottom: 10px;
}
</style>
\ No newline at end of file
......@@ -13,7 +13,7 @@ module.exports = defineConfig({
hot: true,
proxy: {
'/arch-evaluation':{
target: `http://192.168.91.1:18101`, // pin
target: `http://192.168.69.1:18101`, // pin
changeOrigin: true,
pathRewrite:{
"^/arch-evaluation":"/"
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!