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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
Superman_Main
2021-11-24 12:06:40 +08:00
parent faf1438540 53ce91037b
commit eee8a2e8e5
8 changed files with 118 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navMenu/index.vue
+1 -1
View File
@@ -706,7 +706,7 @@
}
.el-menu-item {
padding-left: 29px !important;
font-size: 15px;
font-size: 14px;
font-weight: normal;
height: 40px;
line-height: 40px;
src/pages/home2/index.vue
+1 -1
View File
@@ -186,7 +186,7 @@ export default {
padding: 0;
}
.footer {
height: 90px;
height: 70px;
line-height: 33px;
//margin-top: 0.3vh;
//line-height: 5.2vh;
src/pages/localTool/standContrast/index.vue
+8
View File
@@ -92,6 +92,14 @@
label="比对类型"
align="center">
</el-table-column>
<el-table-column
prop="compareStatus"
label="比对状态"
align="center">
<!-- <template slot-scope="scope">-->
<!-- -->
<!-- </template>-->
</el-table-column>
<el-table-column
prop="createTime"
label="比对时间"
src/pages/localTool/standContrast/pages/contrastDetails.vue
+22 -9
View File
@@ -362,15 +362,28 @@ export default {
type: 'warning'
})
}
this.$router.push({
name: 'TextComparison',
query: {
infoIdLeft: this.selectedSplitStandList[0].id,
infoIdRight: this.selectedSplitStandList2[0].id,
rowDataLeft: JSON.stringify(this.selectedSplitStandList[0]),
rowDataRight: JSON.stringify(this.selectedSplitStandList2[0])
}
})
return new Promise((resolve, reject) => {
this.spinShow = true
this.$http.post('lawss/sarStandCompareHis/fullTextComparison', {
leftStandard:this.selectedSplitStandList[0].id,
rightStandard: this.selectedSplitStandList2[0].id,
}, {
_this: this
}, res => {
this.spinShow = false
this.$message.warning(res.data)
}, e => {
})
})
// this.$router.push({
// name: 'TextComparison',
// query: {
// infoIdLeft: this.selectedSplitStandList[0].id,
// infoIdRight: this.selectedSplitStandList2[0].id,
// rowDataLeft: JSON.stringify(this.selectedSplitStandList[0]),
// rowDataRight: JSON.stringify(this.selectedSplitStandList2[0])
// }
// })
},
addFileStandPageChange (page) {
this.addFilePage = page
src/pages/localTool/standWarning.vue
-118
View File
@@ -1,118 +0,0 @@
<template>
<div class="stand-warning">
<div class="header-area" style="background-color: white">
<h3>实施预警</h3>
</div>
<div class="search-area">
<el-form :inline="true" :model="searchForm" class="demo-form-inline">
<el-form-item label="标准编号">
<el-input clearable size="mini"
v-model="searchForm.standCode"
placeholder="根据标准编号查找">
</el-input>
</el-form-item>
<el-form-item label="标准名称">
<el-input clearable size="mini"
v-model="searchForm.standName"
placeholder="根据标准名称查找">
</el-input>
</el-form-item>
<el-form-item label="适用车型">
<el-input clearable size="mini"
v-model="searchForm.applyType"
placeholder="根据适用车型查找">
</el-input>
</el-form-item>
<el-form-item label="发布日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
size="mini"
clearable
v-model="searchForm.putTime"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="实施日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
size="mini"
clearable
v-model="searchForm.putTime"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="新车型实施日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
size="mini"
clearable
v-model="searchForm.putTime"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item><el-form-item label="在产车实施日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
size="mini"
clearable
v-model="searchForm.putTime"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-button
type="primary"
size="mini"
@click="searchBtnClick"
class="common-button-primary">
查询
</el-button>
<el-button
size="mini"
@click="clearBtnClick"
class="common-button-primary">
清空
</el-button>
</el-form>
</div>
<div class="data-area">
</div>
</div>
</template>
<script>
export default {
name: "standardWarning",
data() {
return {
// 头部搜索框
searchForm: {
//标准编号
standCode: "",
//标准名称
standName: "",
//实施日期
putTime: "",
//适用车型
applyType: "",
},
}
}
}
</script>
<style scoped>
</style>
src/pages/localTool/standardWarning.vue
+51 -27
View File
@@ -8,9 +8,9 @@
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
<!-- <el-tab-pane label="标准预警" name="STANDARD">-->
<div class="dynamic-content">
<div>
<h5 style="font-size: 20px">实施预警</h5>
</div>
<!-- <div>-->
<!-- <h5 style="font-size: 20px">实施预警</h5>-->
<!-- </div>-->
<div class="more">
<el-form :inline="true" :model="dynamic" class="demo-form-inline">
<el-row :gutter="24">
@@ -27,12 +27,21 @@
placeholder="根据标准名称查找">
</el-input>
</el-form-item>
<el-form-item label="适用车型">
<el-input clearable size="mini"
v-model="dynamic.applyType"
placeholder="根据适用车型查找">
</el-input>
<!-- 适用车型-->
<el-form-item :label="$t('m.applicableModels')" class="add-form-item form-item-disabled">
<el-select v-model="dynamic.applyType" size="mini"
:placeholder="$t('m.searchAccordingToThApplicableModel')" clearable>
<el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value"
:key="opt.value" :label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="适用车型">-->
<!-- <el-input clearable size="mini"-->
<!-- v-model="dynamic.applyType"-->
<!-- placeholder="根据适用车型查找">-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<el-form-item label="发布日期" style="margin-right: 10px" class="choose-time-area">
<el-date-picker
size="mini"
@@ -104,11 +113,12 @@
</el-row>
</el-form>
</div>
<div class="content" style="height: 100%; padding-top: 100px; ">
<el-divider content-position="left" class="dynamic-child-title">实施日期预警</el-divider>
<div class="content">
<!-- <el-divider content-position="left" class="dynamic-child-title">实施日期预警</el-divider>-->
<el-table
:data="newItems"
height="260px"
style="overflow-y: auto;"
:height="warningTableHeight"
border
:resizable="false"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
@@ -360,6 +370,8 @@ export default {
name: "standardWarning",
data() {
return {
warningTableHeight: '',
applyArcticOptions: [], // 适用车型下拉框
isShowBtn: true,
activeName: "STANDARD", //tab 默认选中值
// 头部搜索框
@@ -754,15 +766,21 @@ export default {
},
watch: {},
mounted() {
// this.height = $(".content").height() * 0.4;
// window.onresize = () => {
// this.height = $(".content").height() * 0.4;
// };
this.warningTableHeight = $(window).height()*0.54
window.onresize = () => {
this.warningTableHeight = $(window).height()*0.54;
};
// alert(this.warningTableHeight)
this.height = $(".content").height();
window.onresize = () => {
this.height = $(".content").height();
};
//从数据库中查询下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
_this: this
}, res => {
this.energyKindOptions = res.data.ENERGYTYPES; // 文本状态
this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
this.zrgcs = res.data.ZRGCSCLASS;
this.loading[this.field] = true
this.$http.get('sys/EarlyWarning/StandWarning', {
@@ -1015,8 +1033,11 @@ export default {
}
.more {
margin-top: 30px;
display: flex;
align-items: center;
justify-content: center;
/deep/ .el-input__inner {
width: 185px;
}
@@ -1027,13 +1048,13 @@ export default {
}
}
cursor: pointer;
//cursor: pointer;
color: #12508e;
position: absolute;
//position: absolute;
top: 0;
right: 0;
z-index: 100;
padding: 5px 10px;
//padding: 5px 10px;
// &:hover {
// color: #fff;
// background: #12508e;
@@ -1041,6 +1062,17 @@ export default {
// }
}
.content {
padding-bottom: 10px;
height: calc(~'100% - 40px');
/deep/ .el-button--mini {
padding: 5px 7px;
font-size: 8px;
}
}
.dynamic-loop-container {
position: relative;
min-height: 160px;
@@ -1120,15 +1152,7 @@ export default {
}
}
.content {
padding-bottom: 10px;
height: calc(~'100% - 40px');
/deep/ .el-button--mini {
padding: 5px 7px;
font-size: 8px;
}
}
}
::v-deep {
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+13 -23
View File
@@ -1629,19 +1629,6 @@ export default {
}
})
},
getTaskId () {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.taskIds=mes.taskIds
//表单文件处理
this.getFormFieldList(mes.form)
})
},
choiceZRR1 (type, title, id) {
this.drawerTitle = title
this.modalShowFlag1 = true
@@ -2215,7 +2202,12 @@ export default {
if (res) {
const processForm = JSON.parse(res.mesg)
this.commentText = processForm.commentText
this.getFormFieldList(processForm)
if (processForm.form === undefined) {
this.getFormFieldList(processForm)
} else {
//表单文件处理
this.getFormFieldList(processForm.form)
}
}
}).catch(e => {
console.log("错误")
@@ -2238,7 +2230,6 @@ export default {
this.form.prcName = this.prcName
this.form['id'] = item.id
console.log("this.form",this.form);
// 遍历对象
for(const p in this.form) {
@@ -2328,22 +2319,22 @@ export default {
this.form.country=this.countryArr;
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('id', this.bpnId)
// _formData.append('createUser', this.$store.getters.userInfo.userId)
// _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', '1')
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText,
taskInfo: '申请人修订',
taskIds:this.taskIds
// taskInfo: '申请人修订',
// taskIds:this.taskIds
}))
saveTaskFirst(_formData).then(res => {
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// this.bpnId = res.result
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
@@ -2442,7 +2433,6 @@ export default {
this.getData()
},
mounted () {
this.getTaskId()
this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+22 -3
View File
@@ -1766,6 +1766,7 @@
:visible.sync="OCRModel"
size="900px"
custom-class="demo-drawer"
:before-close="OCRclose"
>
<div class="OCRstandardForComments">
<div class="content" style="height: calc(100% - 57px);">
@@ -1790,6 +1791,14 @@
label="文件名"
align="center">
</el-table-column>
<el-table-column
prop="standFileClassify"
label="文本状态"
align="center">
<template slot-scope="scope">
<div>{{setWBType(scope.row.standFileClassify)}}</div>
</template>
</el-table-column>
</el-table>
</div>
</div>
@@ -2553,10 +2562,20 @@
}
},
methods: {
setWBType (type) {
let text = ''
for (let a = 0; a < this.OCRoptions.length; a++) {
if (this.OCRoptions[a].attrField === type) {
text = this.OCRoptions[a].attrName
}
}
return text
},
selectOCRChange (val) {
this.OCRDatas = val
},
OCRclose () {
this.OCRData = []
this.OCRModel = false
},
OCRsubmit () {
@@ -2622,21 +2641,20 @@
this.$message.warning('请选择一条数据进行' + text)
} else {
this.OCRModel = true
this.OCRLoading = false
this.OCRLoading = true
this.$http.get('lawss/sarStandFile/queryFileInfoNew', {
type: type,
standId: this.selectedList[0]
},{
_this: this
}, res => {
this.OCRLoading = false
if (res.ok) {
if (res.data.length > 0) {
this.OCRData = res.data
this.OCRLoading = false
} else {
this.$message.warning('当前标准没有' + text + '文件')
this.this.OCRData = []
this.OCRLoading = false
}
}
})
@@ -5302,6 +5320,7 @@
_this: this
}, res => {
this.OCRoptions = res.data
console.log(res.data);
})
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this