@@ -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;
diff --git a/src/common/axios/index.js b/src/common/axios/index.js
index b8f6b49de..9ae28b5be 100644
--- a/src/common/axios/index.js
+++ b/src/common/axios/index.js
@@ -58,6 +58,14 @@ _axios.interceptors.request.use(
*/
_axios.interceptors.response.use(
res => {
+ // IE 8-9
+ if (res.data == null && res.config.responseType === 'json' && res.request.responseText != null) {
+ try {
+ res.data = JSON.parse(res.request.responseText);
+ } catch (e) {
+ // ignored
+ }
+ }
if(res.data && res.data.respCode && res.data.respCode === 'LE505'){
window.sessionStorage.clear()
messageOnce.warning({
diff --git a/src/common/axiosV2/index.js b/src/common/axiosV2/index.js
index b01174d05..8e4f0790a 100644
--- a/src/common/axiosV2/index.js
+++ b/src/common/axiosV2/index.js
@@ -53,6 +53,14 @@ service.interceptors.request.use(
*/
service.interceptors.response.use(
res => {
+ // IE 8-9
+ if (res.data == null && res.config.responseType === 'json' && res.request.responseText != null) {
+ try {
+ res.data = JSON.parse(res.request.responseText);
+ } catch (e) {
+ // ignored
+ }
+ }
if(res.data && res.data.respCode != undefined && res.data.respCode === 'LE505'){
window.sessionStorage.clear()
messageOnce.warning({
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 37812b30c..069747414 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -175,10 +175,10 @@
path: '/nonConfomity',
menuId: '0119abd677e0204e061eb0f0b8cafda0'
},
- {
- title: '工作组',
- path: '/workingGroup',
- },
+ // {
+ // title: '工作组',
+ // path: '/workingGroup',
+ // },
// {
// title: '备案产品标准库',
// path: '/enterpriseStandardFiling',
@@ -465,7 +465,9 @@
},
computed: {
logo () {
- return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo5.png')
+ // background: url("~@/assets/images/shangqi/home/logo2.png") no-repeat;
+ // return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo5.png')
+ return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png')
},
...mapGetters(['getDynamicTotal', 'isCollapse'])
},
@@ -510,8 +512,9 @@
padding: 10px;
text-align: left;
img {
- width: 115px;
- height: 40px;
+ width: 160px;
+ height: 61px;
+ margin-top: -7px;
}
}
}
diff --git a/src/components/personalCenter/index.vue b/src/components/personalCenter/index.vue
index a22948f90..636543c87 100644
--- a/src/components/personalCenter/index.vue
+++ b/src/components/personalCenter/index.vue
@@ -107,7 +107,6 @@ export default {
.header-left {
text-align: left;
//width: 50%;
-
.logo {
display: inline-block;
width: 160px;
@@ -119,9 +118,10 @@ export default {
}
.header-center{
width: 70%;
+ margin-left: 60px;
}
.header-right {
- //width: 49%;
+ width: 49%;
text-align: right;
line-height: 61px;
height: 61px;
diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index 244d8450e..cf1d1930e 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -3,19 +3,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -275,7 +290,6 @@ export default {
}, {}, res => {
if (res.ok) {
this.$message.success('配置岗位成功')
-
this.modalPost = false
this.getData()
}
@@ -351,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,
@@ -379,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) => {
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index e3656326e..3bbd4c9cf 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -124,8 +124,8 @@
:key="fileIndex"
>
{{ file.oldFileName }}
-
-
+
+
上传时间：{{ dateFormat(file.modifyTime) }}
diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue
index 3fe4a1059..543adaa4a 100644
--- a/src/pages/home1/components/release/index.vue
+++ b/src/pages/home1/components/release/index.vue
@@ -28,7 +28,7 @@ export default {
mounted() {
this.getDate()
this.getAdvice()
- this.addDate()
+ // this.addDate()
},
methods: {
// 点击查看
diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue
index b3b3d089f..62081407a 100644
--- a/src/pages/home2/components/release/index.vue
+++ b/src/pages/home2/components/release/index.vue
@@ -56,7 +56,7 @@ export default {
mounted() {
this.getDate()
this.getAdvice()
- this.addDate()
+ // this.addDate()
},
methods: {
// 点击查看
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
index c24f4f472..5920e1055 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
@@ -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"
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 7bc6df506..72276a5e1 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -50,7 +50,7 @@
type="primary"
class="common-button-primary"
size="small"
- v-btn-permission="'d1b1bffb39a67dea0d452a8ba4e3ae35'"
+ v-btn-permission="'b1ac4fb12eeb08c525b018ef839dbd40'"
@click="getLocalProductTableBtn">查询
@@ -58,7 +58,7 @@
清空
@@ -67,7 +67,7 @@
type="primary"
class="common-button-primary"
size="mini"
- v-btn-permission="'e5ca15122f554414e6365eb09efac5c4'"
+ v-btn-permission="'11a6fc355f457eff8ad70278224a2f3b'"
@click="selectMoreBtn"
>高级查询
@@ -195,11 +195,11 @@
-
+
查看
-
-
+
+
发起确认流程
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 6fb4a4ee4..6a1a49764 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -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"
>导出
diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue
index 4cff101d9..3d2404d61 100644
--- a/src/pages/regulatoryRepository/standardForComments/index.vue
+++ b/src/pages/regulatoryRepository/standardForComments/index.vue
@@ -41,12 +41,13 @@
type="primary"
size="mini"
class="common-button-primary"
-
+ v-btn-permission="'0514cd2c6b0e6311a7632f8bef87aecb'"
@click="sarStandCompareHisInfo">查询
清空
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index e23f60f14..8560988e7 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -2634,7 +2634,7 @@
text-align: center;
}
.header{
- height: 50px;
+ //height: 50px;
.home-header{
height: 100%;
}