Skip to content

G
gs1
Commit 81f8b5a0 by tang
Options

feat: BUG修复

parent df4760e5
Showing with 54 additions and 50 deletions
babel.config.js
module.exports = { module.exports = {
presets: [ presets: [
["@vue/app", { ["@vue/app", {
"useBuiltIns": "entry",
"polyfills": [ "polyfills": [
"es6.promise", "es6.promise",
"es6.symbol" "es6.symbol"
], ]
"useBuiltIns": "entry"
}] }]
], ],
plugins: [ plugins: [
......
package.json
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
"fix-memory-limit": "cross-env LIMIT=3072 increase-memory-limit" "fix-memory-limit": "cross-env LIMIT=3072 increase-memory-limit"
}, },
"dependencies": { "dependencies": {
"@babel/polyfill": "^7.12.1",
"@popperjs/core": "^2.10.1", "@popperjs/core": "^2.10.1",
"@tweenjs/tween.js": "^18.5.0", "@tweenjs/tween.js": "^18.5.0",
"bootstrap": "^5.1.0", "bootstrap": "^5.1.0",
...@@ -41,6 +40,7 @@ ...@@ -41,6 +40,7 @@
"xss": "^1.0.6" "xss": "^1.0.6"
}, },
"devDependencies": { "devDependencies": {
"@babel/polyfill": "^7.12.1",
"@vue/cli-plugin-babel": "^3.12.1", "@vue/cli-plugin-babel": "^3.12.1",
"@vue/cli-plugin-eslint": "^3.12.1", "@vue/cli-plugin-eslint": "^3.12.1",
"@vue/cli-service": "^3.12.1", "@vue/cli-service": "^3.12.1",
......
src/components/layout/topBanner.vue
...@@ -32,7 +32,9 @@ ...@@ -32,7 +32,9 @@
<div class="top-banner-item tb-hover" @click="handleSearch"> <div class="top-banner-item tb-hover" @click="handleSearch">
<img src="../../assets/image/head/search.png" alt=""/> <img src="../../assets/image/head/search.png" alt=""/>
</div> </div>
<span @click="toAdmin" style="cursor: pointer;margin-left: 4px" v-if="user.username">{{ user.username }}</span> <!-- <span @click="toAdmin" style="cursor: pointer;margin-left: 4px" v-if="user.username">{{ user.username }}</span>-->
<img v-if="user.username" @click="toAdmin" style="width:22px;cursor: pointer;margin-left: 20px"
src="../../assets/image/mymanage/pic_touxiang.png" alt="">
</div> </div>
</div> </div>
</template> </template>
......
src/main.js
import '@babel/polyfill'
import Vue from "vue"; import Vue from "vue";
import App from "./App.vue"; import App from "./App.vue";
import '@babel/polyfill';
import router from "./router/index"; import router from "./router/index";
import store from "./vuex/store"; import store from "./vuex/store";
import $ from "jquery"; import $ from "jquery";
......
src/views/MyManage/UnVerify/uploadcalibration.vue
...@@ -20,13 +20,8 @@ ...@@ -20,13 +20,8 @@
<el-button type="primary" style="width: 110px">上传</el-button>查看检测校准申请历史上传文件 <el-button type="primary" style="width: 110px">上传</el-button>查看检测校准申请历史上传文件
<p style="margin-top:10px;">支持png，bmp，jpg格式，大小不限</p> <p style="margin-top:10px;">支持png，bmp，jpg格式，大小不限</p>
</span> </span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
......
src/views/MyManage/index.vue
...@@ -219,48 +219,53 @@ export default { ...@@ -219,48 +219,53 @@ export default {
}; };
}, },
created() { created() {
// TODO 判断用户状态 处理一下左侧的 sub_nav 和用户panel // // TODO 判断用户状态 处理一下左侧的 sub_nav 和用户panel
const user = JSON.parse(localStorage.getItem('gs-user')) const user = JSON.parse(localStorage.getItem('gs-user'))
// 1. 未申请条码 if(!user){
// 2.系统成员 this.$router.push({path:'/login'})
// 3.管理员
// 4.分中心管理员
if (user.type === 'admin') {
this.userType = ADMIN;
} else if (user.type === 'adminBranch') {
this.userType = ADMINBRANCH;
} else if (user.type === 'verify') {
this.userType = SYSTEM_MEMBER;
} else {
this.userType = UN_VERIFY;
} }
// // 1. 未申请条码
// // 2.系统成员
// // 3.管理员
// // 4.分中心管理员
// if (user.type === 'admin') {
// this.userType = ADMIN;
// } else if (user.type === 'adminBranch') {
// this.userType = ADMINBRANCH;
// } else if (user.type === 'verify') {
// this.userType = SYSTEM_MEMBER;
// } else {
// this.userType = UN_VERIFY;
// }
//
// if (this.userType === UN_VERIFY) {
// if (this.loginInfo.userType !== 3) { // 业务大厅用户不展示厂商实名认证菜单
// this.routerList[1].children = this.routerList[1].children.filter(item => item.index !== 1)
// }
// if (this.loginInfo.userType === 3 && this.loginInfo.isQY === 1) {
// this.$store.commit("system/SET_SUB_NAV", this.isQYRouterList);
// return
// }
// this.$store.commit("system/SET_SUB_NAV", this.routerList);
// } else if (this.userType === SYSTEM_MEMBER) {
// if (this.loginInfo.userType !== 3) { // 业务大厅用户不展示厂商实名认证菜单
// this.routerList[1].children = this.routerList[1].children.filter(item => item.index !== 1)
// }
// this.routerList[0].link = '/MyManage/SystemMember/index',
// this.routerList[2].children.push({
// id: uuid("gs_nav"),
// name: "企业信息",
// index: 3,
// link: '/MyManage/SystemMember/companyInfo'
// })
// this.$store.commit("system/SET_SUB_NAV", this.routerList);
// } else if (this.userType === ADMIN) {
// this.$store.commit("system/SET_SUB_NAV", this.adminRouterList);
// } else if (this.userType === ADMINBRANCH) {
// this.$store.commit("system/SET_SUB_NAV", this.adminBranchRouterList);
// }
if (this.userType === UN_VERIFY) { this.$store.commit("system/SET_SUB_NAV", this.routerList);
if (this.loginInfo.userType !== 3) { // 业务大厅用户不展示厂商实名认证菜单
this.routerList[1].children = this.routerList[1].children.filter(item => item.index !== 1)
}
if (this.loginInfo.userType === 3 && this.loginInfo.isQY === 1) {
this.$store.commit("system/SET_SUB_NAV", this.isQYRouterList);
return
}
this.$store.commit("system/SET_SUB_NAV", this.routerList);
} else if (this.userType === SYSTEM_MEMBER) {
if (this.loginInfo.userType !== 3) { // 业务大厅用户不展示厂商实名认证菜单
this.routerList[1].children = this.routerList[1].children.filter(item => item.index !== 1)
}
this.routerList[0].link = '/MyManage/SystemMember/index',
this.routerList[2].children.push({
id: uuid("gs_nav"),
name: "企业信息",
index: 3,
link: '/MyManage/SystemMember/companyInfo'
})
this.$store.commit("system/SET_SUB_NAV", this.routerList);
} else if (this.userType === ADMIN) {
this.$store.commit("system/SET_SUB_NAV", this.adminRouterList);
} else if (this.userType === ADMINBRANCH) {
this.$store.commit("system/SET_SUB_NAV", this.adminBranchRouterList);
}
}, },
methods: {}, methods: {},
}; };
......
src/views/User/index.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="gs-entry"> <div class="gs-entry">
<div class="header"> <div class="header">
<div class="content"> <div class="content">
<img src="./img/logo.png" alt=""> <img @click="$router.push({path:'/'})" src="./img/logo.png" alt="">
</div> </div>
</div> </div>
<div class="body"> <div class="body">
......
src/views/User/login.vue
...@@ -44,6 +44,8 @@ ...@@ -44,6 +44,8 @@
<el-button type="text" @click="$router.push({name:'reset-pass'})">忘记密码</el-button> <el-button type="text" @click="$router.push({name:'reset-pass'})">忘记密码</el-button>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-button type="text" @click="$router.push({name:'register'})">注册</el-button> <el-button type="text" @click="$router.push({name:'register'})">注册</el-button>
<el-divider direction="vertical"></el-divider>
<el-button type="text" @click="$router.push({path:'/'})">首页</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment