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:
zhutianqi
2021-06-16 18:02:59 +08:00
parent bbd3506c4e 1811bd7512
commit 6cca408d4a
11 changed files with 233 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/languages/cn.js
+1 -1
View File
@@ -63,7 +63,7 @@ export const m = {
issueTime: '发布日期',
putTime: '实施日期',
standNatureShow: '标准性质',
standStateShow: '标准状态',
standStateShow: '文本状态',
action: '操作',
see: '查看',
stand: '标准/文件性质',
src/pages/details/otherStandardDetails/index.vue
+8 -18
View File
@@ -5,9 +5,6 @@
<div class="details-header">
<span>{{sarStandardsInfoEO.standSortShow || ''}} {{sarStandardsInfoEO.standNumber}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 标准详情</span>
</div>
<div class="details-fraction">
<span>9.5分</span>
</div>
<!--主体内容-->
<div class="details-content">
<div class="details-content-modular basic-information">
@@ -34,12 +31,12 @@
<label
title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
>标准状态<i class="el-icon-warning-outline"></i>：</label>
<span style="color: #409EFF;">{{ sarStandardsInfoEO.standStateShow || '-' }}</span>
<span style="color: #409EFF;">{{ sarStandardsInfoEO.textStatus || '-' }}</span>
</p>
<p><label>标准发布日期：</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
<p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>
<p><label>重要度：</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>
<p><label>纳入标准法规清单的国家/地区：</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>
<!-- <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
<!-- <p><label>重要度：</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>-->
<!-- <p><label>纳入标准法规清单的国家/地区：</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->
</div>
</div>
<div
@@ -2378,6 +2375,8 @@ export default {
// const { data: { STAND: data } } = res
const { data = {} } = res
this.formFieldListData = data[this.$route.params.pageType]
console.log('this.formFieldListData')
console.log(this.formFieldListData);
// this.resolveFormFieldList()
resolve(data[this.$route.params.pageType])
} else {
@@ -2610,6 +2609,8 @@ export default {
if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
return
}
console.log("displayLocation");
console.log(displayLocation);
displayLocation.forEach((location) => {
location.isShowImp = '0'
if (dynamicFormField) {
@@ -2801,17 +2802,6 @@ export default {
width: 100%;
}
}
.details-fraction{
float: right;
width:270px;
height:80px;
line-height: 80px;
text-align: center;
font-size: 30px;
font-weight: bold;
color: #e88218;
margin-top: -80px;
}
/deep/.details-content{
/*padding: 0 67px;*/
.details-content-modular{
src/pages/home1/components/conferenceMaterials/index.vue
+81
View File
@@ -0,0 +1,81 @@
<!--外部会议资料-->
<template>
<div class="conference-materials">
<ul>
<li v-for="item in materialsList" :key="item.id" class="time-title">
<a class="title" :title="item.title">{{item.name}}</a>
<span class="time">{{putTime}}</span>
</li>
</ul>
</div>
</template>
<script>
export default {
name: "ConferenceMaterials",
data () {
return {
putTime: '',
materialsList: [
{
id: 1,
name: '外部会议资料1',
},
{
id: 2,
name: '外部会议资料2',
},{
id: 3,
name: '外部会议资料3',
},
{
id: 4,
name: '外部会议资料4',
},
], //会议资料数据
}
},
methods: {
//获取当前时间
getDate () {
var date = new Date()
var year = date.getFullYear()
var month = date.getMonth() + 1
var day = date.getDate()
if (month < 10) {
month = '0' + month
}
if (day < 10) {
day = '0' + day
}
var nowDate = year + '-' + month + '-' + day
this.putTime = nowDate
}
},
mounted() {
this.getDate()
},
};
</script>
<style lang="less" scoped>
.conference-materials {
.time-title {
margin: 15px;
.time {
float: right;
color:#FFFFFF;
}
a {
color: #FFFFFF;
&:hover {
color: #e9c851;
cursor:pointer;
text-decoration: underline;
}
}
}
}
</style>
src/pages/home1/components/empennage/index.vue
+47 -10
View File
@@ -2,14 +2,9 @@
<template>
<div class="link">
<ul>
<li><a href="http://www.sac.gov.cn/">国家标准化管理委员会</a></li>
<li><a href="http://www.sac.gov.cn/">全国标准公共服务平台</a></li>
<li><a href="http://www.sac.gov.cn/">国家标准全文公开</a></li>
<li><a href="http://www.sac.gov.cn/">全国汽车标准化技术委员会</a></li>
<li><a href="http://www.sac.gov.cn/">交通运输标准化信息平台</a></li>
<li><a href="http://www.sac.gov.cn/">工信部装备工业发展中心</a></li>
<li><a href="http://www.sac.gov.cn/">中华人民共和国生态环境部</a></li>
<li><a href="">更多链接></a></li>
<li v-for="(link, index) in linkList" :key="index">
<a @click="openLinkUrl(link.newWebSite)" v-html="link.webName"></a>
</li>
</ul>
</div>
</template>
@@ -20,12 +15,54 @@ export default {
components: {},
mixins: [],
data() {
return {}
return {
linkList: [
{
newWebSite: 'http://www.sac.gov.cn/',
webName: '国家标准化管理委员会'
},
{
newWebSite: 'http://std.samr.gov.cn/',
webName: '全国标准公共服务平台'
},
{
newWebSite: 'http://www.catarc.org.cn/',
webName: '全国汽车标准化技术委员会'
},
{
newWebSite: 'http://jtst.mot.gov.cn/news/',
webName: '交通运输标准化信息平台'
},
{
newWebSite: 'http://www.miit-eidc.org.cn/',
webName: '工信部装备工业发展中心'
},
{
newWebSite: 'http://www.mee.gov.cn/',
webName: '中华人民共和国生态环境部'
},
{
newWebSite: '',
webName: '更多链接>'
}
]
}
},
computed: {},
watch: {},
mounted() {},
methods: {},
methods: {
// 跳转链接
openLinkUrl (linkUri) {
let getHttp = linkUri.substring(0, 7)
let getHttps = linkUri.substring(0, 8)
if (getHttp === 'http://' || getHttps === 'https://') {
window.open(linkUri)
} else {
window.open('https://' + linkUri)
}
},
},
}
</script>
src/pages/home1/components/noticeOfMeeting/index.vue
+23
View File
@@ -0,0 +1,23 @@
<!--会议通知-->
<template>
<div class="notice-of-meeting">
</div>
</template>
<script>
export default {
name: "NoticeOfMeeting",
data () {
return {
}
}
};
</script>
<style lang="less" scoped>
.notice-of-meeting {
}
</style>
src/pages/home1/components/realtimeinfo/index.vue
+1
View File
@@ -60,6 +60,7 @@ export default {
color: #ffffff;
&:hover {
color: #e9c851;
cursor:pointer;
text-decoration: underline;
}
}
src/pages/home1/components/release/index.vue
+1
View File
@@ -61,6 +61,7 @@ export default {
color: #ffffff;
&:hover {
color: #e9c851;
cursor:pointer;
text-decoration: underline;
}
}
src/pages/home1/components/solicitopinions/index.vue
+1
View File
@@ -67,6 +67,7 @@ export default {
color: #ffffff;
&:hover {
color: #e9c851;
cursor:pointer;
text-decoration: underline;
}
}
src/pages/home1/index.vue
+11 -1
View File
@@ -21,13 +21,19 @@
class="home-tabs"
@tab-click="handleTabClick"
>
<el-tab-pane label="外部会议资料" name="conferenceMaterials">
<conference-materials></conference-materials>
</el-tab-pane>
<el-tab-pane label="会议通知" name="noticeOfMeeting">
<notice-of-meeting></notice-of-meeting>
</el-tab-pane>
<el-tab-pane label="标准征求意见" name="solicitOpinions">
<solicitOpinions></solicitOpinions>
</el-tab-pane>
<el-tab-pane label="标准发布" name="release">
<release></release>
</el-tab-pane>
<el-tab-pane label="资讯" name="realTimeInfo">
<el-tab-pane label="外部资讯" name="realTimeInfo">
<realTimeInfo></realTimeInfo>
</el-tab-pane>
</el-tabs>
@@ -55,6 +61,8 @@ import navMenu from './components/navMenu'
import solicitOpinions from './components/solicitopinions'
import todoList from './components/todoList'
import Empennage from "./components/empennage"
import noticeOfMeeting from "./components/noticeOfMeeting"
import conferenceMaterials from "./components/conferenceMaterials"
export default {
name: 'Home',
@@ -66,6 +74,8 @@ export default {
release,
navMenu,
todoList,
noticeOfMeeting,
conferenceMaterials,
},
mixins: [],
data() {
src/pages/login/index.vue
+10 -4
View File
@@ -75,7 +75,8 @@ export default {
password: PWD
}, {
_this: this,
loading: 'loading'
loading: 'loading',
prefix: '/foton'
}, res => {
if (res.ok) {
const JSESSIONID = document.cookie
@@ -240,7 +241,8 @@ export default {
return new Promise((resolve, reject) => {
this.$http.get('person/userInfo/getByUserInfoCode', {
}, {
_this: this
_this: this,
prefix: '/foton'
}, res => {
if (true) {
resolve(res.data)
@@ -255,7 +257,10 @@ export default {
// 获取用户头像
getUserPic (attId) {
return new Promise((resolve, reject) => {
this.$http.get('/att/attFile/' + attId, {}, {_this: this}, res => {
this.$http.get('/att/attFile/' + attId, {}, {
_this: this,
prefix: '/foton'
}, res => {
resolve(res.data)
}, e => {
reject(e)
@@ -270,7 +275,8 @@ export default {
getMenu () {
return new Promise((resolve, reject) => {
this.$http.get('userMenu', {}, {
_this: this
_this: this,
prefix: '/foton'
}, res => {
if (res.ok) {
resolve(res.data)
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+49 -48
View File
@@ -164,7 +164,7 @@
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
prop="xcxssrq"
sortable="custom"
width="150px"
label="新车型实施日期">
@@ -173,7 +173,7 @@
</template>
</el-table-column>
<el-table-column
prop="ZCCSSRQ"
prop="zccssrq"
sortable="custom"
width="150px"
label="在产车实施日期">
@@ -183,13 +183,13 @@
</template>
</el-table-column>
<el-table-column
prop="standStateShow"
prop="textStatus"
sortable="custom"
width="120px"
label="标准状态">
label="文本状态">
<template slot="header" slot-scope="scope">
<el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">
<span>标准状态 <i class="el-icon-warning-outline"></i></span>
<span>文本状态<i class="el-icon-warning-outline"></i></span>
</el-tooltip>
</template>
</el-table-column>
@@ -304,9 +304,9 @@
</el-form-item>
<el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
prop="standState" label-width="150px" class="add-form-item">
<template slot="label">标准状态<i class="el-icon-warning-outline"></i></template>
<el-select v-model="sarStandardsInfoEO.standState"
placeholder="请选择标准状态"
<template slot="label">文本状态<i class="el-icon-warning-outline"></i></template>
<el-select v-model="sarStandardsInfoEO.textStatus"
placeholder="请选择文本状态"
clearable>
<el-option
v-for="opt in standStateOptions"
@@ -559,8 +559,8 @@
align="center">
</el-table-column>
<el-table-column
prop="standStateShow"
label="标准状态"
prop="textStatus"
label="文本状态"
width="130"
align="center">
</el-table-column>
@@ -758,8 +758,8 @@
</template>
</el-table-column>
<el-table-column
prop="standStateShow"
label="标准状态"
prop="textStatus"
label="文本状态"
width="200"
align="center">
</el-table-column>
@@ -840,7 +840,8 @@
<el-button size="mini" type="primary" class="common-button-default" icon="el-icon-check" @click="importFailed = false">确认</el-button>
</div>
</el-dialog>
<table-tools-bar v-model="isAdvancedSearch">
<table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)"
@reset="clearAllSearch('sarStandardsSearch')" >
<div slot="content">
<el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
<!-- 标准号-->
@@ -862,39 +863,35 @@
:options="standSortOptions"
clearable/>
</el-form-item>
<!-- 标准状态-->
<!-- 文本状态-->
<el-form-item :label="$t('m.standStateShow')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.standState" :placeholder="$t('m.lookupByStandardStatus')" clearable
<el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standStateOptions" :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="$t('m.substituteStandardNumber')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.replaceStandNum" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
<el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 适用车型-->
<el-form-item :label="$t('m.applicableModels')" class="serch-form-item">
<search-select
v-model="sarStandardsSearch.applyArctic"
:placeholder="$t('m.searchAccordingToThApplicableModel')"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
:options="applyArcticOptions"
clearable/>
<el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<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="$t('m.applicableProductLine')" class="serch-form-item">
<search-select
v-model="sarStandardsSearch.category"
:placeholder="$t('m.searchByApplicableProductLine')"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
:options="categoryOptions"
clearable/>
<el-select v-model="sarStandardsSearch.nylx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in categoryOptions" :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="$t('m.associatedModule')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.standNature" :placeholder="$t('m.SearchByAssociatedModule')" clearable
<el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}
</el-option>
@@ -1012,7 +1009,7 @@ export default {
standSortOptions: [], // 标准类别下拉框
standSortConfigOptions: [], // 标准类别下拉框
applyArcticOptions: [], // 适用车型下拉框
standStateOptions: [], // 标准状态下拉框
standStateOptions: [], // 文本状态下拉框
standNatureOptions: [], // 标准性质下拉框
adoptExtentOptions: [], // 采标程度下拉框
emergyKindOptions: [], // 能源种类下拉框
@@ -1517,7 +1514,7 @@ export default {
this.threeOptions = this.countryOptions
} else if (val === 'stand_sort') {
this.threeOptions = this.standSortOptions
} else if (val === 'stand_state') {
} else if (val === 'stand_state_show') {
this.threeOptions = this.standStateOptions
} else if (val === 'stand_nature') {
this.threeOptions = this.standNatureOptions
@@ -1633,7 +1630,6 @@ export default {
this.modalshowtitle = '编辑国内标准'
this.modalshowflag = true
this.resolveFormFieldList(item.isRelateAccess)
this.$nextTick(() => {
Promise.all([this.queryDisplayLocation()]).then((values) => {
const [displayLocation] = values
@@ -1799,13 +1795,19 @@ export default {
this.getDomesticStandardTable(item)
},
// 搜索
getDomesticStandardTableBtn (advancedSearch) {
let item = {}
item.page = 1
item.advanceSearchStr = ''
item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
this.getDomesticStandardTable(item)
getDomesticStandardTableBtn (item) {
this.tableFlag = item
item.page = 1
item.sarStandardsSearch = ''
this.getDomesticStandardTable(item)
},
// getDomesticStandardTableBtn (advancedSearch) {
// let item = {}
// item.page = 1
// item.advanceSearchStr = ''
// item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
// this.getDomesticStandardTable(item)
// },
// 清空搜索框
clearAllSearch (flag) {
if (flag === 'sarStandardsSearch') {
@@ -1849,9 +1851,8 @@ export default {
},
// 高级检索
selectMoreBtn () {
console.log('检索窗口')
this.isAdvancedSearch = true
this.threeOptions = []
this.sarStandardsSearch = []
},
treeCollapse () {
this.sideClose = !this.sideClose
@@ -2389,7 +2390,7 @@ export default {
sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
})
nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
this.$http.postData(this.addOrUPdateFlag === 1 ? 'lawss/sarStandardsInfo/addarStandardsInfo' : 'lawss/sarStandardsInfo/updateSarStandardsInfo', nowstandinfo, {
this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'lawss/sarStandardsInfo/updateSarStandardsInfo', nowstandinfo, {
_this: this
}, res => {
this.isSubmit = false
@@ -2508,7 +2509,7 @@ export default {
this.sarConfigStandSearch.page = this.configPage
// this.sarConfigStandSearch.pageSize = this.configRows
this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent
this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.sarConfigStandSearch, {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarConfigStandSearch, {
_this: this,
loading: 'loading'
}, res => {
@@ -2675,7 +2676,7 @@ export default {
// this.replaceStandNumForm.quoteIdList = this.sarStandardsInfoEO.replaceStandNumId.toString()
// (this.replaceStandNumForm.quoteIdList)
// }
this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.replaceStandNumForm, {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceStandNumForm, {
_this: this
// loading: 'lawsExplainQuoteFormLoading'
}, res => {
@@ -2907,7 +2908,7 @@ export default {
if (this.sarStandardsInfoEO.lawsExplainQuote !== null && this.sarStandardsInfoEO.lawsExplainQuote !== '') {
this.lawsExplainQuoteForm.quoteIdList = this.sarStandardsInfoEO.lawsExplainQuote.toString()
}
this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', this.lawsExplainQuoteForm, {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.lawsExplainQuoteForm, {
_this: this,
loading: 'lawsExplainQuoteFormLoading'
}, res => {
@@ -3208,8 +3209,8 @@ export default {
disabled: false
},
{
label: '标准状态',
value: 'stand_state',
label: '文本状态',
value: 'stand_state_show',
type: 'SEL_OPTION',
disabled: false
},
@@ -3283,7 +3284,7 @@ export default {
*/
queryDisplayLocation () {
return new Promise((resolve, reject) => {
this.$http.get('sarStandardsInfo/sar-standards-info/addarStandardsInfo', {
this.$http.get('lawssBase/utArea/getAreaList', {
sarType: this.sarType
}, {
_this: this
@@ -3342,7 +3343,7 @@ export default {
}
// isEdit 为0 标准状态不是必填
if (isEdit === '0') {
rules.standState = [{required: false, message: '标准状态不能为空', trigger: 'change'}]
rules.standState = [{required: false, message: '文本状态不能为空', trigger: 'change'}]
rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}]
}
if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') {