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:
396572590@qq.com
2022-06-21 14:04:58 +08:00
parent 9e72f30047 7e78df01e3
commit ea05a368c2
4 changed files with 84 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+36 -35
View File
@@ -74,7 +74,8 @@
<div slot="left"> <div slot="left">
<div class="search-area"> <div class="search-area">
<div class="left"> <div class="left">
<el-form :modal="standCommonlySearch" :inline="true" class="label-input-form"> <el-form :modal="standCommonlySearch" :inline="true" class="label-input-form"
@keyup.enter.native="searchBtnClick(standCommonlySearch)">
<!-- <el-form-item label="标准==类别" class="search-item" style="margin-top:1px;">--> <!-- <el-form-item label="标准==类别" class="search-item" style="margin-top:1px;">-->
<!-- <el-select v-model="standCommonlySearch.standSort" filterable>--> <!-- <el-select v-model="standCommonlySearch.standSort" filterable>-->
<!-- <el-option--> <!-- <el-option-->
@@ -115,10 +116,9 @@
v-btn-permission="'d38fea2d0d992615f9e1c4dfb6dc76f3'" v-btn-permission="'d38fea2d0d992615f9e1c4dfb6dc76f3'"
@click="clearAllSearch('standCommonlySearch')">清空 @click="clearAllSearch('standCommonlySearch')">清空
</el-button> </el-button>
<el-button size="mini" type="primary" class="common-button-default" <el-button size="mini" type="primary" class="common-button-primary"
v-btn-permission="'c9cb749aacefc52347f1250d0f98272a'" @click="selectMoreBtn"> v-btn-permission="'c9cb749aacefc52347f1250d0f98272a'" @click="selectMoreBtn"><i
<!-- <i class="iconfont">&#xe7a5;</i>--> class="iconfont">&#xe7a5;</i>高级检索
高级检索
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -346,28 +346,29 @@
label="收藏" align="center" width="50px" label="收藏" align="center" width="50px"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <div--> <div
<!-- v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681') == 1"--> v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681') == 1"
<!-- @command="handleCommand"--> @command="handleCommand"
<!-- >--> >
<!-- <el-button type="text" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"--> <el-button type="text" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
<!-- v-if="scope.row.collectBtn"--> v-if="scope.row.collectBtn"
<!-- @click="handleCommand([scope.row, '收藏'])"--> @click="handleCommand([scope.row, '收藏'])"
<!-- >收藏--> >收藏
<!-- </el-button>--> </el-button>
<!-- <el-button type="text" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"--> <el-button type="text" v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
<!-- v-else--> v-else
<!-- @click="handleCommand([scope.row, '取消收藏'])"--> @click="handleCommand([scope.row, '取消收藏'])"
<!-- >取消收藏--> >取消收藏
<!-- </el-button>--> </el-button>
<!-- <el-button type="text" @click="handleCommand([scope.row, '编辑'])"--> <el-button type="text" @click="handleCommand([scope.row, '编辑'])"
<!-- v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑--> v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑
<!-- </el-button>--> </el-button>
<!-- <el-button type="text" @click="handleCommand([scope.row, '删除']) "--> <el-button type="text" @click="handleCommand([scope.row, '删除']) "
<!-- v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除--> v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除
<!-- </el-button>--> </el-button>
<!-- </div>--> </div>
<div>
<div v-else>
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<!-- <i class="iconfont">&#xe61e;</i>--> <!-- <i class="iconfont">&#xe61e;</i>-->
<el-button title="收藏" class="collection-btn" icon="el-icon-star-off" <el-button title="收藏" class="collection-btn" icon="el-icon-star-off"
@@ -697,16 +698,16 @@
<template v-else-if="field.attrField === 'DYMCCAR'"> <template v-else-if="field.attrField === 'DYMCCAR'">
<el-form-item label="模块结构单元名称(乘用车)" title="模块结构单元名称(乘用车)" label-width="150px" prop="dymccar" class="add-form-item"> <el-form-item label="模块结构单元名称(乘用车)" title="模块结构单元名称(乘用车)" label-width="150px" prop="dymccar" class="add-form-item">
<el-input <el-input
v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined" v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
v-model="sarStandardsInfoEO.DYMCCAR = ''" v-model="sarStandardsInfoEO.DYMCCAR = ''"
disabled disabled
clearable clearable
></el-input> ></el-input>
<el-input <el-input
v-else v-else
v-model="sarStandardsInfoEO.DYMCCAR" v-model="sarStandardsInfoEO.DYMCCAR"
disabled disabled
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
</template> </template>
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+34 -34
View File
@@ -646,14 +646,14 @@
</el-select> </el-select>
</el-form-item>--> </el-form-item>-->
<!-- 体系类别--> <!-- 体系类别-->
<!-- <el-form-item label="体系类别" class="add-form-item form-item-disabled"> <!-- <el-form-item label="体系类别" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"> @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }} :label="opt.label">{{ opt.label }}
</el-option> </el-option>
</el-select> </el-select>
</el-form-item>--> </el-form-item>-->
<!-- 责任工程师--> <!-- 责任工程师-->
<template> <template>
<el-form-item <el-form-item
@@ -1080,9 +1080,9 @@
</template> </template>
<template v-else-if="field.attrField === 'DYBXH'"> <template v-else-if="field.attrField === 'DYBXH'">
<el-form-item <el-form-item
prop="DYBXH" prop="DYBXH"
label-width="150px" label-width="150px"
class="add-form-item" class="add-form-item"
> >
<template slot="label">模块结构单元变型号(卡车)</template> <template slot="label">模块结构单元变型号(卡车)</template>
<el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)" <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)"
@@ -1101,9 +1101,9 @@
</template> </template>
<template v-else-if="field.attrField === 'DYBXHCAR'"> <template v-else-if="field.attrField === 'DYBXHCAR'">
<el-form-item <el-form-item
prop="DYBXHCAR" prop="DYBXHCAR"
label-width="150px" label-width="150px"
class="add-form-item" class="add-form-item"
> >
<template slot="label">模块结构单元变型号(乘用车)</template> <template slot="label">模块结构单元变型号(乘用车)</template>
<el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)" <el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)"
@@ -1114,16 +1114,16 @@
<template v-else-if="field.attrField === 'DYMCCAR'"> <template v-else-if="field.attrField === 'DYMCCAR'">
<el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="DYMCCAR" class="add-form-item"> <el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="DYMCCAR" class="add-form-item">
<el-input <el-input
v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined" v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
v-model="sarStandardsInfoEO.DYMCCAR = ''" v-model="sarStandardsInfoEO.DYMCCAR = ''"
disabled disabled
clearable clearable
></el-input> ></el-input>
<el-input <el-input
v-else v-else
v-model="sarStandardsInfoEO.DYMCCAR" v-model="sarStandardsInfoEO.DYMCCAR"
disabled disabled
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
</template> </template>
@@ -1686,18 +1686,18 @@
@popoverHideCancel="popoverHideModelCancel()"> @popoverHideCancel="popoverHideModelCancel()">
</tree-select-module> </tree-select-module>
<tree-select-module <tree-select-module
width="500" width="500"
:lazy=true :lazy=true
:multiple=true :multiple=true
:check-strictly=true :check-strictly=true
:modalShowFlag="modalShowFlag5" :modalShowFlag="modalShowFlag5"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:url="url" :url="url"
:type="modelType" :type="modelType"
:urlChild="urlChild" :urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4" :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
:nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel" :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
@popoverHideCancel="popoverCarHideModelCancel()"> @popoverHideCancel="popoverCarHideModelCancel()">
</tree-select-module> </tree-select-module>
<!-- 导入失败 --> <!-- 导入失败 -->
<el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px"> <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
src/pages/regulatoryRepository/standQA/index.vue
+11 -15
View File
@@ -408,11 +408,11 @@
<a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C" <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber scope.row.standNumber
}}-{{ scope.row.standYear }}</a> }}{{ scope.row.standYear ? '-' + scope.row.standYear : '' }}</a>
<a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333" <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber scope.row.standNumber
}}-{{ scope.row.standYear }}</a> }}{{ scope.row.standYear ? '-' + scope.row.standYear : '' }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333"> <a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
{{ scope.row.standSortShow }} {{ scope.row.standSortShow }}
{{ scope.row.standNumber }}</a> {{ scope.row.standNumber }}</a>
@@ -486,19 +486,14 @@
width="150" width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{ <a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">
scope.row.standSortShow {{scope.row.standSortShow}} {{ scope.row.standNumber }}{{ scope.row.standYear ? '-' + scope.row.standYear : '' }}</a>
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> <a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{ {{ scope.row.standSortShow }} {{ scope.row.standNumber }}{{ scope.row.standYear ? '-' + scope.row.standYear : '' }}</a>
scope.row.standSortShow <a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> {{ scope.row.standSortShow }} {{ scope.row.standNumber }}{{ scope.row.standYear ? '-' + scope.row.standYear : '' }}</a>
<a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{ <a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">
scope.row.standSortShow {{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standSortShow
}}
{{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -1087,6 +1082,7 @@ export default {
this.$http.get('lawss/AskQuestions/getAskQuestionsNew',{ this.$http.get('lawss/AskQuestions/getAskQuestionsNew',{
standardId: this.activestand, standardId: this.activestand,
classification: this.activeName, classification: this.activeName,
problemDescription: this.questionSerach.problemDescription
},{ },{
_this: this _this: this
}, res => { }, res => {
src/sysConfig/index.js
+3 -3
View File
@@ -6,10 +6,10 @@
// 服务器地址 // 服务器地址
// const devIp = '39.98.140.126' // const devIp = '39.98.140.126'
// const devInterfacePORT = '10005' // const devInterfacePORT = '10005'
// const devIp = '192.168.1.33' // const devIp = '192.168.1.42'
// const devInterfacePORT = '9999' // const devInterfacePORT = '9999'
const devIp = '192.168.0.109' const devIp = '39.98.140.126'
const devInterfacePORT = '9999' const devInterfacePORT = '4201'
// const devIp = '62.234.136.153' // const devIp = '62.234.136.153'
// const devInterfacePORT = '8033' // const devInterfacePORT = '8033'
// 配置 idm 认证 // 配置 idm 认证