Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 1.9 KiB |
+1
-1
@@ -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">
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
@@ -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: {
|
||||||
//截取时间
|
//获取当前年月日
|
||||||
getDate (date) {
|
addDate() {
|
||||||
return date != null ? date.substring(0, date.indexOf(' ')) : ''
|
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() {
|
getAdvice() {
|
||||||
this.$http.get('slrs/sar-public-idea/SelectAllPage', {}, {
|
this.$http.get("slrs/sar-public-idea/SelectAllPage", {
|
||||||
_this: this
|
page: 1,
|
||||||
}, res => {
|
size: 1000,
|
||||||
this.domesticDynamics = res.data.records
|
}, {
|
||||||
}, e => {
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
this.domesticDynamics = res.data.records
|
||||||
|
}, 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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+100
-100
@@ -6,42 +6,42 @@
|
|||||||
<el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form">
|
<el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form">
|
||||||
<el-form-item label="国家/地区" class="search-item search-item-last">
|
<el-form-item label="国家/地区" class="search-item search-item-last">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="sarSarAccessEOSearch.countryArea"
|
v-model="sarSarAccessEOSearch.countryArea"
|
||||||
placeholder="请选择"
|
placeholder="请选择"
|
||||||
filterable
|
filterable
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in countryOptions"
|
v-for="item in countryOptions"
|
||||||
:value="item.value"
|
:value="item.value"
|
||||||
:key="item.value"
|
:key="item.value"
|
||||||
:label="item.label"
|
:label="item.label"
|
||||||
>
|
>
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="清单名称" class="search-item search-item-last">
|
<el-form-item label="清单名称" class="search-item search-item-last">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="sarSarAccessEOSearch.detailedListName"
|
v-model="sarSarAccessEOSearch.detailedListName"
|
||||||
placeholder="请输入清单名称"
|
placeholder="请输入清单名称"
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item class="search-item btn-box">
|
<el-form-item class="search-item btn-box">
|
||||||
<el-button
|
<el-button
|
||||||
:loading="searching"
|
:loading="searching"
|
||||||
type="primary"
|
type="primary"
|
||||||
class="common-button-primary"
|
class="common-button-primary"
|
||||||
size="small"
|
size="small"
|
||||||
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
|
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
|
||||||
@click="searchSarAccess">
|
@click="searchSarAccess">
|
||||||
查询
|
查询
|
||||||
</el-button>
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item class="search-item btn-box">
|
<el-form-item class="search-item btn-box">
|
||||||
<el-button
|
<el-button
|
||||||
class="common-button-default"
|
class="common-button-default"
|
||||||
size="small"
|
size="small"
|
||||||
v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
|
v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
|
||||||
@click="clearSearch">清空
|
@click="clearSearch">清空
|
||||||
</el-button>
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
@@ -49,59 +49,59 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="action-bar">
|
<div class="action-bar">
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
class="common-button-primary add-button"
|
class="common-button-primary add-button"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="openModal(null,'addOpt')"
|
@click="openModal(null,'addOpt')"
|
||||||
v-btn-permission="'7aaf236bdf6b1657c615380f7f34b8a8'"
|
v-btn-permission="'7aaf236bdf6b1657c615380f7f34b8a8'"
|
||||||
><i class="iconfont"></i>新增
|
><i class="iconfont"></i>新增
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
class="common-button-default delete-button"
|
class="common-button-default delete-button"
|
||||||
:loading="delLoading"
|
:loading="delLoading"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="deleteSarAccess('demore',null)"
|
@click="deleteSarAccess('demore',null)"
|
||||||
v-btn-permission="'562e58cc3a960096cf3321e631293dc9'"
|
v-btn-permission="'562e58cc3a960096cf3321e631293dc9'"
|
||||||
><i class="iconfont"></i>批量删除
|
><i class="iconfont"></i>批量删除
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<loading :loading="tableLoading">数据获取中</loading>
|
<loading :loading="tableLoading">数据获取中</loading>
|
||||||
<el-table
|
<el-table
|
||||||
:data="sarAccessListDatas"
|
:data="sarAccessListDatas"
|
||||||
tooltip-effect="dark"
|
tooltip-effect="dark"
|
||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
border
|
border
|
||||||
height="100%"
|
height="100%"
|
||||||
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
|
||||||
fontWeight: 'bold', height: '48px'}"
|
fontWeight: 'bold', height: '48px'}"
|
||||||
@selection-change="selectOne"
|
@selection-change="selectOne"
|
||||||
ref="selection"
|
ref="selection"
|
||||||
>
|
>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
type="selection"
|
type="selection"
|
||||||
width="55"
|
width="55"
|
||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="countryAreaShow"
|
prop="countryAreaShow"
|
||||||
label="国家/地区"
|
label="国家/地区"
|
||||||
align="center">
|
align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="detailedListName"
|
prop="detailedListName"
|
||||||
label="清单名称"
|
label="清单名称"
|
||||||
align="center"
|
align="center"
|
||||||
width="260px"
|
width="260px"
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
|
<a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="detailedListState"
|
prop="detailedListState"
|
||||||
label="清单状态"
|
label="清单状态"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span v-if="scope.row.detailedListState === '0'">未发布</span>
|
<span v-if="scope.row.detailedListState === '0'">未发布</span>
|
||||||
<span v-if="scope.row.detailedListState === '1'">已发布</span>
|
<span v-if="scope.row.detailedListState === '1'">已发布</span>
|
||||||
@@ -109,31 +109,31 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="detailedListVision"
|
prop="detailedListVision"
|
||||||
label="清单版本"
|
label="清单版本"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span
|
<span
|
||||||
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
|
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
|
||||||
scope.row.detailedListVision
|
scope.row.detailedListVision
|
||||||
}}</span>
|
}}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="updateTime"
|
prop="updateTime"
|
||||||
label="更新时间"
|
label="更新时间"
|
||||||
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>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="updatePeople"
|
prop="updatePeople"
|
||||||
label="更新人"
|
label="更新人"
|
||||||
align="center">
|
align="center">
|
||||||
</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">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@@ -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++) {
|
k[m] = map.get(k[m]);
|
||||||
if (this.countryOptions[i].value === k[m]) {
|
item.countryAreaShow = k.join(",");
|
||||||
k[m] = this.countryOptions[i].label
|
|
||||||
}
|
|
||||||
item.countryAreaShow = k.join(',')
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
});
|
||||||
this.sarAccessListDatas = arr
|
this.tableLoading = false;
|
||||||
this.tableLoading = false
|
this.sarAccessListDatas = arr;
|
||||||
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 => {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,55 +2,58 @@
|
|||||||
<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>
|
||||||
<el-tree
|
<div class="tree">
|
||||||
ref="tree"
|
<el-card style="height: 100%;padding-right: 120px;">
|
||||||
node-key="id"
|
<el-tree
|
||||||
class="tree-line"
|
ref="tree"
|
||||||
icon-class="icon-tree"
|
node-key="id"
|
||||||
:indent="0"
|
class="tree-line"
|
||||||
:props="props"
|
icon-class="icon-tree"
|
||||||
:data="treeList"
|
:indent="0"
|
||||||
highlight-current
|
:props="props"
|
||||||
@node-click="treeClick"
|
:data="treeList"
|
||||||
:filter-node-method="filterNode"
|
highlight-current
|
||||||
default-expand-all
|
@node-click="treeClick"
|
||||||
:expand-on-click-node="false">
|
:filter-node-method="filterNode"
|
||||||
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)"
|
default-expand-all
|
||||||
@mouseleave="mouseleave(data)">
|
:expand-on-click-node="false">
|
||||||
|
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(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"
|
||||||
size="mini"
|
size="mini"
|
||||||
v-show="data.show"
|
v-show="data.show"
|
||||||
@click="() => append(data)">
|
@click="() => append(data)">
|
||||||
新增
|
新增
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
type="text"
|
type="text"
|
||||||
size="mini"
|
size="mini"
|
||||||
v-show="data.show"
|
v-show="data.show"
|
||||||
@click="() => update(data)">
|
@click="() => update(data)">
|
||||||
编辑
|
编辑
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
type="text"
|
type="text"
|
||||||
size="mini"
|
size="mini"
|
||||||
v-show="data.showDel"
|
v-show="data.showDel"
|
||||||
@click="() => remove(node, data)">
|
@click="() => remove(node, data)">
|
||||||
删除
|
删除
|
||||||
</el-button>
|
</el-button>
|
||||||
</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;
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-1
@@ -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;
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
Reference in New Issue
Block a user