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

commit

Browse Source
This commit is contained in:
宋伟佳
2021-06-15 18:00:38 +08:00
parent 0201ecde23
commit b09acf446a
5 changed files with 143 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/axios/index.js
+1
View File
@@ -211,6 +211,7 @@ export default {
thenFun.call(this, res.data)
}
} else {
console.log(res.data)
// 返回data数组
thenFun.call(this, res.data)
}
src/pages/home1/components/solicitopinions/index.vue
+19 -12
View File
@@ -3,8 +3,8 @@
<div class="solicitopinions">
<ul>
<li v-for="item in domesticDynamics" :key="item.id" class="time-title">
<a class="title" :title="item.title">{{ item.title }}</a>
<span class="time">{{ getDate(item.pubTime) }}</span>
<a class="title" :title="item.title" @click="standForComments(item)">{{ item.cname }}</a>
<span class="time">{{item.endTime}}</span>
</li>
</ul>
</div>
@@ -34,16 +34,23 @@ export default {
},
//获取数据
getAdvice() {
let obj = {}
obj.msgType = 'RESOURCE'
obj.rowLimit = 8
this.$http.get('lawss/msgDynamicInfo/page', obj, {
_this: this
}, res => {
this.domesticDynamics = res.data.list
}, e => {
})
}
this.$http.get('slrs/sar-public-idea/SelectAllPage', {}, {
_this: this
}, res => {
console.log('41',res)
this.domesticDynamics = res.data.records
}, e => {
} )
},
standForComments (item) {
this.$router.push({
name:'standardForComments',
params: {
id: item.id
}
},)
},
},
}
</script>
src/pages/localTool/standardWarning.vue
+105 -125
View File
@@ -5,8 +5,8 @@
<!-- 实施预警 -->
<div class="dynamic" style="overflow-y: auto;">
<div class="container" :style="containerStyle">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="标准预警" name="STANDARD">
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
<!-- <el-tab-pane label="标准预警" name="STANDARD">-->
<div class="dynamic-content">
<h5>实施预警</h5>
<div class="more">
@@ -293,105 +293,105 @@
@pageSizeChange="pageSize => handlePageSizeChange('oldStand', pageSize)"></pagination>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="政策预警" name="POLICY">
<div class="dynamic-content">
<h5>实施预警</h5>
<div class="content" style="height: 100%; padding-top: 5px; ">
<div class="content-group">
<el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
<div class="table-wrap">
<el-table
:data="newPolicy"
:height="tableHeight"
border
:resizable="false"
v-loading="loading.newPolicy"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column prop="policyId" label="政策编号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.policyId }}</a>
</template>
</el-table-column>
<el-table-column prop="policyName" label="政策名称" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.policyName }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>
<template slot-scope="scope">
{{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="150" v-if="isShowBtn">
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
</template>
</el-table-column>
</el-table>
</div>
<pagination
style="position: static;"
:page="pageConfig.newPolicyPage"
:pageSize="pageConfig.newPolicyPageSize"
:total="pageConfig.count5"
autoSize
@pageChange="page => handlePageChange('newPolicy', page)"
@pageSizeChange="pageSize => handlePageSizeChange('newPolicy', pageSize)"></pagination>
</div>
<div class="content-group">
<el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>
<div class="table-wrap">
<el-table
:data="oldPolicy"
:height="tableHeight"
border
:resizable="false"
v-loading="loading.oldPolicy"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column prop="policyId" label="政策编号" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.policyId }}</a>
</template>
</el-table-column>
<el-table-column prop="policyName" label="政策名称" align="center">
<template slot-scope="scope">
<a @click="showStandDetails(scope.row)">{{ scope.row.policyName }}</a>
</template>
</el-table-column>
<el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
<template slot-scope="scope">
{{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="150" v-if="isShowBtn">
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
@click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>
</template>
</el-table-column>
</el-table>
</div>
<pagination
style="position: static;"
:page="pageConfig.oldPolicyPage"
:pangSize="pageConfig.oldPolicyPageSize"
:total="pageConfig.count6"
autoSize
@pageChange="page => handlePageChange('oldPolicy', page)"
@pageSizeChange="pageSize => handlePageSizeChange('oldPolicy', pageSize)"></pagination>
</div>
</div>
</div>
</el-tab-pane>
</el-tabs>
<!-- </el-tab-pane>-->
<!-- <el-tab-pane label="政策预警" name="POLICY">-->
<!-- <div class="dynamic-content">-->
<!-- <h5>实施预警</h5>-->
<!-- <div class="content" style="height: 100%; padding-top: 5px; ">-->
<!-- <div class="content-group">-->
<!-- <el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>-->
<!-- <div class="table-wrap">-->
<!-- <el-table-->
<!-- :data="newPolicy"-->
<!-- :height="tableHeight"-->
<!-- border-->
<!-- :resizable="false"-->
<!-- v-loading="loading.newPolicy"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >-->
<!-- <el-table-column prop="policyId" label="政策编号" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyId }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="policyName" label="政策名称" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyName }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>-->
<!-- <template slot-scope="scope">-->
<!-- {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" width="150" v-if="isShowBtn">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </div>-->
<!-- <pagination-->
<!-- style="position: static;"-->
<!-- :page="pageConfig.newPolicyPage"-->
<!-- :pageSize="pageConfig.newPolicyPageSize"-->
<!-- :total="pageConfig.count5"-->
<!-- autoSize-->
<!-- @pageChange="page => handlePageChange('newPolicy', page)"-->
<!-- @pageSizeChange="pageSize => handlePageSizeChange('newPolicy', pageSize)"></pagination>-->
<!-- </div>-->
<!-- <div class="content-group">-->
<!-- <el-divider content-position="left" class="dynamic-child-title">在产车实施日期预警</el-divider>-->
<!-- <div class="table-wrap">-->
<!-- <el-table-->
<!-- :data="oldPolicy"-->
<!-- :height="tableHeight"-->
<!-- border-->
<!-- :resizable="false"-->
<!-- v-loading="loading.oldPolicy"-->
<!-- :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"-->
<!-- >-->
<!-- <el-table-column prop="policyId" label="政策编号" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyId }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="policyName" label="政策名称" align="center">-->
<!-- <template slot-scope="scope">-->
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.policyName }}</a>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>-->
<!-- <template slot-scope="scope">-->
<!-- {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" width="150" v-if="isShowBtn">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="danger"-->
<!-- @click="cancelWarning(scope.$index, scope.row)">取消预警</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </div>-->
<!-- <pagination-->
<!-- style="position: static;"-->
<!-- :page="pageConfig.oldPolicyPage"-->
<!-- :pangSize="pageConfig.oldPolicyPageSize"-->
<!-- :total="pageConfig.count6"-->
<!-- autoSize-->
<!-- @pageChange="page => handlePageChange('oldPolicy', page)"-->
<!-- @pageSizeChange="pageSize => handlePageSizeChange('oldPolicy', pageSize)"></pagination>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-tab-pane>-->
<!-- </el-tabs>-->
</div>
</div>
</div>
@@ -468,6 +468,7 @@ export default {
}, {
_this: this
},res => {
console.log(res.data);
const result = res.data[0]
for (const field in result) {
this[field] = result[field].records
@@ -565,16 +566,17 @@ export default {
type: 'warning',
roundButton: false
}).then(() => {
console.log(569)
this.$http.get('sys/EarlyWarning/ChangePermissions', {
id: row.id,
}, res => {
}, {}, res => {
this.pageConfig.newItemsPage = 1
this.pageConfig.oldItemsPage = 1
this.pageConfig.newStandPage = 1
this.pageConfig.oldStandPage = 1
this.pageConfig.newPolicyPage = 1
this.pageConfig.oldPolicyPage = 1
this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate()
this.getEarlyDate()
}
)
}).catch(() => {
@@ -636,28 +638,6 @@ export default {
}, e => {
});
},
// queryProductionVehicleByPage() {
// this.$http.get("sys/EarlyWarning/StandWarning", {
// sarPutType: "ZCCSSRQ",
// pageSize: 5
// }, {
// _this: this
// }, res => {
// this.productionVehicleDatas = res.data.list;
// }, e => {
// });
// },
// queryNewTypeByPage() {
// this.$http.get("sys/EarlyWarning/StandWarning", {
// sarPutType: "XCXSSRQ",
// pageSize: 5
// }, {
// _this: this
// }, res => {
// // this.newTypeDatas = res.data.list;
// }, e => {
// });
// },
/**
* @description: 日期转换
* @author: chenxiaoxi
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+16 -7
View File
@@ -79,8 +79,8 @@
style="width: 100%"
border
:height="tableHeight"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
fontWeight: 'normal', height: '48px'}"
@selection-change="handleSelectionChange">
<el-table-column
type="selection"
@@ -90,15 +90,19 @@
<el-table-column
show-overflow-tooltip
prop="flatform"
align="center"
label="产品平台">
</el-table-column>
<el-table-column
prop="productNo"
align="center"
width="90"
label="项目编号">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="productName"
align="center"
label="项目名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.productName }}</a>
@@ -108,16 +112,16 @@
show-overflow-tooltip
prop="productTypeShow"
label="项目分类"
align="center"
min-width="120"
sortable
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="productBrandShow"
label="项目状态"
align="center"
min-width="120"
sortable
>
</el-table-column>
<el-table-column
@@ -125,14 +129,15 @@
prop="productBrandShow"
label="项目群"
min-width="120"
sortable
align="center"
>
</el-table-column>
<el-table-column
prop="sopTime"
label="项目计划开始日期"
min-width="120"
sortable
width="160"
align="center"
>
<template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>
</el-table-column>
@@ -140,23 +145,27 @@
prop="sopTime"
label="项目计划完成日期"
min-width="120"
sortable
width="160"
align="center"
>
<template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="targetMarketShow"
align="center"
label="当前节点">
</el-table-column>
<el-table-column
prop="leftRight"
align="center"
label="项目级别">
<template slot-scope="scope" v-if="scope.row.leftRight">{{(scope.row.leftRight === '1' ? '左驾': '右驾')}}</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="productManagerShow"
align="center"
label="项目经理">
</el-table-column>
<el-table-column label="" fixed="right" width="50" :resizable="false">
src/pages/regulatoryRepository/standardForComments/index.vue
+2 -2
View File
@@ -65,12 +65,12 @@
</template>
</el-table-column>
<el-table-column
prop="createTime"
prop="endTime"
label="征求意见周期"
align="center">
</el-table-column>
<el-table-column
prop="createTime"
prop="startTime"
label="上传时间"
align="center">
</el-table-column>