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:
zhaokaiyao@91isoft.com
2021-11-08 15:13:27 +08:00
parent e6317f9a09 00ea0b74d5
commit 74e05a2fe7
22 changed files with 760 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+33 -39
View File
@@ -2,19 +2,20 @@
<template>
<div id="accessStandardsAndRegulations" class="v-class">
<el-tabs v-model="tabValue" style="height: 100%;">
<el-tab-pane v-for="(item,index) in list" :key="index" :label="item.label" :name="item.name">
<div v-if="tabValue === 'listOfCountries'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-of-countries></list-of-countries>
</div>
<div v-else-if="tabValue === 'listProject'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-project></list-project>
</div>
<div v-else-if="tabValue === 'listOther'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-other></list-other>
</div>
<div v-else-if="tabValue === 'localProductsOrProjectLibrary'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<local-products-or-project-library></local-products-or-project-library>
</div>
<el-tab-pane label="国家/地区清单" name="listOfCountries" v-if="country">
<list-of-countries></list-of-countries>
</el-tab-pane>
<el-tab-pane label="车型类别清单" name="listProject" v-if="project">
<list-project></list-project>
</el-tab-pane>
<el-tab-pane label="重点标准跟踪清单" name="listTracking" v-if="tracking">
<list-tracking></list-tracking>
</el-tab-pane>
<el-tab-pane label="其他清单" name="listOther" v-if="other">
<list-other></list-other>
</el-tab-pane>
<el-tab-pane label="项目清单" name="localProductsOrProjectLibrary" v-if="library">
<local-products-or-project-library></local-products-or-project-library>
</el-tab-pane>
</el-tabs>
</div>
@@ -23,6 +24,7 @@
<script>
import listOfCountries from "../accessStandardsAndRegulations/page/listOfCountries";
import listProject from "../accessStandardsAndRegulations/page/listProject";
import listTracking from "../accessStandardsAndRegulations/page/listTracking";
import listOther from "../accessStandardsAndRegulations/page/listOther";
import localProductsOrProjectLibrary from "../localProductsOrProjectLibrary/index";
@@ -30,15 +32,22 @@ export default {
name: "AccessStandardsAndRegulations",
data() {
return {
country: false,
project: false,
tracking: false,
other: false,
library: false,
list: [],
tabValue: "listProject",
menuName: ["国家/地区清单", "车型类别清单", "其他清单", "项目清单"]
tabValue: "listOfCountries",
menuName: ["国家/地区清单", "车型类别清单", "重点标准跟踪清单", "其他清单", "项目清单"]
};
},
methods: {},
methods: {
},
components: {
localProductsOrProjectLibrary,
listOfCountries,
listTracking,
listProject,
listOther
},
@@ -49,7 +58,7 @@ export default {
var list = [];
const menuList = this.$store.getters.getMenuList;
let menuData = [];
let menuID = ["b05b562950cb6d0aef539fad30b7386a", "63e05705d0c8013162caa34f9fe52865", "a1170d77f4332e5f45ce520e63b00e15", "5a75523729b04102a565167004d640e9"];
let menuID = ["b05b562950cb6d0aef539fad30b7386a", "63e05705d0c8013162caa34f9fe52865","418123d180abf67bd2c46d5a694baaa5", "a1170d77f4332e5f45ce520e63b00e15", "5a75523729b04102a565167004d640e9"];
this.menuName.forEach(item => {
for (let i = 0; i < menuList.length; i++) {
let entity = menuList[i];
@@ -57,35 +66,20 @@ export default {
if (menuID.indexOf(entity.id) >= 0 && menuData.indexOf(entity.id) == -1) {
menuData.push(entity.id);
if (entity.id === "b05b562950cb6d0aef539fad30b7386a") {
list.push({
label: "国家/地区清单",
name: "listOfCountries"
});
continue;
this.country = true
} else if (entity.id === "63e05705d0c8013162caa34f9fe52865") {
list.push({
label: "车型类别清单",
name: "listProject"
});
continue;
this.project = true
}else if (entity.id === "418123d180abf67bd2c46d5a694baaa5") {
this.tracking = true
}else if (entity.id === "5a75523729b04102a565167004d640e9") {
list.push({
label: "其他清单",
name: "listOther"
});
continue;
this.other = true
} else if (entity.id === "a1170d77f4332e5f45ce520e63b00e15") {
list.push({
label: "项目清单",
name: "localProductsOrProjectLibrary"
});
continue;
this.library = true
}
}
}
});
this.list = list;
this.tabValue = this.list[0].name;
this.list = list
},
beforeRouteLeave(to, from, next) {
const toName = ["ListOfStandardsAndRegulationsDetails", "AccessStandardDetails", "LocalProductDetail", "OtherAddEit"];
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+3 -3
View File
@@ -292,16 +292,16 @@ export default {
},
pageChange(page) {
this.sarSarAccessEOSearch.page = page;
// this.searchSarAccess();
this.searchSarAccess();
},
pageSizeChange(pageSize) {
this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
// this.searchSarAccess();
this.searchSarAccess();
},
clearSearch() {
this.sarSarAccessEOSearch.countryArea = "";
this.sarSarAccessEOSearch.detailedListName = "";
// this.searchSarAccess();
this.searchSarAccess();
},
// 新增相关
openModal(row, optType) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+3 -3
View File
@@ -286,16 +286,16 @@ export default {
},
pageChange(page) {
this.sarSarAccessEOSearch.page = page;
// this.searchSarAccess();
this.searchSarAccess();
},
pageSizeChange(pageSize) {
this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
// this.searchSarAccess();
this.searchSarAccess();
},
clearSearch() {
this.sarSarAccessEOSearch.detailedList = ''
this.sarSarAccessEOSearch.detailedListName = ''
// this.searchSarAccess();
this.searchSarAccess();
},
// 新增相关
openModal(row, optType) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+3 -3
View File
@@ -304,17 +304,17 @@ export default {
},
pageChange(page) {
this.sarSarAccessEOSearch.page = page;
// this.searchSarAccess();
this.searchSarAccess();
},
pageSizeChange(pageSize) {
this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent;
// this.searchSarAccess();
this.searchSarAccess();
},
//清空
clearSearch() {
this.sarSarAccessEOSearch.projectName = ''
this.sarSarAccessEOSearch.detailedListName = ''
// this.searchSarAccess()
this.searchSarAccess()
},
// 新增相关
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+26 -5
View File
@@ -303,6 +303,7 @@ import eventHub from "@/common/eventHub";
import ProjectRelatedPersonnel from "@/components/CustomFormComponents/ProjectRelatedPersonnel";
import { dateFormat } from "@/common/date/index";
import moment from "moment";
import { solostarData } from "@/api/unqualProcess";
function checkFD(rules, value, callback) {
this.value = value;
@@ -850,7 +851,11 @@ export default {
}
],
threeOptions: [],
loading: false
loading: false,
// 项目分类数组
notProjectData: [],
projectData: []
};
},
methods: {
@@ -880,7 +885,7 @@ export default {
this.energyKindOptions = res.data.ENERGYTYPES;
this.protypeOptions = res.data.PROTYPE;
this.probaseOptions = res.data.PROBASE;
this.productTypeOptions = res.data.XMLB;
// this.productTypeOptions = res.data.XMLB;
this.targetMarketOptions = res.data.SCXX;
})
},
@@ -1207,11 +1212,12 @@ export default {
}, res => {
if (this.localProTableSearch.prodectCode === "Maintenance") {
this.localProTableList = res.data.Maintenance.records;
this.productTypeOptions = this.projectData
this.total = res.data.Maintenance.total;
} else if (this.localProTableSearch.prodectCode === "notMaintenance") {
this.localProTableList = res.data.notMaintenance.records;
this.productTypeOptions = this.notProjectData
this.total = res.data.notMaintenance.total;
}
// this.localProTableList.map((item) => {
// this.xmztOptions.map((opr) => {
@@ -1385,7 +1391,6 @@ export default {
},
// 分页点击后方法
pageChange(page) {
console.log(page);
this.page = page;
this.getLocalProductTable();
},
@@ -1538,10 +1543,26 @@ export default {
});
this.localProEO.productManager = userIdList.join(",");
this.localProEO.productManagerShow = userNameList.join(",");
},
selectSort() {
solostarData().then(res=>{
res.data.MaintenanceProjectStatus.forEach((item, index)=>{
this.projectData.push({
label: item,
value: index
})
})
res.data.notMaintenanceProjectStatus.forEach((item, index)=>{
this.notProjectData.push({
label: item,
value: index
})
})
})
}
},
created() {
console.log(this.productTypeOptions)
this.selectSort()
this.getDept().then(res => {
this.getUser(res);
}, e => {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+1 -1
View File
@@ -1065,7 +1065,7 @@ export default {
}
.pagination {
position: unset;
position: absolute!important;
}
.el-steps.el-steps--simple {
src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
+6 -4
View File
@@ -50,6 +50,11 @@
})
},
handleNodeClick (node) {
let json = {
id: '123',
name: '123',
}
},
handleEdgeClick (node) {},
renderGraph(row) {
@@ -182,11 +187,8 @@
{
type: 'collapse-expand',
onChange: function onChange(item, collapsed) {
console.log(1);
const data = item.get('model');
const icon = item.get('group').find((element) => element.get('name') === 'collapse-icon');
console.log(data);
console.log(icon);
if (collapsed) {
icon.attr('symbol', G6.Marker.expand);
} else {
@@ -197,7 +199,7 @@
},
shouldBegin: (e) => {
const target = e.target
const nodeType = target.cfg.nature
const nodeType = target.cfg.name
if (nodeType === 'collapse-icon') return true;
return false;
}
src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
+5 -1
View File
@@ -77,7 +77,9 @@
// }
// this.$message.success('节点被点击' + data.name)
},
handleEdgeClick (node) {},
handleEdgeClick (node) {
console.log(4);
},
renderGraph() {
G6.registerNode(
'tree-node',
@@ -281,6 +283,7 @@
},
handleGraphDraw () {},
handleGraphNodeClickEvent(graph) {
console.log(1);
// 点击节点
graph.on('node:click', (e) => {
// 先将所有当前是 click 状态的节点置为非 click 状态
@@ -294,6 +297,7 @@
});
},
handleGraphEdgeClickEvent(graph) {
console.log(2);
// 点击边
graph.on('edge:click', (e) => {
// 先将所有当前是 click 状态的边置为非 click 状态