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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-03-21 15:16:29 +08:00
parent 6323c7fe02 55d3bcb1f6
commit d096510113
39 changed files with 3591 additions and 3550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+2 -2
View File
@@ -163,12 +163,12 @@
v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准
</el-button>
<el-button class="common-button-default"
v-btn-permission="''"
v-btn-permission="'e7727b0018f886127174227cdbc58f28'"
size="mini"
@click="OCRAdd('0')"><i class="iconfont">&#xe611;</i>OCR
</el-button>
<el-button class="common-button-default"
v-btn-permission="''"
v-btn-permission="'9b718444ea1f163e8ccd492396cc9234'"
size="mini"
@click="OCRAdd('1')"><i class="iconfont">&#xe611;</i>拆分
</el-button>
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+2 -2
View File
@@ -275,11 +275,11 @@
</el-button>
<el-button class="common-button-default"
size="mini" @click="OCRAdd('2')"
v-btn-permission="'247cebaefa7cf1683092af160af11502'"><i class="iconfont">&#xe611;</i>编辑
v-btn-permission="'dd4ea796dab7a01b105ba657b1968a84'"><i class="iconfont">&#xe611;</i>编辑
</el-button>
<el-button class="common-button-default"
size="mini" @click="selectBuss()" style="float: right;margin-top: 11px;"
v-btn-permission="''"><i class="iconfont">&#xe606;</i>企标复审计划
v-btn-permission="'76742566e1cf930f384ef78cecb86f61'"><i class="iconfont">&#xe606;</i>企标复审计划
</el-button>
</div>
<!--表格-->
src/pages/regulatoryRepository/nonConfomity/index.vue
+39 -16
View File
@@ -2,11 +2,11 @@
<template>
<div id="non-cnfomity" >
<div class="non-content">
<el-tabs v-model="activeName" @tab-click="handleClick" style="height: 100%">
<el-tab-pane label="未符合项整改数据库" name="database">
<el-tabs v-model="tabValue" @tab-click="handleClick" style="height: 100%">
<el-tab-pane label="未符合项整改数据库" name="database" v-if="database">
<rectification-database></rectification-database>
</el-tab-pane>
<el-tab-pane label="重点问题项管控" name="keynote">
<el-tab-pane label="重点问题项管控" name="keynote" v-if="keynote">
<key-issues :keynoteActiveName="keynoteActiveName"></key-issues>
</el-tab-pane>
</el-tabs>
@@ -22,30 +22,53 @@
keyIssues,
rectificationDatabase,
},
data () {
data() {
return {
activeName: 'database',
keynote: false,
database: false,
menuName: ["未符合项整改数据库", "重点问题项管控"],
tabValue: '',
keynoteActiveName: 'cause'
}
},
methods: {
handleClick(tab, event) {
},
getActiveName(){
if (this.$route.query.activeName){
this.activeName = this.$route.query.activeName
}
if (this.$route.query.keynoteActiveName){
this.keynoteActiveName = this.$route.query.keynoteActiveName
}
console.log('35',this.keynoteActiveName)
}
// getActiveName() {
// if (this.$route.query.activeName) {
// this.activeName = this.$route.query.activeName
// }
// if (this.$route.query.keynoteActiveName) {
// this.keynoteActiveName = this.$route.query.keynoteActiveName
// }
// console.log('35', this.keynoteActiveName)
// }
},
created() {
this.getActiveName()
// this.getActiveName()
},
mounted () {
var list = [];
const menuList = this.$store.getters.getMenuList;
let menuData = [];
let menuID = ["ff7bc984c8115204bba04090f350b19c", "e02897e9ab6b1a72f49c47c07b5be9a5"];
this.menuName.forEach(item => {
for (let i = 0; i < menuList.length; i++) {
let entity = menuList[i];
if (item !== entity.menuName) continue;
if (menuID.indexOf(entity.id) >= 0 && menuData.indexOf(entity.id) === -1) {
menuData.push(entity.id);
if (entity.id === "ff7bc984c8115204bba04090f350b19c") {
this.database = true
} else if (entity.id === "e02897e9ab6b1a72f49c47c07b5be9a5") {
this.keynote = true
}
}
}
});
this.tabValue = this.database ? 'database' : (this.keynote ? 'keynote' : (this.tracking ? 'listTracking' : (this.other ? 'listOther' : (this.library ? 'localProductsOrProjectLibrary' : ''))))
},
watch: {},
mounted () {}
}
</script>
<style lang="less" scoped>
src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue
+2 -2
View File
@@ -75,7 +75,7 @@
type="primary"
class="common-button-primary"
size="mini"
v-btn-permission="'aff4a409c3c3856986c535a5f4782b13'"
v-btn-permission="'dd74d2cb03c9f31074c5ea06c57c89cb'"
@click="searchSarAccessBtn('')">
查询
</el-button>
@@ -84,7 +84,7 @@
<el-button
class="common-button-default"
size="mini"
v-btn-permission="'66fa37fc93e298b03d272fe17aeca6de'"
v-btn-permission="'3f5fe30d457f714c9cf68ec48b2887ec'"
@click="clearAllSearch">清空
</el-button>
</el-form-item>
src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue
+1 -1
View File
@@ -90,7 +90,7 @@
class="common-button-primary"
type="primary"
size="mini"
v-btn-permission="''"
v-btn-permission="'013dc790d5438d2fa93a03eabf641318'"
title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
><i class="iconfont">&#xe6e9;</i>导出
</el-button>
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+5 -5
View File
@@ -33,6 +33,7 @@
type="primary"
size="mini"
class="common-button-primary"
v-btn-permission="'904b8b52d0c9d76e3622531d9d5a9f0e'"
@click="getTableBtn">
查询
</el-button>
@@ -41,6 +42,7 @@
<el-button
size="mini"
class="common-button-default"
v-btn-permission="'af79900eebf9360eea4ed45f257dae0c'"
@click="clearAllSearch">清空</el-button>
</el-form-item>
</el-form>
@@ -76,7 +78,7 @@
</el-table-column>
<el-table-column
prop="standName"
width="180px"
min-width="300px"
align="center"
label="标准名称">
<template slot-scope="scope">
@@ -103,19 +105,17 @@
</el-table-column>
<el-table-column
prop="productName"
width="150"
min-width="200"
align="center"
label="项目名称">
</el-table-column>
<el-table-column
prop="responsibleUnit"
width="150"
align="center"
label="责任部门">
</el-table-column>
<el-table-column
prop="dutyEngineerName"
width="150"
align="center"
label="责任工程师">
</el-table-column>
@@ -132,7 +132,7 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
<el-dropdown-item v-btn-permission="'24e7400242307a236cc50bbec1796d26'" :command="[scope.row, '查看']">查看</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue
+3 -1
View File
@@ -58,6 +58,7 @@
type="primary"
size="mini"
class="common-button-primary"
v-btn-permission="'e1be15b50bc9493f20c38ad678699422'"
@click="getTableBtn">
查询
</el-button>
@@ -66,6 +67,7 @@
<el-button
size="mini"
class="common-button-default"
v-btn-permission="'8dbef1803c841b8dadbed619d3cbf249'"
@click="clearAllSearch">清空</el-button>
</el-form-item>
</el-form>
@@ -154,7 +156,7 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
<el-dropdown-item v-btn-permission="'41f76602450a4f4fa4516b6c35eb3b75'" :command="[scope.row, '查看']">查看</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+2 -2
View File
@@ -55,7 +55,7 @@
class="common-button-primary"
size="small"
type="primary"
v-btn-permission="''"
v-btn-permission="'0021d017199b2b57c953671fa09e1677'"
@click="addModel"
><i class="el-icon-plus"></i>新增
</el-button>
@@ -188,7 +188,7 @@
<el-dropdown-item :command="[scope.row, '查看']"
v-btn-permission="'374cb5206597fa201e57f561ff2f8ed7'">查看
</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="''">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'bcd9e2881cc174e5aef98bf0e54694e9'">编辑</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>