Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

Delete not use comments and code #8

Merged
merged 3 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-antd-jeecg",
"version": "2.2.0",
"name": "wansen-erp-ui",
"version": "1.0.1",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
Binary file removed public/static/android-code.png
Binary file not shown.
Binary file removed public/static/banner-home.jpg
Binary file not shown.
Binary file removed public/static/banner-small.jpg
Binary file not shown.
Binary file removed public/static/favicon2.ico
Binary file not shown.
Binary file removed public/static/iphone-code.png
Binary file not shown.
Binary file removed public/static/weixin-code.png
Binary file not shown.
Binary file removed public/static/weixin.jpg
Binary file not shown.
7 changes: 1 addition & 6 deletions src/components/jeecg/JEditableTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -393,9 +393,6 @@
</span>
</a-tooltip>
</template>
<!-- update-end-author:taoyan date:0827 for:popup -->

<!-- update-begin-author:jsh date:20210308 for:popupJsh -->
<template v-else-if="col.type === formTypes.popupJsh">
<a-tooltip
:key="i"
Expand All @@ -420,9 +417,7 @@
</span>
</a-tooltip>
</template>
<!-- update-end-author:jsh date:20210308 for:popupJsh -->

<!-- update-beign-author:taoyan date:0827 for:文件/图片逻辑新增 -->
<!-- 文件/图片逻辑新增 -->
<div v-else-if="col.type === formTypes.file" :key="i">
<template v-if="uploadValues[id] != null" v-for="(file,fileKey) of [(uploadValues[id]||{})]">
<div :key="fileKey" style="position: relative;">
Expand Down
4 changes: 2 additions & 2 deletions src/components/jeecg/JInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
this.initVal();
}
},
// update-begin author:sunjianlei date:20200225 for:当 type 变化的时候重新计算值 ------
// 当 type 变化的时候重新计算值 ------
type() {
this.backValue({ target: { value: this.inputVal } })
},
// update-end author:sunjianlei date:20200225 for:当 type 变化的时候重新计算值 ------
// 当 type 变化的时候重新计算值 ------
},
model: {
prop: 'value',
Expand Down
7 changes: 4 additions & 3 deletions src/components/jeecg/JSlider.vue
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,19 @@
this.successFunction();
}
}
}, //mousemove事件
},
//mousemove事件
moseUpFn(e){
this.mouseMoveStata = false;
var width = e.clientX - this.beginClientX;
if(width<this.maxwidth){
// ---- update-begin- author:sunjianlei --- date:20191009 --- for: 修复获取不到 handler 的时候报错 ----
// 修复获取不到 handler 的时候报错
let handler = document.getElementsByClassName('handler')[0]
if (handler) {
handler.style.left = 0 + 'px'
document.getElementsByClassName('drag_bg')[0].style.width = 0 + 'px'
}
// ---- update-end- author:sunjianlei --- date:20191009 --- for: 修复获取不到 handler 的时候报错 ----
// 修复获取不到 handler 的时候报错
}
} //mouseup事件
},
Expand Down
3 changes: 0 additions & 3 deletions src/components/jeecg/JUpload.vue
Original file line number Diff line number Diff line change
Expand Up @@ -104,21 +104,18 @@
type:[String,Array],
required:false
},
// update-begin- --- author:wangshuai ------ date:20190929 ---- for:Jupload组件增加是否能够点击
disabled:{
type:Boolean,
required:false,
default: false
},
// update-end- --- author:wangshuai ------ date:20190929 ---- for:Jupload组件增加是否能够点击
//此属性被废弃了
triggerChange:{
type: Boolean,
required: false,
default: false
},
/**
* update -- author:lvdandan -- date:20190219 -- for:Jupload组件增加是否返回url,
* true:仅返回url
* false:返回fileName filePath fileSize
*/
Expand Down
10 changes: 3 additions & 7 deletions src/components/layouts/TabLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@
this.linkList = this.linkList.filter(item => item !== key)
index = index >= this.linkList.length ? this.linkList.length - 1 : index
this.activePage = this.linkList[index]
//update-begin--Author:scott Date:20201015 for:路由缓存问题,关闭了tab页时再打开就不刷新 #842
//关闭页面则从缓存cache_included_routes中删除路由,下次点击菜单会重新加载页面
// 路由缓存问题,关闭了tab页时再打开就不刷新
// 关闭页面则从缓存cache_included_routes中删除路由,下次点击菜单会重新加载页面
let cacheRouterArray = Vue.ls.get(CACHE_INCLUDED_ROUTES) || []
if (removeRoute && removeRoute[0]) {
let componentName = removeRoute[0].meta.componentName
Expand All @@ -264,7 +264,7 @@
item.hasOpen = false
}
})
//update-end--Author:scott Date:20201015 for:路由缓存问题,关闭了tab页时再打开就不刷新 #842
// 路由缓存问题,关闭了tab页时再打开就不刷新
},
onContextmenu(e) {
const pagekey = this.getPageKey(e.target)
Expand Down Expand Up @@ -380,10 +380,6 @@

<style lang="less">

/*
* by ji-shenghua qq 75-27-18-920
*/

.page-transition-enter {
opacity: 0;
}
Expand Down
76 changes: 38 additions & 38 deletions src/components/layouts/UserLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<a-col>
<a href="/">
<span class="title">{{systemTitle}}</span>
<small class="desc">V3.2</small>
<small class="desc">V1.1</small>
</a>
</a-col>
</a-row>
Expand All @@ -23,47 +23,47 @@
</div>
</div>
<div class="footer" v-if="device === 'desktop'">
<div class="third-party-platform" v-if="isShowRight">
<div class="platform-info" @click="openAndroid()">
<img src="/static/Android.png" style="height:30px" >
<span>安卓版</span>
</div>
<div style="width:50px"></div>
<div class="platform-info" @click="openIPhone()">
<img src="/static/iPhone.png" style="height:30px" >
<span>iPhone版</span>
</div>
<div style="width:50px"></div>
<div class="platform-info" @click="openMiniProgram()">
<img src="/static/mini-program.png" style="height:30px" >
<span>小程序版</span>
</div>
</div>
<!-- <div class="third-party-platform" v-if="isShowRight">-->
<!-- <div class="platform-info" @click="openAndroid()">-->
<!-- <img src="/static/Android.png" style="height:30px" >-->
<!-- <span>安卓版</span>-->
<!-- </div>-->
<!-- <div style="width:50px"></div>-->
<!-- <div class="platform-info" @click="openIPhone()">-->
<!-- <img src="/static/iPhone.png" style="height:30px" >-->
<!-- <span>iPhone版</span>-->
<!-- </div>-->
<!-- <div style="width:50px"></div>-->
<!-- <div class="platform-info" @click="openMiniProgram()">-->
<!-- <img src="/static/mini-program.png" style="height:30px" >-->
<!-- <span>小程序版</span>-->
<!-- </div>-->
<!-- </div>-->
<p>
<span v-if="this.isShowRight">华丽软件</span>
<span v-if="this.isShowRight">万森软件</span>
© 2015-2030 {{systemTitle}} - All Right Reserved 版权所有
<a style="color:#00458a; padding-right: 10px" :href="systemUrl" target="_blank">官方网站</a>
<span v-if="this.isShowRight"><a href="http://beian.miit.gov.cn/" target="_blank">苏ICP备2021042833号</a></span>
<span v-if="this.isShowRight"><a href="http://beian.miit.gov.cn/" target="_blank">陕ICP备2023007248号</a></span>
</p>
</div>
<a-modal v-model="isAndroidShow" title="微信扫一扫下载安卓版" width="200" centered>
<template slot="footer">
<a-button key="back" @click="handleAndroidCancel">取消</a-button>
</template>
<div class="platform-modal"><img src="/static/android-code.png" style="width:200px" /></div>
</a-modal>
<a-modal v-model="isIphoneShow" title="微信扫一扫下载iPhone版" width="200" centered>
<template slot="footer">
<a-button key="back" @click="handleIphoneCancel">取消</a-button>
</template>
<div class="platform-modal"><img src="/static/iphone-code.png" style="width:200px" /></div>
</a-modal>
<a-modal v-model="isMiniProgramShow" title="微信扫一扫使用小程序版" width="200" centered>
<template slot="footer">
<a-button key="back" @click="handleMiniProgramCancel">取消</a-button>
</template>
<div class="platform-modal"><img src="/static/weixin-code.png" style="width:200px;" /></div>
</a-modal>
<!-- <a-modal v-model="isAndroidShow" title="微信扫一扫下载安卓版" width="200" centered>-->
<!-- <template slot="footer">-->
<!-- <a-button key="back" @click="handleAndroidCancel">取消</a-button>-->
<!-- </template>-->
<!-- <div class="platform-modal"><img src="/static/android-code.png" style="width:200px" /></div>-->
<!-- </a-modal>-->
<!-- <a-modal v-model="isIphoneShow" title="微信扫一扫下载iPhone版" width="200" centered>-->
<!-- <template slot="footer">-->
<!-- <a-button key="back" @click="handleIphoneCancel">取消</a-button>-->
<!-- </template>-->
<!-- <div class="platform-modal"><img src="/static/iphone-code.png" style="width:200px" /></div>-->
<!-- </a-modal>-->
<!-- <a-modal v-model="isMiniProgramShow" title="微信扫一扫使用小程序版" width="200" centered>-->
<!-- <template slot="footer">-->
<!-- <a-button key="back" @click="handleMiniProgramCancel">取消</a-button>-->
<!-- </template>-->
<!-- <div class="platform-modal"><img src="/static/weixin-code.png" style="width:200px;" /></div>-->
<!-- </a-modal>-->
</div>
</template>

Expand Down Expand Up @@ -93,7 +93,7 @@
},
created () {
let host = window.location.host
if(host === 'cloud.huaxiaerp.vip' || host === 'cloud.huaxiaerp.com') {
if(host === 'erp.wansen.cloud' || host === 'erp.wansen.cloud') {
this.isShowRight = true
} else {
this.isShowRight = false
Expand Down
8 changes: 4 additions & 4 deletions src/components/menu/SideMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</script>
<style lang="less" scoped>

/* update_begin author:sunjianlei date:20190509 for: 修改侧边导航栏滚动条的样式 */
/* 修改侧边导航栏滚动条的样式 */
.sider {
@scrollBarSize: 10px;

Expand Down Expand Up @@ -140,11 +140,11 @@

}

/* update_end author:sunjianlei date:20190509 for: 修改侧边导航栏滚动条的样式 */
/* 修改侧边导航栏滚动条的样式 */

</style>

<!-- update_begin author:sunjianlei date:20190530 for: 选中首页的时候不显示背景颜色 -->
<!-- 选中首页的时候不显示背景颜色 -->
<style lang="less">
.ant-menu.ant-menu-root {
& > .ant-menu-item:first-child {
Expand Down Expand Up @@ -174,4 +174,4 @@
}
}
</style>
<!-- update_end author:sunjianlei date:20190530 for: 选中首页的时候不显示背景颜色 -->
<!-- 选中首页的时候不显示背景颜色 -->
16 changes: 8 additions & 8 deletions src/components/page/GlobalHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
headerBarFixed: false,
systemTitle: window.SYS_TITLE,
companyName: '',
//update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
// 顶部导航栏过长时显示更多按钮
topMenuStyle: {
headerIndexLeft: {},
topNavHeader: {},
Expand All @@ -111,14 +111,14 @@
}
}
},
//update-end--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
// 顶部导航栏过长时显示更多按钮
mounted() {
window.addEventListener('scroll', this.handleScroll)
//update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
//顶部导航栏过长时显示更多按钮
if (this.mode === 'topmenu') {
this.buildTopMenuStyle()
}
//update-end--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
// 顶部导航栏过长时显示更多按钮
},
created () {
this.initSystemConfig()
Expand All @@ -139,7 +139,7 @@
toggle() {
this.$emit('toggle')
},
//update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
// 顶部导航栏过长时显示更多按钮
buildTopMenuStyle() {
if (this.mode === 'topmenu') {
if (this.device === 'mobile') {
Expand Down Expand Up @@ -167,13 +167,13 @@
}
})
},
//update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
// 顶部导航栏过长时显示更多按钮
}
}
</script>

<style lang="less" scoped>
/* update_begin author:scott date:20190220 for: 缩小首页布局顶部的高度*/
/* 缩小首页布局顶部的高度 */

@height: 49px;

Expand Down Expand Up @@ -229,6 +229,6 @@
padding-left:16px
}

/* update_end author:scott date:20190220 for: 缩小首页布局顶部的高度*/
/* 缩小首页布局顶部的高度 */

</style>
Loading
Loading