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-10-19 09:03:01 +08:00
parent e36c3f092b 9fa4cce190
commit 0413a1adec
9 changed files with 74 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.vue
+7 -7
View File
@@ -191,7 +191,7 @@
return
}
if (userInfoModifyTimeInLocalStorage === null) {
if (userInfoModifyTimeInLocalStorage === null && webLoginType === 'idm') {
this.$store.dispatch('syncStorageData')
const currentPage = this.$route.name
@@ -206,7 +206,7 @@
});
this.messageForLogin && this.messageForLogin.close()
this.messageForLogin = this.$message({
message: `用户已退出，${this.currentMinute}秒后将跳转到登录页面`,
message: `用户已退出，${this.currentMinute}秒后将跳转到登录1页面`,
type: 'warning'
})
@@ -216,14 +216,14 @@
clearInterval(this.intervalForLogin)
this.loading.close()
this.$router.push('/login')
console.log('切换到登录页面', currentPage)
this.$router.push('/login')
console.log('切换到登录页面', currentPage)
}
this.currentMinute--
this.messageForLogin.message = `用户已退出，${this.currentMinute}秒后将跳转到登录页面`
}, 1000)
}, 0)
} else if (userInfoModifyTime !== userInfoModifyTimeInLocalStorage) {
} else if (userInfoModifyTime !== userInfoModifyTimeInLocalStorage && webLoginType === 'idm') {
this.$store.dispatch('syncStorageData')
console.log('用户信息已更改，同步数据')
@@ -308,7 +308,7 @@
flex-direction: column;
.container-box {
position: relative;
height: calc(~'100% - 50px');
height: calc(~'100% - 65px');
//flex: 1;
background: #F4F4F4;
overflow-y: auto;
src/pages/config/pages/mechanismManage/index.vue
+51 -2
View File
@@ -3,11 +3,26 @@
<div id="mechanism-manage" :class="{ 'tree-close': sideClose }" class="v-class">
<div class="tree-content" :class="{ 'tree-closed': sideClose }">
<div class="tree">
<!-- @keyup.enter.native="searchPeople"-->
<el-input
class="filter-tree-input"
placeholder="输入关键字进行过滤"
v-model="filterText">
</el-input>
<!-- <el-tree-->
<!-- node-key="id"-->
<!-- :data="treeData"-->
<!-- :props="defaultProps"-->
<!-- :default-checked-keys="nodeList"-->
<!-- :current-node-key="nodeKeyId"-->
<!-- highlight-current-->
<!-- check-strictly-->
<!-- :expand-on-click-node="false"-->
<!-- ref="tree"-->
<!-- :load="loadNode"-->
<!-- @node-click="handleNodeClick"-->
<!-- lazy>-->
<!-- </el-tree>-->
<el-tree
:data="treeData"
:props="defaultProps"
@@ -15,6 +30,7 @@
node-key="id"
:filter-node-method="filterNode"
highlight-current
default-expand-all
ref="tree"
:expand-on-click-node="false"
@node-click="handleNodeClick">
@@ -274,7 +290,6 @@ export default {
}, {}, res => {
if (res.ok) {
this.$message.success('配置岗位成功')
this.modalPost = false
this.getData()
}
@@ -350,6 +365,41 @@ export default {
this.id = data.id
this.getData()
},
// searchPeople(){
// console.log(this.filterText);
// },
// loadNode(node, resolve) {
// if (node.level === 0) {
// return resolve(this.treeData);
// }
// this.getChildren(node, resolve)
// },
// getChildren (node, resolve) {
// this.id = node.key
// this.getData()
// this.$http.get('SarInstitution/institution/getNext', {
// institutionId: node.key
// }, {}, res => {
// let people = [];
// res.forEach(item => {
// if(item.disabled === true){
// people.push(item)
// }
// })
// resolve(people)
// })
// },
// getTree() {
// this.$http.get('SarInstitution/institution/getFirstInstitution', {}, {
// _this: this,
// loading: 'treeLoading'
// }, res => {
// this.treeData = res
// this.nodeKeyId = this.treeData[0].id
// this.treeLoading = false
// }, e => {
// })
// },
getTree() {
this.$http.get('SarInstitution/institution', {}, {
_this: this,
@@ -378,7 +428,6 @@ export default {
_this: this,
loading: 'Loading'
}, res => {
console.log(res.data)
res.data.records.forEach((item) => {
let NameList = ''
item.positions.forEach((items) => {
src/pages/details/otherBussStandardDetails/index.vue
+2 -2
View File
@@ -124,8 +124,8 @@
:key="fileIndex"
>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'0a0d0d1956ab6ca62a8efd6a1ff536ad'"/>
<i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'bfed56ba55181d154bfb4cd1cfbca806'"/>
<i title="下载" @click="downloadFile(file.id)" class="icon-download" v-btn-permission="'9882f477aad895ec56a7464f3e9c0b11'"/>
<i title="下载带水印" @click="downloadFileByWater(file.id, file.fileSuffix)" class="icon-download2" v-btn-permission="'9bab2662fbd9d0507b39be813371a597'"/>
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
</p>
<!-- <el-button-->
src/pages/home1/components/release/index.vue
+1 -1
View File
@@ -28,7 +28,7 @@ export default {
mounted() {
this.getDate()
this.getAdvice()
this.addDate()
// this.addDate()
},
methods: {
// 点击查看
src/pages/home2/components/release/index.vue
+1 -1
View File
@@ -56,7 +56,7 @@ export default {
mounted() {
this.getDate()
this.getAdvice()
this.addDate()
// this.addDate()
},
methods: {
// 点击查看
src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+3 -3
View File
@@ -32,7 +32,7 @@ export default {
return {
list: [],
tabValue: "listProject",
menuName: ["国家/地区清单", "项目类清单", "其他清单", "重点标准跟踪清单"]
menuName: ["国家/地区清单", "车型类别清单", "其他清单", "项目清单"]
};
},
methods: {},
@@ -49,7 +49,7 @@ export default {
var list = [];
const menuList = this.$store.getters.getMenuList;
let menuData = [];
let menuID = ["b05b562950cb6d0aef539fad30b7386a", "63e05705d0c8013162caa34f9fe52865", "418123d180abf67bd2c46d5a694baaa5", "5a75523729b04102a565167004d640e9"];
let menuID = ["b05b562950cb6d0aef539fad30b7386a", "63e05705d0c8013162caa34f9fe52865", "a1170d77f4332e5f45ce520e63b00e15", "5a75523729b04102a565167004d640e9"];
this.menuName.forEach(item => {
for (let i = 0; i < menuList.length; i++) {
let entity = menuList[i];
@@ -74,7 +74,7 @@ export default {
name: "listOther"
});
continue;
} else {
} else if (entity.id === "a1170d77f4332e5f45ce520e63b00e15") {
list.push({
label: "项目清单",
name: "localProductsOrProjectLibrary"
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+6 -6
View File
@@ -50,7 +50,7 @@
type="primary"
class="common-button-primary"
size="small"
v-btn-permission="'d1b1bffb39a67dea0d452a8ba4e3ae35'"
v-btn-permission="'b1ac4fb12eeb08c525b018ef839dbd40'"
@click="getLocalProductTableBtn">查询
</el-button>
</el-form-item>
@@ -58,7 +58,7 @@
<el-button
class="common-button-default"
size="small"
v-btn-permission="'10e3fdd2d816d64022f2928cd65b9bb1'"
v-btn-permission="'7238d3ca40d709ba6b089c9aaa560760'"
@click="clearAllSearch">清空
</el-button>
</el-form-item>
@@ -67,7 +67,7 @@
type="primary"
class="common-button-primary"
size="mini"
v-btn-permission="'e5ca15122f554414e6365eb09efac5c4'"
v-btn-permission="'11a6fc355f457eff8ad70278224a2f3b'"
@click="selectMoreBtn"
><i class="iconfont">&#xe7a5;</i>高级查询
</el-button>
@@ -195,11 +195,11 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'633e82816590af9027dc2fddc562d046'">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'881cfa2f3c898e0954d90ee7d521ed70'">
查看
</el-dropdown-item>
<!-- // 权限id 91ed4c216c019e869aad04baf7bc7db4-->
<el-dropdown-item :command="[scope.row, '发起确认流程']" v-btn-permission="''">
<!-- // 权限id -->
<el-dropdown-item :command="[scope.row, '发起确认流程']" v-btn-permission="'dd87f572b6c807b6982fa071fcbe0d41'">
发起确认流程
</el-dropdown-item>
</el-dropdown-menu>
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+1 -1
View File
@@ -54,7 +54,7 @@
type="primary"
class="common-button-default export-button"
size="mini" @click="exportStandard"
v-btn-permission="''"
v-btn-permission="'b46217ac825d49933b0f7349ba924ea7'"
title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
icon="export"
>导出
src/pages/regulatoryRepository/standardForComments/index.vue
+2 -1
View File
@@ -41,12 +41,13 @@
type="primary"
size="mini"
class="common-button-primary"
v-btn-permission="'0514cd2c6b0e6311a7632f8bef87aecb'"
@click="sarStandCompareHisInfo">查询
</el-button>
<el-button
class="common-button-default"
size="mini"
v-btn-permission="'bb7386429dabf20b8006e03efacc0673'"
@click="clearSearchStand">清空
</el-button>
</el-formItem>