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
+1 -17
View File
@@ -21,7 +21,6 @@
return { return {
putTime: '', putTime: '',
standardReleaseList: [], //标准发布数据 standardReleaseList: [], //标准发布数据
updateTime:""
} }
}, },
computed: {}, computed: {},
@@ -32,19 +31,6 @@
this.addDate() this.addDate()
}, },
methods: { methods: {
//获取当前年月日
addDate(){
const nowDate = new Date();
const date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
date: nowDate.getDate(),
}
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) { handlePreview (item) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
@@ -63,11 +49,10 @@
//获取数据 //获取数据
getAdvice() { getAdvice() {
let obj = {} let obj = {}
obj.limit = 8 obj.limit = 10
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, { this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
_this: this _this: this
}, res => { }, res => {
this.standardReleaseList = res.data
let arr = res.data let arr = res.data
arr.forEach(item => { arr.forEach(item => {
if(item.standName !== ""){ if(item.standName !== ""){
@@ -101,4 +86,3 @@
} }
} }
</style> </style>
src/pages/home1/components/solicitopinions/index.vue
+3 -8
View File
@@ -4,7 +4,7 @@
<ul> <ul>
<li v-for="item in domesticDynamics" :key="item.id" class="time-title"> <li v-for="item in domesticDynamics" :key="item.id" class="time-title">
<div style="height: 18px"> <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> <span class="time">{{ item.endTime }}</span>
</div> </div>
</li> </li>
@@ -40,16 +40,11 @@ export default {
getAdvice() { getAdvice() {
this.$http.get("slrs/sar-public-idea/SelectAllPage", { this.$http.get("slrs/sar-public-idea/SelectAllPage", {
page: 1, page: 1,
size: 1000 size: 10
}, { }, {
_this: this _this: this
}, res => { }, res => {
let arr = res.data.records; this.domesticDynamics = res.data.records
arr.forEach(item => {
if (item.cname !== "") {
this.domesticDynamics.push(item);
}
});
}, e => { }, e => {
}); });
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+1
View File
@@ -94,6 +94,7 @@
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center" align="center"
sortable
label="章条编号" label="章条编号"
width="170px"> width="170px">
<template slot-scope="scope"> <template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+1
View File
@@ -76,6 +76,7 @@
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center" align="center"
sortable
label="章条编号" label="章条编号"
width="170px"> width="170px">
</el-table-column> </el-table-column>
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+1
View File
@@ -76,6 +76,7 @@
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center" align="center"
sortable
label="章条编号" label="章条编号"
width="170px"> width="170px">
</el-table-column> </el-table-column>
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+1
View File
@@ -88,6 +88,7 @@
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center" align="center"
sortable
label="章条编号" label="章条编号"
width="170px"> width="170px">
</el-table-column> </el-table-column>
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+1
View File
@@ -89,6 +89,7 @@
prop="chapterNumber" prop="chapterNumber"
align="center" align="center"
label="章条编号" label="章条编号"
sortable
width="170px"> width="170px">
</el-table-column> </el-table-column>
<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>
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
sortable
align="center" align="center"
label="章条编号" label="章条编号"
width="170px"> width="170px">
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+1
View File
@@ -88,6 +88,7 @@
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center" align="center"
sortable
label="章条编号" label="章条编号"
width="170px"> width="170px">
</el-table-column> </el-table-column>
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+18 -7
View File
@@ -181,7 +181,10 @@
label="标准号" label="标准号"
> >
<template slot-scope="scope"> <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.standSortShow
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
@@ -194,7 +197,8 @@
label="标准名称" label="标准名称"
> >
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -203,7 +207,10 @@
width="110px" width="110px"
label="发布日期"> label="发布日期">
<template slot-scope="scope"> <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) }} {{ formatIssueDate(scope.row.issueTime) }}
</div> </div>
</template> </template>
@@ -215,7 +222,8 @@
label="实施日期"> label="实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- {{ formatIssueDate(scope.row.putTime) }}--> <!-- {{ 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> </template>
</el-table-column> </el-table-column>
@@ -225,7 +233,8 @@
width="150px" width="150px"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -234,7 +243,8 @@
width="150px" width="150px"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -248,7 +258,8 @@
<!-- </el-tooltip>--> <!-- </el-tooltip>-->
<!-- </template>--> <!-- </template>-->
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="cname" prop="cid"
label="标准名称/政策名称" label="标准名称/政策名称"
align="center"> align="center">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<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"> <transition name="el-zoom-in-top">
<div v-show="heightShow" class="transition-box"> <div v-show="heightShow" class="transition-box">
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">标准号：</label> <label class="transition-box-label">标准名称：</label>
<span class="transition-box-span table-jump" <span class="transition-box-span table-jump"
@click="handlePreview(itemData)" @click="handlePreview(itemData)"
> >
{{ this.$route.query.item.cid }} {{ this.$route.query.item.cid }}
</span> </span>
</p> </p>
<p class="transition-box-p"> <!-- <p class="transition-box-p">-->
<label class="transition-box-label">标准名称：</label> <!-- <label class="transition-box-label">标准名称：</label>-->
<span class="transition-box-span table-jump" <!-- <span class="transition-box-span table-jump"-->
@click="handlePreview(itemData)" <!-- @click="handlePreview(itemData)"-->
> <!-- >-->
{{ this.$route.query.item.cname || '-' }} <!-- {{ this.$route.query.item.cname || '-' }}-->
</span> <!-- </span>-->
</p> <!-- </p>-->
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">附件：</label> <label class="transition-box-label">附件：</label>
<span class="file-box" v-if="fileInfoList.length > 0"> <span class="file-box" v-if="fileInfoList.length > 0">