Skip to content

R
rongtong-app
Commit 28e9ec0d authored by kaitly205422@163.com's avatar kaitly205422@163.com
Browse files
Options

1.修改个人资料用户名字段 2.固有风险模板添加查询功能

parent c0f84f44
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 64 deletions
src/components/selectFloor.vue
View file @ 28e9ec0d
......@@ -2,14 +2,15 @@
<div>
<!-- 搜索 -->
<!-- <van-sticky offset-top="0">
<div class="content-wrap">
<div class="search-wrap">
<van-search v-model="searchVal" placeholder="搜索" @input="onInput"/>
</div>
</div>
</van-sticky> -->
<div class="content-wrap">
<div class="search-wrap">
<van-search v-model="searchVal" placeholder="搜索" @input="onInput" />
</div>
</div>
</van-sticky> -->
<div style="margin-bottom: 1.4rem;">
<van-tree-select height="auto" :items="listdata" :active-id.sync="activeId" :main-active-index.sync="activeIndex" @click-item="clickItem">
<van-tree-select height="auto" :items="listdata" :active-id.sync="activeId"
:main-active-index.sync="activeIndex" @click-item="clickItem">
</van-tree-select>
</div>
<!-- 底部信息 -->
......@@ -27,7 +28,7 @@
</footer>
</div>
</template>
<script>
import { debounce } from "@/utils/common.js";
......@@ -47,10 +48,10 @@ export default {
text: "选择人员",
activeId: 1,
activeIndex: 0,
seletedItem:{}
seletedItem: {}
};
},
mounted(){
mounted() {
this.seletedItem = this.listdata[0].children[0]
},
methods: {
......@@ -187,5 +188,4 @@ export default {
}
}
}
</style>
\ No newline at end of file
</style>
\ No newline at end of file
src/utils/axios.js
View file @ 28e9ec0d
......@@ -5,6 +5,7 @@ import { Notify } from 'vant';
import { Dialog } from 'vant';
import { getToken, removeToken } from '@/utils/auth' // get token from cookie
const service = axios.create({
timeout: 20000,
// baseURL: '/aqpt/app-api', //前缀路径
baseURL: '/app-api', //前缀路径
headers: {//请求头部
......
src/views/my/index.vue
View file @ 28e9ec0d
......@@ -12,12 +12,7 @@
<van-row gutter="20" class="user-box">
<van-col span="6">
<div>
<van-image
width="2rem"
height="2rem"
fit="fill"
:src="userInfo.portrait"
/>
<van-image width="2rem" height="2rem" fit="fill" :src="userInfo.portrait" />
</div>
</van-col>
<van-col span="18">
......@@ -47,18 +42,8 @@
</div>
</van-cell-group> -->
<van-cell-group inset class="my-cell-group">
<div
class="set-wrap"
v-for="(item, key) in menus"
:key="key"
@click="$router.push({ name: item['name'] })"
>
<van-image
width="0.613rem"
height="0.613rem"
fit="fill"
:src="item['img']"
/>
<div class="set-wrap" v-for="(item, key) in menus" :key="key" @click="$router.push({ name: item['name'] })">
<van-image width="0.613rem" height="0.613rem" fit="fill" :src="item['img']" />
<span>{{ item["title"] }}</span>
</div>
</van-cell-group>
......@@ -107,12 +92,12 @@ export default {
],
userInfo: {
portrait: require("@/assets/myTerritory/touxiang.png"),
name: getUserInfo() ? getUserInfo().userName : "xxx",
name: getUserInfo() ? getUserInfo().nickName || getUserInfo().userName : "xxx",
position: getUserInfo() ? getUserInfo().deptName : "xxx部",
},
};
},
mounted() {},
mounted() { },
methods: {
logout() {
removeToken();
......@@ -136,19 +121,23 @@ export default {
color: white;
text-align: center;
}
.con {
// height: calc(100% - 110px);
padding: 10px 0 50px 0;
background-color: #f0f1f5;
position: relative;
.user-box {
display: flex;
align-items: center;
}
.user-info-wrap {
display: flex;
flex-direction: column;
justify-content: space-between;
.user-name {
font-size: 17px;
font-weight: bold;
......@@ -178,14 +167,17 @@ export default {
// }
.my-cell-group {
padding: 10px 10px !important;
.set-wrap {
height: 1.1rem;
display: flex;
align-items: center;
border-bottom: 1px solid #e8e8e8;
&:last-child {
border-bottom: none;
}
span {
margin-left: 0.2666rem;
font-size: 13px;
......@@ -204,11 +196,13 @@ export default {
margin: auto;
overflow: hidden;
border-radius: 5px;
button {
font-size: 15px;
font-weight: bold;
}
}
.van-cell-group--inset {
margin: 0 10px 10px;
padding: 10px 10px 15px;
......
src/views/riskProject/add/inherentTemplate/list.vue
View file @ 28e9ec0d
<!-- 导入固有风险模板列表 -->
<template>
<div class="inherent-template">
<LHeader text="固有风险模板"></LHeader>
<van-sticky offset-top="0">
<LHeader text="固有风险模板"></LHeader>
<div class="content-wrap">
<div class="search-wrap">
<!-- <van-search v-model="searchVal" placeholder="搜索" @input="onInput" /> -->
<van-search placeholder="请输入搜索关键词" show-action v-model="searchValue" @clear="toSearch">
<template #action>
<div @click="toSearch">搜索</div>
</template>
</van-search>
</div>
</div>
</van-sticky>
<van-pull-refresh v-model="list.refreshing" @refresh="onRefresh">
<van-list
v-model="list.loading"
:finished="list.finished"
finished-text="没有更多了"
@load="getList"
class="con-list"
>
<van-cell-group
inset
v-for="(item, index) in messageList"
:key="index"
@click="touchstart(index, item)"
>
<van-list v-model="list.loading" :finished="list.finished" finished-text="没有更多了" @load="getList" class="con-list">
<van-cell-group inset v-for="(item, index) in messageList" :key="index" @click="touchstart(index, item)">
<div style="font-size: 0.45rem; padding: 5px 0">
{{ item.name }}
</div>
......@@ -33,25 +34,18 @@
</van-row>
<van-overlay :show="showIndex == index">
<div class="wrapper" @click.stop="showIndex = null">
<van-button round type="info" @click="toImport(item)"
>导入</van-button
>
<van-button round type="primary" @click="toDetail(item)"
>详情</van-button
>
<van-button round type="info" @click="toImport(item)">导入</van-button>
<van-button round type="primary" @click="toDetail(item)">详情</van-button>
</div>
</van-overlay>
</van-cell-group>
<div
style="
<div style="
width: 100%;
text-align: center;
font-size: 0.48rem;
position: fixed;
top: 30%;
"
v-if="messageList['length'] == 0"
>
" v-if="messageList['length'] == 0">
暂无数据
</div>
</van-list>
......@@ -68,6 +62,7 @@ export default {
data() {
return {
messageList: [],
searchValue: '',
showIndex: null,
item: null,
list: {
......@@ -81,8 +76,11 @@ export default {
},
};
},
mounted() {},
mounted() { },
methods: {
toSearch() {
this.getList(true)
},
toDetail(item) {
this.$store.commit("SET_INHERENT_TEMPLATE", item);
this.$router.push({
......@@ -110,6 +108,7 @@ export default {
getFun(`/risk/plan/inherent/template/list`, {
pageNum: this.page.pageNum,
pageSize: 10,
name: this.searchValue
})
.then((res) => {
setTimeout(() => {
......@@ -118,8 +117,9 @@ export default {
this.messageList = this.messageList.concat(res.rows);
if (this.page.total == 0) {
this.page.total = res.total;
this.list.finished = false; //不能再isFresh中改变值，load会导致再次调用getList方法
}
if (this.page.total && this.messageList >= this.page.total) {
if (this.page.total && this.messageList.length >= this.page.total) {
this.list.finished = true;
return;
}
......
vue.config.js
View file @ 28e9ec0d
......@@ -11,12 +11,7 @@ module.exports = {
//配置跨域
"/app-api": {
target: "http://192.168.4.232:8080/", //这里是后台的地址
// target: "http://localhost:8080/", //这里是后台的地址
// target: 'http://192.168.15.124:8080/', //这里是杨帆的地址
// target: "http://192.168.14.152:8080/", //这里是鲍德的地址
// target: "http://192.168.15.230:8080/", //这里是晓晋的地址
// target: 'http://localhost:8081/', //这里是后台的地址
// target: 'http://127.0.0.1:8080', //这里是后台的地址
ws: true,
changOrigin: true, //允许跨域
// logLevel: 'debug', // 显示代理调试信息
......
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