FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yanyizhou
2021-09-01 16:05:12 +08:00
parent ab4bc4f3a5 e28621a77d
commit 1df56128e8
4 changed files with 638 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standardWarning.vue
+18 -7
View File
@@ -113,7 +113,8 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警</el-button> @click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -183,7 +184,8 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警</el-button> @click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -255,7 +257,8 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警</el-button> @click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -327,7 +330,8 @@
<el-button <el-button
size="mini" size="mini"
type="danger" type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警</el-button> @click="cancelWarning(scope.$index, scope.row)">取消预警
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -544,7 +548,9 @@ export default {
break break
} }
} }
for (const loading in this.loading) { this.loading[loading] = false } for (const loading in this.loading) {
this.loading[loading] = false
}
}, e => { }, e => {
}); });
}, },
@@ -580,7 +586,9 @@ export default {
break break
} }
} }
for(const loading in this.loading) {this.loading[loading] = false} for (const loading in this.loading) {
this.loading[loading] = false
}
}, e => { }, e => {
}); });
}, },
@@ -800,7 +808,9 @@ export default {
// this.queryNewTypeByPage(); // this.queryNewTypeByPage();
// this.queryProductionVehicleByPage(); // this.queryProductionVehicleByPage();
// 四个预警同时查询,loading全部打开 // 四个预警同时查询,loading全部打开
for (const loading in this.loading) { this.loading[loading] = true } for (const loading in this.loading) {
this.loading[loading] = true
}
this.getEarlyDate(); this.getEarlyDate();
} }
@@ -963,6 +973,7 @@ export default {
/deep/ .el-input__inner { /deep/ .el-input__inner {
width: 155px; width: 155px;
} }
.choose-time-area { .choose-time-area {
/deep/ .el-input__inner { /deep/ .el-input__inner {
width: 220px; width: 220px;
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+5
View File
@@ -311,10 +311,15 @@ export default {
if (item.responUserList !== undefined) { if (item.responUserList !== undefined) {
let listJSON = JSON.parse(JSON.stringify(item.responUserList)) let listJSON = JSON.parse(JSON.stringify(item.responUserList))
this.dataList = [listJSON][0].standardInfoList this.dataList = [listJSON][0].standardInfoList
} else {
if (item.dockUserList !== undefined) {
let listJSON = JSON.parse(JSON.stringify(item.dockUserList))
this.dataList = listJSON[0].standardInfoList
}else { }else {
let listJSONInfo = item.info let listJSONInfo = item.info
this.dataList = [listJSONInfo] this.dataList = [listJSONInfo]
} }
}
this.dataList.forEach(item => { this.dataList.forEach(item => {
if (item.fileText.length !== 0) { if (item.fileText.length !== 0) {
this.fileTextList = item.fileText this.fileTextList = item.fileText
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+2 -2
View File
@@ -398,7 +398,7 @@ export default {
// 相关人员姓名 // 相关人员姓名
}, },
// 新增编辑弹窗里的数据 // 新增编辑弹窗里的数据
localProEODefault: { /* localProEODefault: {
// 项目相关人员 // 项目相关人员
userEOList: [], userEOList: [],
// 产品代码 // 产品代码
@@ -460,7 +460,7 @@ export default {
// 相关人员信息 // 相关人员信息
relatePersonShow: "" relatePersonShow: ""
// 相关人员姓名 // 相关人员姓名
}, },*/
//查询3类 //查询3类
projectLibrarySearch: { projectLibrarySearch: {
// 项目名称 // 项目名称
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+25 -13
View File
@@ -14,10 +14,16 @@
<el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col> <el-col :span="5" :push="1">项目编号: <span class="valueColor">{{ localProEO.projectNumber }}</span></el-col>
<el-col :span="5" :push="2"> <el-col :span="5" :push="2">
<el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top"> <el-tooltip class="item" effect="dark" :content="localProEO.projectName" placement="top">
<div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">{{ localProEO.projectName }}</div> <div slot="content" class="toolip-content" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">
{{ localProEO.projectName }}
</div>
<div v-else></div> <div v-else></div>
<div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">项目名称: <span class="valueColor">{{localProEO.projectName && localProEO.projectName.substring(0,15)+"..." }}</span></div> <div class="check-item-value" v-if="localProEO.projectName !== undefined && localProEO.projectName.length>15">
<div class="check-item-value" v-else>项目名称: <span class="valueColor">{{localProEO.projectName}}</span></div> 项目名称: <span class="valueColor">{{
localProEO.projectName && localProEO.projectName.substring(0, 15) + "..."
}}</span></div>
<div class="check-item-value" v-else>项目名称: <span class="valueColor">{{ localProEO.projectName }}</span>
</div>
</el-tooltip> </el-tooltip>
</el-col> </el-col>
<el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span> <el-col :span="4" :push="3">项目分类:<span class="valueColor">{{ localProEO.projectClassification }}</span>
@@ -39,19 +45,23 @@
</div> </div>
</el-card> </el-card>
<div class="action-bar"> <div class="action-bar">
<!-- <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="transfer">调取</el-button>--> <el-row>
<!-- <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除--> <el-col :span="12">
<!-- </el-button>--> <span style="font-size: 16px;font-weight: bold">清单版本: {{ }}</span>
<el-button class="common-button-default export-button" </el-col>
<el-col :span="12" style="text-align: end">
<el-button
type="primary"
class="common-button-default export-button"
size="mini" @click="exportStandard" size="mini" @click="exportStandard"
v-btn-permission="''" v-btn-permission="''"
title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项" title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
icon="export" icon="export"
>导出 >导出
</el-button> </el-button>
</el-col>
</el-row>
</div> </div>
<!-- <el-tabs type="border-card">-->
<!-- <el-tab-pane :label="localProEO.productName" class="details-panel-tabs-item">-->
<div class="table-wrapper"> <div class="table-wrapper">
<el-table <el-table
:data="dataList" :data="dataList"
@@ -172,8 +182,6 @@
@pageSizeChange="pageSizeChangeLaws"></pagination> @pageSizeChange="pageSizeChangeLaws"></pagination>
</div> </div>
<loading :loading="loading">数据获取中</loading> <loading :loading="loading">数据获取中</loading>
<!-- </el-tab-pane>-->
<!-- </el-tabs>-->
</div> </div>
<!-- 调取弹窗 --> <!-- 调取弹窗 -->
<el-drawer <el-drawer
@@ -265,7 +273,8 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
scope.row.detailedListVision
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -274,7 +283,10 @@
label="更新时间" label="更新时间"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime }}</div> <div>{{
scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime
}}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column