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-09 16:14:42 +08:00
parent 4e878d7594 68913d68fc
commit aabd953a3b
9 changed files with 220 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/lawsTree/index.vue
+1
View File
@@ -1501,6 +1501,7 @@ export default {
}
}
}
.ztree li span.button { width: 6px }
.ztree li span.button.add {margin-left:2px; margin-right: -1px; background-position:-144px 0; vertical-align:top; *vertical-align:middle}
div#rMenu {position:absolute; visibility:hidden; top:0;text-align: left;padding: 2px;}
div#rMenu ul {
src/pages/home1/components/solicitopinions/index.vue
+47 -26
View File
@@ -2,9 +2,9 @@
<template>
<div class="solicitopinions">
<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" v-if="updateTime < item.endTime">
<a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cname }}</a>
<span class="time">{{item.endTime}}</span>
<span class="time">{{ item.endTime }}</span>
</li>
</ul>
</div>
@@ -12,62 +12,83 @@
<script>
export default {
name: 'Solicitopinions',
name: "Solicitopinions",
components: {},
mixins: [],
data() {
return {
putTime: '',
domesticDynamics: [], //标准征求意见数据
}
updateTime: "",
putTime: "",
domesticDynamics: [] //标准征求意见数据
};
},
computed: {},
watch: {},
mounted() {
this.getDate()
this.getAdvice()
this.getDate();
this.getAdvice();
this.addDate();
},
methods: {
//截取时间
getDate (date) {
return date != null ? date.substring(0, date.indexOf(' ')) : ''
//获取当前年月日
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);
},
//截取时间
getDate(date) {
return date != null ? date.substring(0, date.indexOf(" ")) : "";
},
//获取数据
getAdvice() {
this.$http.get('slrs/sar-public-idea/SelectAllPage', {}, {
_this: this
}, res => {
this.domesticDynamics = res.data.records
}, e => {
this.$http.get("slrs/sar-public-idea/SelectAllPage", {
page: 1,
size: 1000,
}, {
_this: this
}, res => {
this.domesticDynamics = res.data.records
}, e => {
} )
});
},
standForComments (item) {
this.$store.commit('setDetailMap',this.$router.path)
standForComments(item) {
this.$store.commit("setDetailMap", this.$router.path);
this.$router.push({
name: 'consultationDetails',
name: "consultationDetails",
query: {
item: item
}
})
},
},
}
});
}
}
};
</script>
<style lang="less" scoped>
.solicitopinions {
.time-title {
margin: 15px;
.time {
float: right;
color:#FFFFFF;
color: #FFFFFF;
}
a {
color: #ffffff;
&:hover {
color: #e9c851;
cursor:pointer;
cursor: pointer;
text-decoration: underline;
}
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+100 -100
View File
@@ -6,42 +6,42 @@
<el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form">
<el-form-item label="国家/地区" class="search-item search-item-last">
<el-select
v-model="sarSarAccessEOSearch.countryArea"
placeholder="请选择"
filterable
v-model="sarSarAccessEOSearch.countryArea"
placeholder="请选择"
filterable
>
<el-option
v-for="item in countryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
v-for="item in countryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="清单名称" class="search-item search-item-last">
<el-input
v-model="sarSarAccessEOSearch.detailedListName"
placeholder="请输入清单名称"
v-model="sarSarAccessEOSearch.detailedListName"
placeholder="请输入清单名称"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
:loading="searching"
type="primary"
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="searchSarAccess">
:loading="searching"
type="primary"
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="searchSarAccess">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="small"
v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
@click="clearSearch">清空
class="common-button-default"
size="small"
v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
@click="clearSearch">清空
</el-button>
</el-form-item>
</el-form>
@@ -49,59 +49,59 @@
</div>
<div class="action-bar">
<el-button
type="primary"
class="common-button-primary add-button"
size="mini"
@click="openModal(null,'addOpt')"
v-btn-permission="'7aaf236bdf6b1657c615380f7f34b8a8'"
type="primary"
class="common-button-primary add-button"
size="mini"
@click="openModal(null,'addOpt')"
v-btn-permission="'7aaf236bdf6b1657c615380f7f34b8a8'"
><i class="iconfont">&#xe84e;</i>新增
</el-button>
<el-button
class="common-button-default delete-button"
:loading="delLoading"
size="mini"
@click="deleteSarAccess('demore',null)"
v-btn-permission="'562e58cc3a960096cf3321e631293dc9'"
class="common-button-default delete-button"
:loading="delLoading"
size="mini"
@click="deleteSarAccess('demore',null)"
v-btn-permission="'562e58cc3a960096cf3321e631293dc9'"
><i class="iconfont">&#xe61b;</i>批量删除
</el-button>
</div>
<div class="container">
<loading :loading="tableLoading">数据获取中</loading>
<el-table
:data="sarAccessListDatas"
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
:data="sarAccessListDatas"
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectOne"
ref="selection"
@selection-change="selectOne"
ref="selection"
>
<el-table-column
type="selection"
width="55"
align="center">
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="countryAreaShow"
label="国家/地区"
align="center">
prop="countryAreaShow"
label="国家/地区"
align="center">
</el-table-column>
<el-table-column
prop="detailedListName"
label="清单名称"
align="center"
width="260px"
prop="detailedListName"
label="清单名称"
align="center"
width="260px"
>
<template slot-scope="scope">
<a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
</template>
</el-table-column>
<el-table-column
prop="detailedListState"
label="清单状态"
align="center">
prop="detailedListState"
label="清单状态"
align="center">
<template slot-scope="scope">
<span v-if="scope.row.detailedListState === '0'">未发布</span>
<span v-if="scope.row.detailedListState === '1'">已发布</span>
@@ -109,31 +109,31 @@
</template>
</el-table-column>
<el-table-column
prop="detailedListVision"
label="清单版本"
align="center">
prop="detailedListVision"
label="清单版本"
align="center">
<template slot-scope="scope">
<span
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
scope.row.detailedListVision
}}</span>
</template>
</el-table-column>
<el-table-column
prop="updateTime"
label="更新时间"
align="center">
prop="updateTime"
label="更新时间"
align="center">
<template slot-scope="scope">
<div>{{
scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime
scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : scope.row.updateTime
}}
</div>
</template>
</el-table-column>
<el-table-column
prop="updatePeople"
label="更新人"
align="center">
prop="updatePeople"
label="更新人"
align="center">
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right">
<template slot-scope="scope">
@@ -186,7 +186,7 @@ export default {
selectedList: [],
// 新增、编辑 准入信息字段
sarAccessEO: {
relateFile: '',
relateFile: "",
country: "",
applyArctic: "",
energyKind: "",
@@ -197,14 +197,14 @@ export default {
drawerTotal: 0, // 抽屉分页的总条数
sarAccessEORules: {
region: [
{required: true, message: "区域不能为空", trigger: "change"}
{ required: true, message: "区域不能为空", trigger: "change" }
],
country: [
{required: true, message: "国家不能为空", trigger: "change"}
{ required: true, message: "国家不能为空", trigger: "change" }
],
detailedListName: [
{required: true, message: "清单名称不能为空", trigger: "blur"},
{type: "string", max: 100, message: "清单名称不能超过100个字符", trigger: "blur"}
{ required: true, message: "清单名称不能为空", trigger: "blur" },
{ type: "string", max: 100, message: "清单名称不能超过100个字符", trigger: "blur" }
]
},
countryOptions: [],
@@ -223,10 +223,10 @@ export default {
applyAuth: "" // 认证类型
},
dataSourceOptions: [
{value: "INLAND_STAND", label: "国内标准法规"},
{value: "FOREIGN_STAND", label: "海外标准法规"},
{value: "FOREIGN_LAWS", label: "国内外政策"},
{value: "BUSINESS", label: "企业标准 "}
{ value: "INLAND_STAND", label: "国内标准法规" },
{ value: "FOREIGN_STAND", label: "海外标准法规" },
{ value: "FOREIGN_LAWS", label: "国内外政策" },
{ value: "BUSINESS", label: "企业标准 " }
],
tableLoading: true,
sarAccessInfoSearchList: [],
@@ -263,29 +263,29 @@ export default {
sortKey: 1,
page: 1,
pageSize: 10,
...this.sarSarAccessEOSearch,
...this.sarSarAccessEOSearch
}, {
_this: this
}, res => {
let arr = res.data.records;
let map = new Map();
this.countryOptions.forEach(item => {
map.set(item.value, item.label);
});
arr.forEach(item => {
// 国家地区转换
if (item.countryArea !== null || item.countryArea !== "") {
let k = (item.countryArea || "").split(',')
for (let i in this.countryOptions) {
for (let m = 0; m < k.length; m++) {
if (this.countryOptions[i].value === k[m]) {
k[m] = this.countryOptions[i].label
}
item.countryAreaShow = k.join(',')
}
let k = (item.countryArea || "").split(",");
for (let m = 0; m < k.length; m++) {
k[m] = map.get(k[m]);
item.countryAreaShow = k.join(",");
}
}
})
this.sarAccessListDatas = arr
this.tableLoading = false
this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total
});
this.tableLoading = false;
this.sarAccessListDatas = arr;
this.sarSarAccessEOSearch.page = 1;
this.sarAccessListTotal = res.data.total;
}, e => {
});
@@ -299,8 +299,8 @@ export default {
// this.searchSarAccess();
},
clearSearch() {
this.sarSarAccessEOSearch.countryArea = ''
this.sarSarAccessEOSearch.detailedListName = ''
this.sarSarAccessEOSearch.countryArea = "";
this.sarSarAccessEOSearch.detailedListName = "";
// this.searchSarAccess();
},
// 新增相关
@@ -311,29 +311,29 @@ export default {
},
// 批量删除
deleteSarAccess(flag, id) {
if (flag === 'delOne') {
if (flag === "delOne") {
this.selectedList = [];
this.selectedList[0] = id;
}
if (this.selectedList.length === 0) {
this.$message.warning('请选择要删除的数据')
this.$message.warning("请选择要删除的数据");
} else {
this.$confirm('确定删除这些数据？', '提示', {
confirmButtonText: '确定',
confirmButtonClass: 'common-button-primary',
cancelButtonText: '取消',
type: 'warning',
this.$confirm("确定删除这些数据？", "提示", {
confirmButtonText: "确定",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(",")}`;
this.$http.postDelete(URL, {}, res => {
this.searchSarAccess();
this.selectedList = [];
this.$message.success('删除成功')
this.$message.success("删除成功");
}, e => {
});
}).catch(() => {
})
});
}
},
// 表格选择框
@@ -356,7 +356,7 @@ export default {
},
// 点击 table编辑按钮 事件
editTable(item) {
this.$store.commit('SET_ACCESS_STAND_REG_ROW', item)
this.$store.commit("SET_ACCESS_STAND_REG_ROW", item);
this.$router.push({
name: "ListOfStandardsAndRegulationsDetails",
query: {
@@ -370,8 +370,8 @@ export default {
// 将文本状态的id与name对应
setMap(data) {
data.forEach(item => {
this.$set(this.countryAreaMap, item.value, item.label)
})
this.$set(this.countryAreaMap, item.value, item.label);
});
}
},
created() {
@@ -385,7 +385,7 @@ export default {
_this: this
}, res => {
this.countryOptions = res.data.COUNTRY;
this.setMap(this.countryOptions)
this.setMap(this.countryOptions);
}, e => {
});
}
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+43 -35
View File
@@ -2,55 +2,58 @@
<template>
<div id="domesticStandardDatabase" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
<div class="tree-content" :class="{ 'tree-closed': sideClose }">
<div class="tree">
<div style="width: 100%">
<el-input
placeholder="输入树状图体系"
v-model="filterText">
</el-input>
<el-tree
ref="tree"
node-key="id"
class="tree-line"
icon-class="icon-tree"
:indent="0"
:props="props"
:data="treeList"
highlight-current
@node-click="treeClick"
:filter-node-method="filterNode"
default-expand-all
:expand-on-click-node="false">
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)"
@mouseleave="mouseleave(data)">
</el-input>
<div class="tree">
<el-card style="height: 100%;padding-right: 120px;">
<el-tree
ref="tree"
node-key="id"
class="tree-line"
icon-class="icon-tree"
:indent="0"
:props="props"
:data="treeList"
highlight-current
@node-click="treeClick"
:filter-node-method="filterNode"
default-expand-all
:expand-on-click-node="false">
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)"
@mouseleave="mouseleave(data)">
<span
:class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
<span v-if="node.label.length<15"> {{ node.label}} </span>
<span v-else> {{ node.label.substring(0,15)+'...'}} </span>
:class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
<span> {{ node.label}} </span>
<span>
<el-button
type="text"
size="mini"
v-show="data.show"
@click="() => append(data)">
type="text"
size="mini"
v-show="data.show"
@click="() => append(data)">
新增
</el-button>
<el-button
type="text"
size="mini"
v-show="data.show"
@click="() => update(data)">
type="text"
size="mini"
v-show="data.show"
@click="() => update(data)">
编辑
</el-button>
<el-button
type="text"
size="mini"
v-show="data.showDel"
@click="() => remove(node, data)">
type="text"
size="mini"
v-show="data.showDel"
@click="() => remove(node, data)">
删除
</el-button>
</span>
</span>
</el-tree>
</el-tree>
</el-card>
</div>
</div>
<div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
<!--切换折叠样式-->
@@ -4988,7 +4991,6 @@ export default {
background: url('~@/assets/images/shangqi/img/tree.png');
background-size: 100% 100%;
}
/deep/ .tree-line {
.el-tree-node {
position: relative;
@@ -5066,6 +5068,13 @@ export default {
position: relative;
.tree {
/deep/.el-card__body {
padding: 0 !important;
}
.el-card {
min-width: min-content;
}
height: 95%;
width: calc(~'100% - 15px');
position: absolute;
left: 0;
@@ -5113,7 +5122,6 @@ export default {
.tree {
left: -200px !important;
}
.tree-right {
width: calc(~'100% - 15px') !important;
}
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+13 -1
View File
@@ -3,11 +3,15 @@
<div id="EnterpriseStandardDatabase" :class="{ 'tree-close': sideClose }" class="v-class">
<!--左侧树-->
<div class="tree-content" :class="{ 'tree-closed': sideClose }" >
<div class="tree">
<div style="width: 100%">
<el-input
placeholder="输入树状图体系"
v-model="filterText">
</el-input>
<div class="tree">
<el-card style="height: 100%;padding-right: 120px;">
<el-tree
ref="tree"
node-key="id"
@@ -47,6 +51,8 @@
</span>
</span>
</el-tree>
</el-card>
</div>
</div>
<div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
<!--切换折叠样式-->
@@ -4132,6 +4138,12 @@ export default {
background: #fff;
.tree {
/deep/ .el-card__body{
padding: 0 !important;
}
.el-card{
min-width: min-content;
}
width: 95%;
position: absolute;
left: 0;
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+14 -3
View File
@@ -2,11 +2,14 @@
<template>
<div id="foreignStandardsAndRegulations" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
<div class="tree-content" :class="{ 'tree-closed': sideClose }">
<div class="tree">
<div style="width: 100%">
<el-input
placeholder="输入树状图体系"
v-model="filterText">
</el-input>
<div class="tree">
<el-card style="height: 100%;padding-right: 120px;">
<el-tree
ref="tree"
node-key="id"
@@ -22,8 +25,7 @@
:expand-on-click-node="false">
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
<span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
<span v-if="node.label.length<15"> {{ node.label}} </span>
<span v-else> {{ node.label.substring(0,15)+'...'}} </span>
<span> {{ node.label}} </span>
<span>
<el-button
type="text"
@@ -49,6 +51,9 @@
</span>
</span>
</el-tree>
</el-card>
</div>
</div>
<div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
<!--切换折叠样式-->
@@ -4662,6 +4667,12 @@ export default {
width: 20%;
position: relative;
.tree {
/deep/ .el-card__body {
padding: 0 !important;
}
.el-card{
min-width: min-content;
}
width: calc(~'100% - 15px');
position: absolute;
left: 0;
src/pages/regulatoryRepository/standardForComments/index.vue
+1
View File
@@ -142,6 +142,7 @@ export default {
// 查询表格
sarStandCompareHis() {
this.spinShow = true;
this.standCommonlySearch.type = 1;
var form = this.standCommonlySearch;
this.$http.get("slrs/sar-public-idea/SelectAllPage", form, {
_this: this