Skip to content

Administrator / project_progress

Go to a project
Commit 7119d3e6 by liangzhen
Options

问题修复

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