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:
yanyizhou
2021-12-08 17:30:12 +08:00
parent dc5f5386b3 43ca5b8594
commit d3d19d9af0
3 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/roleTree/index.vue
+36 -19
View File
@@ -143,26 +143,33 @@
} }
}), }),
checkChange2 (row, type, c) { checkChange2 (row, type, c) {
if (type) { if (this.checkBox) {
this.nodeList.push(row.id)
} else { } else {
for (let a = 0; a < this.nodeList.length; a ++) { if (type) {
if (row.id === this.nodeList[a]) { this.nodeList.push(row.id)
this.nodeList.splice(a, 1) } else {
for (let a = 0; a < this.nodeList.length; a ++) {
if (row.id === this.nodeList[a]) {
this.nodeList.splice(a, 1)
}
} }
} }
} }
}, },
checkChange (row, type, c) { checkChange (row, type, c) {
if (type) { if (this.checkBox) {
this.nodeList.push(row.id)
} else { } else {
for (let a = 0; a < this.nodeList.length; a ++) { if (type) {
if (row.id === this.nodeList[a]) { this.nodeList.push(row.id)
this.nodeList.splice(a, 1) } else {
for (let a = 0; a < this.nodeList.length; a ++) {
if (row.id === this.nodeList[a]) {
this.nodeList.splice(a, 1)
}
} }
} }
} }
}, },
handleTreeDrawerCancel () { handleTreeDrawerCancel () {
this.filterText = '' this.filterText = ''
@@ -200,17 +207,27 @@
this.open1 = true this.open1 = true
}, },
drawerCheck (data) { drawerCheck (data) {
if (this.checkBox) { if (this.checkBox) { // 单选
// 单选判断 // 单选判断
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); let getlist = this.$refs.tree.getCheckedNodes()
if(getlist.length == 1) { if (getlist.length > 1) {
this.roleRow = getlist[0] this.$refs.tree.setCheckedKeys([])
} else { this.$refs.tree.setCheckedKeys([data.id])
this.$refs.tree.setCheckedKeys([data.id]); this.roleList = [data]
this.roleRow = this.$refs.tree.getCheckedNodes()[0] } else if (getlist.length === 0) {
this.roleList = [{}]
} else if (getlist.length === 1) {
this.roleList = [data]
} }
this.roleList = [this.roleRow] // var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
} else { // if(getlist.length == 1) {
// this.roleRow = getlist[0]
// } else {
// this.$refs.tree.setCheckedKeys([data.id])
// this.roleRow = this.$refs.tree.getCheckedNodes()[0]
// }
// this.roleList = [this.roleRow]
} else { // 多选
this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()) this.roleList = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes())
} }
}, },
src/pages/home2/components/empennage/index.vue
+2 -2
View File
@@ -7,7 +7,7 @@
</div> </div>
<div style="display: inline-block;width: 80%;text-align: center"> <div style="display: inline-block;width: 80%;text-align: center">
<el-row> <el-row>
<span v-for="(item, index) in linkListFirst" :key="index"> <span v-for="(item, index) in linkListFirst" :key="index" v-if="index < 5">
<el-col :span="4"> <el-col :span="4">
<!-- <img <!-- <img
style="height: 10px;width: 10px;margin-bottom: 3px" style="height: 10px;width: 10px;margin-bottom: 3px"
@@ -27,7 +27,7 @@
</span> </span>
</el-row> </el-row>
<el-row style="margin-bottom: 10px;"> <el-row style="margin-bottom: 10px;">
<span v-for="(item, index) in linkListSecond" :key="index"> <span v-for="(item, index) in linkListSecond" :key="index" v-if="index< 5">
<el-col :span="4"> <el-col :span="4">
<!-- <img <!-- <img
style="height: 10px;width: 10px;margin-bottom: 3px" style="height: 10px;width: 10px;margin-bottom: 3px"
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/technologyInvolveProject.vue
+6 -8
View File
@@ -14,12 +14,12 @@
placeholder="标准/政策名称查找" placeholder="标准/政策名称查找"
clearable></el-input> clearable></el-input>
</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-select v-model="sarProject.position" placeholder="请选择标准性质"> <!-- <el-select v-model="sarProject.position" placeholder="请选择标准性质">-->
<el-option value="1" label="国内"></el-option> <!-- <el-option value="1" label="国内"></el-option>-->
<el-option value="2" label="海外"></el-option> <!-- <el-option value="2" label="海外"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="" class="search-item btn-box"> <el-form-item label="" class="search-item btn-box">
<el-button class="common-button-primary" type="primary" size="mini" @click="searchStandAndLaws" v-btn-permission="'f3ea8cde1a7116aa7ba56ff33a19189f'">查询</el-button> <el-button class="common-button-primary" type="primary" size="mini" @click="searchStandAndLaws" v-btn-permission="'f3ea8cde1a7116aa7ba56ff33a19189f'">查询</el-button>
</el-form-item> </el-form-item>
@@ -173,7 +173,6 @@
style="width: 100%" style="width: 100%"
border border
:height="sarProStateTableHeight" :height="sarProStateTableHeight"
:default-sort = "{prop: 'specificItem', order: 'ascending'}"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}"> fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column <el-table-column
@@ -201,7 +200,6 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="specificItem" prop="specificItem"
sortable
label="具体章条"> label="具体章条">
</el-table-column> </el-table-column>
<el-table-column <el-table-column