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:
super_liu
2021-09-16 17:26:40 +08:00
parent fb2e7d045d 58936d6a78
commit 4462d1a68b
12 changed files with 104 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home1/components/release/index.vue
+65 -81
View File
@@ -3,102 +3,86 @@
<div class="release">
<ul>
<li v-for="item in standardReleaseList" :key="item.id" class="time-title" >
<div style="height: 18px;">
<a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
<span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>
</div>
<div style="height: 18px;">
<a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
<span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>
</div>
</li>
</ul>
</div>
</template>
<script>
export default {
name: 'Release',
components: {},
mixins: [],
data() {
return {
putTime: '',
standardReleaseList: [], //标准发布数据
updateTime:""
}
},
computed: {},
watch: {},
mounted() {
this.getDate()
this.getAdvice()
this.addDate()
},
methods: {
//获取当前年月日
addDate(){
const nowDate = new Date();
const date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
date: nowDate.getDate(),
export default {
name: 'Release',
components: {},
mixins: [],
data() {
return {
putTime: '',
standardReleaseList: [], //标准发布数据
}
},
computed: {},
watch: {},
mounted() {
this.getDate()
this.getAdvice()
this.addDate()
},
methods: {
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.id,
pageType: item.standType + '_STAND'
}
const newmonth = date.month>10?date.month:'0'+date.month
const day = date.date>10?date.date:'0'+date.date
this.updateTime = date.year + '-' + newmonth + '-' + day
console.log("当前时间"+this.updateTime)
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.id,
pageType: item.standType + '_STAND'
})
window.open(routeUrl.href, '_blank')
},
//截取时间
getDate (date) {
return date != null ? date.substring(0, date.indexOf(' ')) : ''
},
//获取数据
getAdvice() {
let obj = {}
obj.limit = 10
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
_this: this
}, res => {
let arr = res.data
arr.forEach(item => {
if(item.standName !== ""){
this.standardReleaseList.push(item)
}
})
window.open(routeUrl.href, '_blank')
},
//截取时间
getDate (date) {
return date != null ? date.substring(0, date.indexOf(' ')) : ''
},
//获取数据
getAdvice() {
let obj = {}
obj.limit = 8
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
_this: this
}, res => {
this.standardReleaseList = res.data
let arr = res.data
arr.forEach(item => {
if(item.standName !== ""){
this.standardReleaseList.push(item)
}
})
}, e => {
})
},
}, e => {
})
},
},
}
}
</script>
<style lang="less" scoped>
.release {
.time-title {
margin: 15px;
.time {
float: right;
color:#FFFFFF;
}
a {
color: #ffffff;
&:hover {
color: #e9c851;
cursor:pointer;
text-decoration: underline;
}
.release {
.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/solicitopinions/index.vue
+3 -8
View File
@@ -4,7 +4,7 @@
<ul>
<li v-for="item in domesticDynamics" :key="item.id" class="time-title">
<div style="height: 18px">
<a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cname }}</a>
<a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cid }}</a>
<span class="time">{{ item.endTime }}</span>
</div>
</li>
@@ -40,16 +40,11 @@ export default {
getAdvice() {
this.$http.get("slrs/sar-public-idea/SelectAllPage", {
page: 1,
size: 1000
size: 10
}, {
_this: this
}, res => {
let arr = res.data.records;
arr.forEach(item => {
if (item.cname !== "") {
this.domesticDynamics.push(item);
}
});
this.domesticDynamics = res.data.records
}, e => {
});
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+1
View File
@@ -94,6 +94,7 @@
<el-table-column
prop="chapterNumber"
align="center"
sortable
label="章条编号"
width="170px">
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+1
View File
@@ -76,6 +76,7 @@
<el-table-column
prop="chapterNumber"
align="center"
sortable
label="章条编号"
width="170px">
</el-table-column>
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+1
View File
@@ -76,6 +76,7 @@
<el-table-column
prop="chapterNumber"
align="center"
sortable
label="章条编号"
width="170px">
</el-table-column>
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+1
View File
@@ -88,6 +88,7 @@
<el-table-column
prop="chapterNumber"
align="center"
sortable
label="章条编号"
width="170px">
</el-table-column>
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+1
View File
@@ -89,6 +89,7 @@
prop="chapterNumber"
align="center"
label="章条编号"
sortable
width="170px">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+1
View File
@@ -87,6 +87,7 @@
</el-table-column>
<el-table-column
prop="chapterNumber"
sortable
align="center"
label="章条编号"
width="170px">
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+1
View File
@@ -88,6 +88,7 @@
<el-table-column
prop="chapterNumber"
align="center"
sortable
label="章条编号"
width="170px">
</el-table-column>
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+18 -7
View File
@@ -181,7 +181,10 @@
label="标准号"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear" 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.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{
scope.row.standSortShow
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
@@ -194,7 +197,8 @@
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
<a v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
@@ -203,7 +207,10 @@
width="110px"
label="发布日期">
<template slot-scope="scope">
<div style="color: #2d8cf0">
<div v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">
{{ formatIssueDate(scope.row.issueTime) }}
</div>
<div v-else style="color: #2d8cf0">
{{ formatIssueDate(scope.row.issueTime) }}
</div>
</template>
@@ -215,7 +222,8 @@
label="实施日期">
<template slot-scope="scope">
<!-- {{ formatIssueDate(scope.row.putTime) }}-->
<span style="color: #2d8cf0">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
<span v-else style="color: #2d8cf0">{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
@@ -225,7 +233,8 @@
width="150px"
label="新车型实施日期">
<template slot-scope="scope">
<span style="color: #2d8cf0">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
<span v-else style="color: #2d8cf0">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
@@ -234,7 +243,8 @@
width="150px"
label="在产车实施日期">
<template slot-scope="scope">
<span style="color: #2d8cf0">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
<span v-else style="color: #2d8cf0">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
@@ -248,7 +258,8 @@
<!-- </el-tooltip>-->
<!-- </template>-->
<template slot-scope="scope">
<span style="color: #2d8cf0">{{ textStatusMap[scope.row.textStatus] }}</span>
<span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ textStatusMap[scope.row.textStatus] }}</span>
<span v-else style="color: #2d8cf0">{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right">
src/pages/regulatoryRepository/standardForComments/index.vue
+2 -2
View File
@@ -74,11 +74,11 @@
</template>
</el-table-column>
<el-table-column
prop="cname"
prop="cid"
label="标准名称/政策名称"
align="center">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.cname }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.cid }}</a>
</template>
</el-table-column>
<el-table-column
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+9 -9
View File
@@ -10,21 +10,21 @@
<transition name="el-zoom-in-top">
<div v-show="heightShow" class="transition-box">
<p class="transition-box-p">
<label class="transition-box-label">标准号：</label>
<label class="transition-box-label">标准名称：</label>
<span class="transition-box-span table-jump"
@click="handlePreview(itemData)"
>
{{ this.$route.query.item.cid }}
</span>
</p>
<p class="transition-box-p">
<label class="transition-box-label">标准名称：</label>
<span class="transition-box-span table-jump"
@click="handlePreview(itemData)"
>
{{ this.$route.query.item.cname || '-' }}
</span>
</p>
<!-- <p class="transition-box-p">-->
<!-- <label class="transition-box-label">标准名称：</label>-->
<!-- <span class="transition-box-span table-jump"-->
<!-- @click="handlePreview(itemData)"-->
<!-- >-->
<!-- {{ this.$route.query.item.cname || '-' }}-->
<!-- </span>-->
<!-- </p>-->
<p class="transition-box-p">
<label class="transition-box-label">附件：</label>
<span class="file-box" v-if="fileInfoList.length > 0">