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
public/favicon.ico
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

public/index.html
+1 -1
View File
@@ -8,7 +8,7 @@
<meta http-equiv="pragma" content="no-cache"> <meta http-equiv="pragma" content="no-cache">
<meta http-equiv="Cache-Control" content="no-cache, must-revalidate"> <meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
<meta http-equiv="expires" content="0"> <meta http-equiv="expires" content="0">
<title>全球标准法规系统</title> <title>标准法规管理系统</title>
<script src = "https://cdn.jsdelivr.net/npm/proxy-polyfill@0.3.0/proxy.min.js"></script> <script src = "https://cdn.jsdelivr.net/npm/proxy-polyfill@0.3.0/proxy.min.js"></script>
</head> </head>
<body class="el-drawer-body"> <body class="el-drawer-body">
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} .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 {position:absolute; visibility:hidden; top:0;text-align: left;padding: 2px;}
div#rMenu ul { div#rMenu ul {
src/pages/home1/components/solicitopinions/index.vue
+42 -21
View File
@@ -2,9 +2,9 @@
<template> <template>
<div class="solicitopinions"> <div class="solicitopinions">
<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" v-if="updateTime < item.endTime">
<a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cname }}</a> <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> </li>
</ul> </ul>
</div> </div>
@@ -12,62 +12,83 @@
<script> <script>
export default { export default {
name: 'Solicitopinions', name: "Solicitopinions",
components: {}, components: {},
mixins: [], mixins: [],
data() { data() {
return { return {
putTime: '', updateTime: "",
domesticDynamics: [], //标准征求意见数据 putTime: "",
} domesticDynamics: [] //标准征求意见数据
};
}, },
computed: {}, computed: {},
watch: {}, watch: {},
mounted() { mounted() {
this.getDate() this.getDate();
this.getAdvice() this.getAdvice();
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);
},
//截取时间 //截取时间
getDate (date) { getDate(date) {
return date != null ? date.substring(0, date.indexOf(' ')) : '' return date != null ? date.substring(0, date.indexOf(" ")) : "";
}, },
//获取数据 //获取数据
getAdvice() { getAdvice() {
this.$http.get('slrs/sar-public-idea/SelectAllPage', {}, { this.$http.get("slrs/sar-public-idea/SelectAllPage", {
page: 1,
size: 1000,
}, {
_this: this _this: this
}, res => { }, res => {
this.domesticDynamics = res.data.records this.domesticDynamics = res.data.records
}, e => { }, e => {
} ) });
}, },
standForComments (item) { standForComments(item) {
this.$store.commit('setDetailMap',this.$router.path) this.$store.commit("setDetailMap", this.$router.path);
this.$router.push({ this.$router.push({
name: 'consultationDetails', name: "consultationDetails",
query: { query: {
item: item item: item
} }
}) });
}, }
}, }
} };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.solicitopinions { .solicitopinions {
.time-title { .time-title {
margin: 15px; margin: 15px;
.time { .time {
float: right; float: right;
color:#FFFFFF; color: #FFFFFF;
} }
a { a {
color: #ffffff; color: #ffffff;
&:hover { &:hover {
color: #e9c851; color: #e9c851;
cursor:pointer; cursor: pointer;
text-decoration: underline; text-decoration: underline;
} }
} }
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+39 -39
View File
@@ -125,7 +125,7 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ <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> </div>
</template> </template>
@@ -186,7 +186,7 @@ export default {
selectedList: [], selectedList: [],
// 新增、编辑 准入信息字段 // 新增、编辑 准入信息字段
sarAccessEO: { sarAccessEO: {
relateFile: '', relateFile: "",
country: "", country: "",
applyArctic: "", applyArctic: "",
energyKind: "", energyKind: "",
@@ -197,14 +197,14 @@ export default {
drawerTotal: 0, // 抽屉分页的总条数 drawerTotal: 0, // 抽屉分页的总条数
sarAccessEORules: { sarAccessEORules: {
region: [ region: [
{required: true, message: "区域不能为空", trigger: "change"} { required: true, message: "区域不能为空", trigger: "change" }
], ],
country: [ country: [
{required: true, message: "国家不能为空", trigger: "change"} { required: true, message: "国家不能为空", trigger: "change" }
], ],
detailedListName: [ detailedListName: [
{required: true, message: "清单名称不能为空", trigger: "blur"}, { required: true, message: "清单名称不能为空", trigger: "blur" },
{type: "string", max: 100, message: "清单名称不能超过100个字符", trigger: "blur"} { type: "string", max: 100, message: "清单名称不能超过100个字符", trigger: "blur" }
] ]
}, },
countryOptions: [], countryOptions: [],
@@ -223,10 +223,10 @@ export default {
applyAuth: "" // 认证类型 applyAuth: "" // 认证类型
}, },
dataSourceOptions: [ dataSourceOptions: [
{value: "INLAND_STAND", label: "国内标准法规"}, { value: "INLAND_STAND", label: "国内标准法规" },
{value: "FOREIGN_STAND", label: "海外标准法规"}, { value: "FOREIGN_STAND", label: "海外标准法规" },
{value: "FOREIGN_LAWS", label: "国内外政策"}, { value: "FOREIGN_LAWS", label: "国内外政策" },
{value: "BUSINESS", label: "企业标准 "} { value: "BUSINESS", label: "企业标准 " }
], ],
tableLoading: true, tableLoading: true,
sarAccessInfoSearchList: [], sarAccessInfoSearchList: [],
@@ -263,29 +263,29 @@ export default {
sortKey: 1, sortKey: 1,
page: 1, page: 1,
pageSize: 10, pageSize: 10,
...this.sarSarAccessEOSearch, ...this.sarSarAccessEOSearch
}, { }, {
_this: this _this: this
}, res => { }, res => {
let arr = res.data.records; let arr = res.data.records;
let map = new Map();
this.countryOptions.forEach(item => {
map.set(item.value, item.label);
});
arr.forEach(item => { arr.forEach(item => {
// 国家地区转换 // 国家地区转换
if (item.countryArea !== null || item.countryArea !== "") { if (item.countryArea !== null || item.countryArea !== "") {
let k = (item.countryArea || "").split(',') let k = (item.countryArea || "").split(",");
for (let i in this.countryOptions) {
for (let m = 0; m < k.length; m++) { for (let m = 0; m < k.length; m++) {
if (this.countryOptions[i].value === k[m]) { k[m] = map.get(k[m]);
k[m] = this.countryOptions[i].label item.countryAreaShow = k.join(",");
}
item.countryAreaShow = k.join(',')
} }
} }
} });
}) this.tableLoading = false;
this.sarAccessListDatas = arr this.sarAccessListDatas = arr;
this.tableLoading = false this.sarSarAccessEOSearch.page = 1;
this.sarSarAccessEOSearch.page = 1 this.sarAccessListTotal = res.data.total;
this.sarAccessListTotal = res.data.total
}, e => { }, e => {
}); });
@@ -299,8 +299,8 @@ export default {
// this.searchSarAccess(); // this.searchSarAccess();
}, },
clearSearch() { clearSearch() {
this.sarSarAccessEOSearch.countryArea = '' this.sarSarAccessEOSearch.countryArea = "";
this.sarSarAccessEOSearch.detailedListName = '' this.sarSarAccessEOSearch.detailedListName = "";
// this.searchSarAccess(); // this.searchSarAccess();
}, },
// 新增相关 // 新增相关
@@ -311,29 +311,29 @@ export default {
}, },
// 批量删除 // 批量删除
deleteSarAccess(flag, id) { deleteSarAccess(flag, id) {
if (flag === 'delOne') { if (flag === "delOne") {
this.selectedList = []; this.selectedList = [];
this.selectedList[0] = id; this.selectedList[0] = id;
} }
if (this.selectedList.length === 0) { if (this.selectedList.length === 0) {
this.$message.warning('请选择要删除的数据') this.$message.warning("请选择要删除的数据");
} else { } else {
this.$confirm('确定删除这些数据？', '提示', { this.$confirm("确定删除这些数据？", "提示", {
confirmButtonText: '确定', confirmButtonText: "确定",
confirmButtonClass: 'common-button-primary', confirmButtonClass: "common-button-primary",
cancelButtonText: '取消', cancelButtonText: "取消",
type: 'warning', type: "warning"
}).then(() => { }).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.$http.postDelete(URL, {}, res => {
this.searchSarAccess(); this.searchSarAccess();
this.selectedList = []; this.selectedList = [];
this.$message.success('删除成功') this.$message.success("删除成功");
}, e => { }, e => {
}); });
}).catch(() => { }).catch(() => {
}) });
} }
}, },
// 表格选择框 // 表格选择框
@@ -356,7 +356,7 @@ export default {
}, },
// 点击 table编辑按钮 事件 // 点击 table编辑按钮 事件
editTable(item) { editTable(item) {
this.$store.commit('SET_ACCESS_STAND_REG_ROW', item) this.$store.commit("SET_ACCESS_STAND_REG_ROW", item);
this.$router.push({ this.$router.push({
name: "ListOfStandardsAndRegulationsDetails", name: "ListOfStandardsAndRegulationsDetails",
query: { query: {
@@ -370,8 +370,8 @@ export default {
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data) { setMap(data) {
data.forEach(item => { data.forEach(item => {
this.$set(this.countryAreaMap, item.value, item.label) this.$set(this.countryAreaMap, item.value, item.label);
}) });
} }
}, },
created() { created() {
@@ -385,7 +385,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.countryOptions = res.data.COUNTRY; this.countryOptions = res.data.COUNTRY;
this.setMap(this.countryOptions) this.setMap(this.countryOptions);
}, e => { }, e => {
}); });
} }
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+13 -5
View File
@@ -2,11 +2,13 @@
<template> <template>
<div id="domesticStandardDatabase" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class"> <div id="domesticStandardDatabase" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
<div class="tree-content" :class="{ 'tree-closed': sideClose }"> <div class="tree-content" :class="{ 'tree-closed': sideClose }">
<div class="tree"> <div style="width: 100%">
<el-input <el-input
placeholder="输入树状图体系" placeholder="输入树状图体系"
v-model="filterText"> v-model="filterText">
</el-input> </el-input>
<div class="tree">
<el-card style="height: 100%;padding-right: 120px;">
<el-tree <el-tree
ref="tree" ref="tree"
node-key="id" node-key="id"
@@ -24,8 +26,7 @@
@mouseleave="mouseleave(data)"> @mouseleave="mouseleave(data)">
<span <span
:class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
<span v-if="node.label.length<15"> {{ node.label}} </span> <span> {{ node.label}} </span>
<span v-else> {{ node.label.substring(0,15)+'...'}} </span>
<span> <span>
<el-button <el-button
type="text" type="text"
@@ -51,6 +52,8 @@
</span> </span>
</span> </span>
</el-tree> </el-tree>
</el-card>
</div>
</div> </div>
<div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }"> <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: url('~@/assets/images/shangqi/img/tree.png');
background-size: 100% 100%; background-size: 100% 100%;
} }
/deep/ .tree-line { /deep/ .tree-line {
.el-tree-node { .el-tree-node {
position: relative; position: relative;
@@ -5066,6 +5068,13 @@ export default {
position: relative; position: relative;
.tree { .tree {
/deep/.el-card__body {
padding: 0 !important;
}
.el-card {
min-width: min-content;
}
height: 95%;
width: calc(~'100% - 15px'); width: calc(~'100% - 15px');
position: absolute; position: absolute;
left: 0; left: 0;
@@ -5113,7 +5122,6 @@ export default {
.tree { .tree {
left: -200px !important; left: -200px !important;
} }
.tree-right { .tree-right {
width: calc(~'100% - 15px') !important; 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 id="EnterpriseStandardDatabase" :class="{ 'tree-close': sideClose }" class="v-class">
<!--左侧树--> <!--左侧树-->
<div class="tree-content" :class="{ 'tree-closed': sideClose }" > <div class="tree-content" :class="{ 'tree-closed': sideClose }" >
<div class="tree"> <div style="width: 100%">
<el-input <el-input
placeholder="输入树状图体系" placeholder="输入树状图体系"
v-model="filterText"> v-model="filterText">
</el-input> </el-input>
<div class="tree">
<el-card style="height: 100%;padding-right: 120px;">
<el-tree <el-tree
ref="tree" ref="tree"
node-key="id" node-key="id"
@@ -47,6 +51,8 @@
</span> </span>
</span> </span>
</el-tree> </el-tree>
</el-card>
</div>
</div> </div>
<div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }"> <div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
<!--切换折叠样式--> <!--切换折叠样式-->
@@ -4132,6 +4138,12 @@ export default {
background: #fff; background: #fff;
.tree { .tree {
/deep/ .el-card__body{
padding: 0 !important;
}
.el-card{
min-width: min-content;
}
width: 95%; width: 95%;
position: absolute; position: absolute;
left: 0; left: 0;
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+14 -3
View File
@@ -2,11 +2,14 @@
<template> <template>
<div id="foreignStandardsAndRegulations" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class"> <div id="foreignStandardsAndRegulations" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
<div class="tree-content" :class="{ 'tree-closed': sideClose }"> <div class="tree-content" :class="{ 'tree-closed': sideClose }">
<div class="tree"> <div style="width: 100%">
<el-input <el-input
placeholder="输入树状图体系" placeholder="输入树状图体系"
v-model="filterText"> v-model="filterText">
</el-input> </el-input>
<div class="tree">
<el-card style="height: 100%;padding-right: 120px;">
<el-tree <el-tree
ref="tree" ref="tree"
node-key="id" node-key="id"
@@ -22,8 +25,7 @@
:expand-on-click-node="false"> :expand-on-click-node="false">
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)"> <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 :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
<span v-if="node.label.length<15"> {{ node.label}} </span> <span> {{ node.label}} </span>
<span v-else> {{ node.label.substring(0,15)+'...'}} </span>
<span> <span>
<el-button <el-button
type="text" type="text"
@@ -49,6 +51,9 @@
</span> </span>
</span> </span>
</el-tree> </el-tree>
</el-card>
</div>
</div> </div>
<div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }"> <div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
<!--切换折叠样式--> <!--切换折叠样式-->
@@ -4662,6 +4667,12 @@ export default {
width: 20%; width: 20%;
position: relative; position: relative;
.tree { .tree {
/deep/ .el-card__body {
padding: 0 !important;
}
.el-card{
min-width: min-content;
}
width: calc(~'100% - 15px'); width: calc(~'100% - 15px');
position: absolute; position: absolute;
left: 0; left: 0;
src/pages/regulatoryRepository/standardForComments/index.vue
+1
View File
@@ -142,6 +142,7 @@ export default {
// 查询表格 // 查询表格
sarStandCompareHis() { sarStandCompareHis() {
this.spinShow = true; this.spinShow = true;
this.standCommonlySearch.type = 1;
var form = this.standCommonlySearch; var form = this.standCommonlySearch;
this.$http.get("slrs/sar-public-idea/SelectAllPage", form, { this.$http.get("slrs/sar-public-idea/SelectAllPage", form, {
_this: this _this: this