sxyanzhu
/
YanZhuProject
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

main
haha 2024-05-16 22:25:57 +08:00
parent fd73192afe
commit 1756bc5aa6
15 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yanzhu-mapper/src/main/resources/mapper/project/ProProjectInfoMapper.xml
View File

@ -25,7 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectProProjectInfoVo">
select id, name, dept_id, address, infos, person_name, person_phone, main_image, images, proj_status, is_del, create_by, create_time, update_by, update_time, remark, unit from pro_project_info
select id, name, dept_id, address, infos, person_name, person_phone, main_image, images, proj_status, is_del, create_by, create_time, update_by, update_time, remark, unit
from pro_project_info
</sql>
<select id="selectProProjectInfoList" parameterType="ProProjectInfo" resultMap="ProProjectInfoResult">

2
yanzhu-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectDeptVo"/>
where d.del_flag = '0'
<if test="deptId != null and deptId != 0">
AND dept_id = #{deptId}
AND dept_id = #{deptId} or find_in_set(#{deptId}, ancestors)
</if>
<if test="parentId != null and parentId != 0">
AND parent_id = #{parentId}

BIN
yanzhu-ui/public/favicon.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.5 KiB

1
yanzhu-ui/public/favicon.svg 100644
View File

@ -0,0 +1 @@
<svg class="icon" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="732"><path d="M78.697006 291.684329L464.648823 120.095559a101.13599 101.13599 0 0 1 82.151644 0l385.951817 171.58877a50.567995 50.567995 0 0 1-0.044696 92.387077L546.75577 555.660176a101.13599 101.13599 0 0 1-82.151643 0L78.65231 384.071406A50.567995 50.567995 0 0 1 78.697006 291.684329z" fill="#0594E6" p-id="733"></path><path d="M354.392471 319.348336l133.641683-59.445966a30.214377 30.214377 0 0 1 24.582918 0l133.641683 59.445966a15.107188 15.107188 0 0 1 0.044697 27.577564l-133.641684 59.445967a30.214377 30.214377 0 0 1-24.627614-0.044697l-133.641683-59.445966a15.107188 15.107188 0 0 1 0-27.532868z" fill="#FFFFFF" p-id="734"></path><path d="M884.93991 472.808856l47.786756 21.238558a50.567995 50.567995 0 0 1 0 92.41301L546.766445 758.075557a101.13599 101.13599 0 0 1-82.172992 0L78.633232 586.460424a50.567995 50.567995 0 0 1 0-92.41301L126.419987 472.808856 464.593453 623.122221a101.13599 101.13599 0 0 0 72.185813 3.792599l9.987179-3.792599L884.93991 472.808856z" fill="#0594E6" p-id="735"></path><path d="M884.93991 675.144045l47.786756 21.238558a50.567995 50.567995 0 0 1 0 92.413011L546.766445 960.347536a101.13599 101.13599 0 0 1-82.172992 0L78.633232 788.858824a50.567995 50.567995 0 0 1 0-92.413011L126.419987 675.080835 464.593453 825.52062a101.13599 101.13599 0 0 0 72.185813 3.7926l9.987179-3.7926L884.93991 675.144045z" fill="#FA8F31" p-id="736"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

2
yanzhu-ui/public/index.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link rel="icon" href="<%= BASE_URL %>favicon.svg">
<title><%= webpackConfig.name %></title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<style>

2
yanzhu-ui/public/preview.html
View File

@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link rel="icon" href="<%= BASE_URL %>favicon.svg">
<title>form-generator-preview</title>
<link href="https://lib.baomitu.com/element-ui/2.13.2/theme-chalk/index.css" rel="stylesheet">
<script src="https://lib.baomitu.com/vue/2.6.11/vue.min.js"></script>

4
yanzhu-ui/src/api/system/user.js
View File

@ -127,9 +127,9 @@ export function updateAuthRole(data) {
}
// 查询部门下拉树结构
export function deptTreeSelect() {
export function deptTreeSelect(deptId) {
return request({
url: '/system/user/deptTree',
url: '/system/user/deptTree?deptId='+deptId,
method: 'get'
})
}

BIN
yanzhu-ui/src/assets/images/profile.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

1
yanzhu-ui/src/assets/logo/logo.svg 100644
View File

@ -0,0 +1 @@
<svg class="icon" style="vertical-align: middle;fill: currentColor;overflow: hidden;" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="732"><path d="M78.697006 291.684329L464.648823 120.095559a101.13599 101.13599 0 0 1 82.151644 0l385.951817 171.58877a50.567995 50.567995 0 0 1-0.044696 92.387077L546.75577 555.660176a101.13599 101.13599 0 0 1-82.151643 0L78.65231 384.071406A50.567995 50.567995 0 0 1 78.697006 291.684329z" fill="#0594E6" p-id="733"></path><path d="M354.392471 319.348336l133.641683-59.445966a30.214377 30.214377 0 0 1 24.582918 0l133.641683 59.445966a15.107188 15.107188 0 0 1 0.044697 27.577564l-133.641684 59.445967a30.214377 30.214377 0 0 1-24.627614-0.044697l-133.641683-59.445966a15.107188 15.107188 0 0 1 0-27.532868z" fill="#FFFFFF" p-id="734"></path><path d="M884.93991 472.808856l47.786756 21.238558a50.567995 50.567995 0 0 1 0 92.41301L546.766445 758.075557a101.13599 101.13599 0 0 1-82.172992 0L78.633232 586.460424a50.567995 50.567995 0 0 1 0-92.41301L126.419987 472.808856 464.593453 623.122221a101.13599 101.13599 0 0 0 72.185813 3.792599l9.987179-3.792599L884.93991 472.808856z" fill="#0594E6" p-id="735"></path><path d="M884.93991 675.144045l47.786756 21.238558a50.567995 50.567995 0 0 1 0 92.413011L546.766445 960.347536a101.13599 101.13599 0 0 1-82.172992 0L78.633232 788.858824a50.567995 50.567995 0 0 1 0-92.413011L126.419987 675.080835 464.593453 825.52062a101.13599 101.13599 0 0 0 72.185813 3.7926l9.987179-3.7926L884.93991 675.144045z" fill="#FA8F31" p-id="736"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

8
yanzhu-ui/src/layout/components/Navbar.vue
View File

@ -178,9 +178,11 @@ export default {
.user-avatar {
cursor: pointer;
width: 40px;
height: 40px;
border-radius: 10px;
width: 30px;
height: 30px;
border-radius: 15px;
position: relative;
top: 5px;
}
.el-icon-caret-bottom {

2
yanzhu-ui/src/layout/components/Sidebar/Logo.vue
View File

@ -14,7 +14,7 @@
</template>
<script>
import logoImg from '@/assets/logo/logo.png'
import logoImg from '@/assets/logo/logo.svg'
import variables from '@/assets/styles/variables.scss'
export default {

2
yanzhu-ui/src/views/project/company/index.vue
View File

@ -189,6 +189,7 @@ export default {
orderNum: 100,
leader: undefined,
phone: undefined,
level:1,
email: '',
status: "0"
};
@ -234,6 +235,7 @@ export default {
submitForm: function () {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.level=1
if (this.form.deptId != undefined) {
updateDept(this.form).then(response => {
this.$modal.msgSuccess("修改成功");

9
yanzhu-ui/src/views/system/user/index.vue
View File

@ -331,7 +331,7 @@ export default {
this.$refs.tree.filter(val);
}
},
created() {
created() {
this.getList();
this.getDeptTree();
this.getConfigKey("sys.user.initPassword").then(response => {
@ -368,6 +368,9 @@ export default {
/** 查询用户列表 */
getList() {
this.loading = true;
if(!this.queryParams.deptId){
this.queryParams.deptId = this.$store.state.user.dept.deptId;
}
listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.userList = response.rows;
this.total = response.total;
@ -376,8 +379,8 @@ export default {
);
},
/** 查询部门下拉树结构 */
getDeptTree() {
deptTreeSelect().then(response => {
getDeptTree() {
deptTreeSelect(this.$store.state.user.dept.deptId).then(response => {
this.deptOptions = response.data;
});
},

2
yanzhu-ui/src/views/tool/build/index.vue
View File

@ -157,7 +157,7 @@ import {
import { makeUpJs } from '@/utils/generator/js'
import { makeUpCss } from '@/utils/generator/css'
import drawingDefault from '@/utils/generator/drawingDefalut'
import logo from '@/assets/logo/logo.png'
import logo from '@/assets/logo/logo.svg'
import CodeTypeDialog from './CodeTypeDialog'
import DraggableItem from './DraggableItem'
import {

4
yanzhu-ui/vue.config.js
View File

@ -35,8 +35,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8080${process.env.VUE_APP_BASE_API}`,
//target: `http://49.235.181.228${process.env.VUE_APP_BASE_API}`,
//target: `http://localhost:8080${process.env.VUE_APP_BASE_API}`,
target: `http://62.234.3.186${process.env.VUE_APP_BASE_API}`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''