Commit 88e156d1 authored by “yiyousong”'s avatar “yiyousong”

fix:修复页面

parent 0bc6ad56
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
} }
menuList(obj).then((res) => { menuList(obj).then((res) => {
// console.log(res); // console.log(res);
let { code, data, dict } = res.data; let { code, data, dict } = res;
if (code == 1) { if (code == 1) {
data.data = data.data.map((item) => { data.data = data.data.map((item) => {
this.menuRouterList.forEach((v) => { this.menuRouterList.forEach((v) => {
......
...@@ -31,13 +31,16 @@ ...@@ -31,13 +31,16 @@
/> />
</a-form-model-item> </a-form-model-item>
<a-form-model-item> <a-form-model-item>
<a-button type="primary" class="addclass" @click="getList"> 开始分析 </a-button> <a-button type="primary" class="addclass" @click="getList">
开始分析
</a-button>
</a-form-model-item> </a-form-model-item>
</a-form-model> </a-form-model>
<div class="mt20"> <div class="mt20">
<a-table <a-table
:columns="columns" :columns="columns"
:data-source="data" :data-source="data"
:loading="loading"
:scroll="{ y: 590 }" :scroll="{ y: 590 }"
:pagination="false" :pagination="false"
> >
...@@ -49,9 +52,9 @@ ...@@ -49,9 +52,9 @@
<script> <script>
import { getEventCensus } from "@/api/dataActuary.js"; import { getEventCensus } from "@/api/dataActuary.js";
import moment from "moment"; import moment from "moment";
import product from "../mixins/product" import product from "../mixins/product";
export default { export default {
mixins:[product], mixins: [product],
data() { data() {
return { return {
queryform: { queryform: {
...@@ -101,6 +104,7 @@ export default { ...@@ -101,6 +104,7 @@ export default {
}, },
], ],
data: [], data: [],
loading: false,
}; };
}, },
mounted() { mounted() {
...@@ -108,10 +112,12 @@ export default { ...@@ -108,10 +112,12 @@ export default {
}, },
methods: { methods: {
getList() { getList() {
this.loading = true;
this.queryform.dateTimeStart = this.time ? this.time[0] : null; this.queryform.dateTimeStart = this.time ? this.time[0] : null;
this.queryform.dateTimeStart = this.time ? this.time[1] : null; this.queryform.dateTimeStart = this.time ? this.time[1] : null;
getEventCensus(this.queryform).then((res) => { getEventCensus(this.queryform).then((res) => {
this.data = res.data.data; this.data = res.data.data;
this.loading = false;
}); });
}, },
}, },
......
...@@ -53,7 +53,8 @@ export default { ...@@ -53,7 +53,8 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@headerH: 4.5rem; @headerH: 4.5rem;
.Container { .Container {
height: 100% !important; width: 100%;
height: auto !important;
// background: #fac; // background: #fac;
background: #f5f5f5; background: #f5f5f5;
display: flex; display: flex;
...@@ -103,7 +104,7 @@ export default { ...@@ -103,7 +104,7 @@ export default {
margin-left: 0.7rem !important; margin-left: 0.7rem !important;
} }
} }
/deep/.ant-tabs-bar{ /deep/.ant-tabs-bar {
margin: 0; margin: 0;
} }
} }
......
...@@ -167,11 +167,9 @@ export default { ...@@ -167,11 +167,9 @@ export default {
}); });
}, },
getList() { getList() {
this.queryform.dateTimeStart = this.time ? this.time[0] : null; this.queryform.dateTimeStart = this.time ? this.time[0] : null;
this.queryform.dateTimeStart = this.time ? this.time[1] : null; this.queryform.dateTimeStart = this.time ? this.time[1] : null;
getProductHotCensus(this.queryform).then((res) => { getProductHotCensus(this.queryform).then((res) => {
console.log(res);
this.clickSum = res.data.clickSum; this.clickSum = res.data.clickSum;
this.data = res.data.top10List; this.data = res.data.top10List;
this.img = this.img =
......
...@@ -3,9 +3,10 @@ ...@@ -3,9 +3,10 @@
<div class="main"> <div class="main">
<div class="first_card"> <div class="first_card">
<div class="breadMenu"> <div class="breadMenu">
<Breadcrumb/> <Breadcrumb />
</div> </div>
<div class="searchBox"> <div class="searchBox">
<a-space>
<a-auto-complete <a-auto-complete
v-model="businessName" v-model="businessName"
:data-source="dataSource" :data-source="dataSource"
...@@ -15,59 +16,70 @@ ...@@ -15,59 +16,70 @@
@select="onSelect" @select="onSelect"
@search="onSearch" @search="onSearch"
/> />
<a-button type="primary" class="addclass" v-if="!btnShow" @click="startAnalysis">开始分析</a-button> <a-button
<a-button type="primary" class="addclass" v-else @click="backBase">返回</a-button> type="primary"
class="addclass"
v-if="!btnShow"
@click="startAnalysis"
>开始分析</a-button
>
<a-button type="primary" class="addclass" v-else @click="backBase"
>返回</a-button
>
</a-space>
</div> </div>
</div> </div>
<div class="content_view"> <div class="content_view">
<router-view keep-alive/> <router-view keep-alive />
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import _ from 'lodash'; import _ from "lodash";
import axios from 'axios'; import axios from "axios";
import Breadcrumb from "./breadcrumb/index.vue"; import Breadcrumb from "./breadcrumb/index.vue";
import {userSiteBus} from '@/api/dataActuary' import { userSiteBus } from "@/api/dataActuary";
export default { export default {
components:{ components: {
Breadcrumb Breadcrumb,
}, },
data() { data() {
return { return {
// 搜索框 // 搜索框
businessName: '', businessName: "",
dataSource: [], dataSource: [],
sourceList:[], sourceList: [],
// dataList: [], // dataList: [],
btnShow: false, btnShow: false,
} };
}, },
mounted() { mounted() {
// this.getList() // this.getList()
}, },
created(){ created() {},
}, computed: {},
computed:{ methods: {
},
methods:{
startAnalysis() { startAnalysis() {
if(!this.businessName){ if (!this.businessName) {
this.$message.error('请输入业务名称搜索') this.$message.error("请输入业务名称搜索");
}else{ } else {
let item = this.sourceList.filter(i=>{return i.name == this.businessName})[0] let item = this.sourceList.filter((i) => {
if(item){ return i.name == this.businessName;
this.$router.push({ path: 'analysiscontent', query:{id:item.id}}) })[0];
this.btnShow= true if (item) {
this.$router.push({
path: "analysiscontent",
query: { id: item.id },
});
this.btnShow = true;
} }
} }
}, },
backBase() { backBase() {
this.$router.push({ path: 'basecontent'}) this.$router.push({ path: "basecontent" });
this.btnShow= false this.btnShow = false;
this.businessName= '' this.businessName = "";
}, },
// async getList(){ // async getList(){
// await axios.get('http://192.168.0.98:8090/inter/statistic/busList',{params: {siteid: 1}}).then((res)=>{ // await axios.get('http://192.168.0.98:8090/inter/statistic/busList',{params: {siteid: 1}}).then((res)=>{
...@@ -78,28 +90,29 @@ export default { ...@@ -78,28 +90,29 @@ export default {
// } // }
// }) // })
// }, // },
onSearch: _.debounce(function(val){ onSearch: _.debounce(function (val) {
this.dataSource= [] this.dataSource = [];
userSiteBus({siteid: localStorage.getItem('siteId'),bus_name:val}).then(res => { userSiteBus({
siteid: localStorage.getItem("siteId"),
bus_name: val,
}).then((res) => {
if (res.code == 1) { if (res.code == 1) {
this.sourceList = res.data; this.sourceList = res.data;
res.data.forEach(r => { res.data.forEach((r) => {
this.dataSource.push( this.dataSource.push(r.name);
r.name
);
}); });
} }
}) });
},0), }, 0),
onSelect(val){ onSelect(val) {
this.businessName= val this.businessName = val;
}
}, },
} },
};
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@headerH: 4.5rem; @headerH: 4.5rem;
.Container { .Container {
height: 100% !important; height: 100% !important;
// background: #fac; // background: #fac;
background: #f5f5f5; background: #f5f5f5;
...@@ -148,27 +161,27 @@ export default { ...@@ -148,27 +161,27 @@ export default {
margin-left: 0.7rem !important; margin-left: 0.7rem !important;
} }
} }
/deep/.ant-tabs-bar{ /deep/.ant-tabs-bar {
margin: 0; margin: 0;
} }
} }
.first_card{ .first_card {
background: #FFF; background: #fff;
margin-bottom: .9375rem; margin-bottom: 0.9375rem;
} }
.breadMenu{ .breadMenu {
height: 2.8125rem; height: 2.8125rem;
line-height: 2.8125rem; line-height: 2.8125rem;
padding: 0 5rem; padding: 0 5rem;
border-bottom: 1px solid rgba(226, 226, 226, 1); border-bottom: 1px solid rgba(226, 226, 226, 1);
} }
.searchBox{ .searchBox {
height: 6.25rem; height: 6.25rem;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.content_view{ .content_view {
padding: 0 5rem; padding: 0 5rem;
} }
</style> </style>
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="main"> <div class="main">
<div class="first_card"> <div class="first_card">
<div class="breadMenu"> <div class="breadMenu">
<Breadcrumb/> <Breadcrumb />
</div> </div>
<div class="searchBox"> <div class="searchBox">
<!-- <a-auto-complete <!-- <a-auto-complete
...@@ -20,79 +20,93 @@ ...@@ -20,79 +20,93 @@
:not-found-content="null" :options="peopleArr" @search="peopelListFn" :not-found-content="null" :options="peopleArr" @search="peopelListFn"
@change="handleChange"> @change="handleChange">
</a-select> --> </a-select> -->
<a-button type="primary" class="addclass" v-if="!btnShow" @click="startAnalysis">开始分析</a-button> <a-button
<a-button type="primary" class="addclass" v-else @click="backBase">返回</a-button> type="primary"
class="addclass"
v-if="!btnShow"
@click="startAnalysis"
>开始分析</a-button
>
<a-button type="primary" class="addclass" v-else @click="backBase"
>返回</a-button
>
</div> </div>
</div> </div>
<div class="content_view"> <div class="content_view">
<router-view keep-alive/> <router-view keep-alive />
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import _ from 'lodash'; import _ from "lodash";
import axios from 'axios'; import axios from "axios";
import Breadcrumb from "./breadcrumb/index.vue"; import Breadcrumb from "./breadcrumb/index.vue";
export default { export default {
components:{ components: {
Breadcrumb Breadcrumb,
}, },
data() { data() {
return { return {
// 搜索框 // 搜索框
businessName: '', businessName: "",
dataSource: [], dataSource: [],
dataList: [], dataList: [],
btnShow: false, btnShow: false,
} };
}, },
mounted() { mounted() {
this.getList() this.getList();
}, },
methods:{ methods: {
startAnalysis() { startAnalysis() {
if(!this.businessName){ if (!this.businessName) {
this.$message.error('请输入业务名称搜索') this.$message.error("请输入业务名称搜索");
}else{ } else {
this.$router.push({ path: 'analysiscontent', query:{name: this.businessName}}) this.$router.push({
this.btnShow= true path: "analysiscontent",
query: { name: this.businessName },
});
this.btnShow = true;
} }
}, },
backBase() { backBase() {
this.$router.push({ path: 'basecontent'}) this.$router.push({ path: "basecontent" });
this.btnShow= false this.btnShow = false;
this.businessName= '' this.businessName = "";
}, },
async getList(){ async getList() {
await axios.get('http://192.168.0.98:8090/inter/statistic/busList',{params: {siteid: 1}}).then((res)=>{ await axios
if(res && res.status==200){ .get("http://192.168.0.98:8090/inter/statistic/busList", {
res.data.data.forEach(item=>{ params: { siteid: 1 },
this.dataList.push(item.name)
}) })
.then((res) => {
if (res && res.status == 200) {
res.data.data.forEach((item) => {
this.dataList.push(item.name);
});
} }
}) });
}, },
onSearch: _.debounce(function(val){ onSearch: _.debounce(function (val) {
this.dataSource= [] this.dataSource = [];
this.dataList.forEach(item=>{ this.dataList.forEach((item) => {
if(item.indexOf(val) !== -1){ if (item.indexOf(val) !== -1) {
this.dataSource.push(item) this.dataSource.push(item);
} }
}) });
}, 1000), }, 1000),
onSelect(val){ onSelect(val) {
this.businessName= val this.businessName = val;
} },
} },
} };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@headerH: 4.5rem; @headerH: 4.5rem;
.Container { .Container {
height: 100% !important; height: 100% !important;
// background: #fac; // background: #fac;
background: #f5f5f5; background: #f5f5f5;
...@@ -141,29 +155,29 @@ ...@@ -141,29 +155,29 @@
margin-left: 0.7rem !important; margin-left: 0.7rem !important;
} }
} }
/deep/.ant-tabs-bar{ /deep/.ant-tabs-bar {
margin: 0; margin: 0;
} }
} }
.first_card{ .first_card {
background: #FFF; background: #fff;
margin-bottom: .9375rem; margin-bottom: 0.9375rem;
} }
.breadMenu{ .breadMenu {
height: 2.8125rem; height: 2.8125rem;
line-height: 2.8125rem; line-height: 2.8125rem;
padding: 0 5rem; padding: 0 5rem;
border-bottom: 1px solid rgba(226, 226, 226, 1); border-bottom: 1px solid rgba(226, 226, 226, 1);
} }
.searchBox{ .searchBox {
height: 6.25rem; height: 6.25rem;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.content_view{ .content_view {
padding: 0 5rem; padding: 0 5rem;
} }
</style> </style>
\ No newline at end of file
...@@ -6,14 +6,33 @@ ...@@ -6,14 +6,33 @@
<Breadcrumb /> <Breadcrumb />
</div> </div>
<div class="searchBox"> <div class="searchBox">
<a-select show-search placeholder="请输入群众名称搜索" style="width: 35.625rem" <a-space>
:default-active-first-option="false" :show-arrow="false" :filter-option="false" allowClear <a-select
:not-found-content="null" :options="peopleArr" @search="peopelListFn" show-search
@change="handleChange"></a-select> placeholder="请输入群众名称搜索"
style="width: 35.625rem"
:default-active-first-option="false"
:show-arrow="false"
:filter-option="false"
allowClear
:not-found-content="null"
:options="peopleArr"
@search="peopelListFn"
@change="handleChange"
></a-select>
<!-- <a-input v-model="peopleName" placeholder="请输入群众名称搜索" style="width: 35.625rem"></a-input> --> <!-- <a-input v-model="peopleName" placeholder="请输入群众名称搜索" style="width: 35.625rem"></a-input> -->
<a-button type="primary" class="addclass" v-if="!btnShow" @click="startAnalysis()">开始分析</a-button> <a-button
<a-button type="primary" class="addclass" v-else @click="backBase()">返回</a-button> type="primary"
class="addclass"
v-if="!btnShow"
@click="startAnalysis()"
>开始分析</a-button
>
<a-button type="primary" class="addclass" v-else @click="backBase()"
>返回</a-button
>
</a-space>
</div> </div>
</div> </div>
<div class="content_view"> <div class="content_view">
...@@ -25,54 +44,57 @@ ...@@ -25,54 +44,57 @@
<script> <script>
import Breadcrumb from "./breadcrumb/index.vue"; import Breadcrumb from "./breadcrumb/index.vue";
import { peopelList } from '@/api/userPortrait' import { peopelList } from "@/api/userPortrait";
export default { export default {
components: { components: {
Breadcrumb Breadcrumb,
}, },
data() { data() {
return { return {
// 搜索框 // 搜索框
peopleId: '', peopleId: "",
peopleArr: [], peopleArr: [],
btnShow: false, btnShow: false,
} };
}, },
methods: { methods: {
//输入框回显 //输入框回显
peopelListFn(val) { peopelListFn(val) {
this.peopleArr = [] this.peopleArr = [];
peopelList({ siteid: localStorage.getItem('siteId'), name: val }).then(res => { peopelList({ siteid: localStorage.getItem("siteId"), name: val }).then(
(res) => {
if (res.code == 1) { if (res.code == 1) {
res.data.forEach(r => { res.data.forEach((r) => {
this.peopleArr.push({ this.peopleArr.push({
value: r.id, value: r.id,
label: r.idcard_Name + '    ' + r.idcard_IDCardNo, label: r.idcard_Name + "    " + r.idcard_IDCardNo,
}); });
}); });
} }
}) }
);
}, },
handleChange(val) { handleChange(val) {
this.peopleId = val; this.peopleId = val;
}, },
startAnalysis() { startAnalysis() {
if (this.peopleId) { if (this.peopleId) {
this.$router.push({ path: 'portrayalAnalysis', query: { peopleid: this.peopleId } }) this.$router.push({
this.btnShow = true path: "portrayalAnalysis",
query: { peopleid: this.peopleId },
});
this.btnShow = true;
} else { } else {
this.$message.warning('请选择群众后搜索') this.$message.warning("请选择群众后搜索");
} }
}, },
backBase() { backBase() {
this.peopleArr = [] this.peopleArr = [];
this.$router.push({ path: 'portrayalBase' }) this.$router.push({ path: "portrayalBase" });
this.btnShow = false this.btnShow = false;
}, },
} },
} };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
...@@ -99,15 +121,21 @@ export default { ...@@ -99,15 +121,21 @@ export default {
width: 100%; width: 100%;
height: @headerH; height: @headerH;
background: rgb(59, 135, 255); background: rgb(59, 135, 255);
background: -moz-linear-gradient(174deg, background: -moz-linear-gradient(
174deg,
rgba(59, 135, 255, 1) 24%, rgba(59, 135, 255, 1) 24%,
rgba(108, 53, 247, 1) 85%); rgba(108, 53, 247, 1) 85%
background: -webkit-linear-gradient(174deg, );
background: -webkit-linear-gradient(
174deg,
rgba(59, 135, 255, 1) 24%, rgba(59, 135, 255, 1) 24%,
rgba(108, 53, 247, 1) 85%); rgba(108, 53, 247, 1) 85%
background: linear-gradient(174deg, );
background: linear-gradient(
174deg,
rgba(59, 135, 255, 1) 24%, rgba(59, 135, 255, 1) 24%,
rgba(108, 53, 247, 1) 85%); rgba(108, 53, 247, 1) 85%
);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#3b87ff", endColorstr="#6c35f7", GradientType=1); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="#3b87ff", endColorstr="#6c35f7", GradientType=1);
} }
...@@ -120,7 +148,7 @@ export default { ...@@ -120,7 +148,7 @@ export default {
/deep/.ant-tabs-tab { /deep/.ant-tabs-tab {
font-size: 14px !important; font-size: 14px !important;
&+.ant-tabs-tab { & + .ant-tabs-tab {
margin: 0 !important; margin: 0 !important;
margin-left: 0.7rem !important; margin-left: 0.7rem !important;
} }
...@@ -132,8 +160,8 @@ export default { ...@@ -132,8 +160,8 @@ export default {
} }
.first_card { .first_card {
background: #FFF; background: #fff;
margin-bottom: .9375rem; margin-bottom: 0.9375rem;
} }
.breadMenu { .breadMenu {
......
...@@ -20,7 +20,9 @@ ...@@ -20,7 +20,9 @@
<!-- <a-select-option value="5"> 自定义 </a-select-option> --> <!-- <a-select-option value="5"> 自定义 </a-select-option> -->
</a-select> </a-select>
<a-button type="primary" class="addclass" @click="getData">搜索</a-button> <a-button type="primary" class="addclass" @click="getData"
>搜索</a-button
>
</template> </template>
</Head> </Head>
<div class="heat_box" v-if="data"> <div class="heat_box" v-if="data">
...@@ -30,11 +32,14 @@ ...@@ -30,11 +32,14 @@
<i>部门名称</i> <i>部门名称</i>
<b>预约热度</b> <b>预约热度</b>
</li> </li>
<li class="list" v-for="item,index in data.section" :key="index"> <li class="list" v-for="(item, index) in data.section" :key="index">
<span>NO.{{ index+1 }}</span> <span>NO.{{ index + 1 }}</span>
<i>{{item.deptname}}</i> <i>{{ item.deptname }}</i>
<b> <b>
<a-progress :percent="item.count" :show-info="false" status="active" <a-progress
:percent="item.count"
:show-info="false"
status="active"
/></b> /></b>
</li> </li>
</ul> </ul>
...@@ -44,11 +49,14 @@ ...@@ -44,11 +49,14 @@
<i>事项名称</i> <i>事项名称</i>
<b>预约热度</b> <b>预约热度</b>
</li> </li>
<li class="list" v-for="item,index in data.matter" :key="index"> <li class="list" v-for="(item, index) in data.matter" :key="index">
<span>NO.{{ index+1 }}</span> <span>NO.{{ index + 1 }}</span>
<i>{{item.mattername}}</i> <i>{{ item.mattername }}</i>
<b> <b>
<a-progress :percent="item.count" :show-info="false" status="active" <a-progress
:percent="item.count"
:show-info="false"
status="active"
/></b> /></b>
</li> </li>
</ul> </ul>
...@@ -59,36 +67,36 @@ ...@@ -59,36 +67,36 @@
<script> <script>
import Head from "./components/header.vue"; import Head from "./components/header.vue";
import {getOrderRanking} from '@/api/dataAdmin.js' import { getOrderRanking } from "@/api/dataAdmin.js";
export default { export default {
name: "PortalAdminVueHeatRanking", name: "PortalAdminVueHeatRanking",
data() { data() {
return { return {
day:'0', day: "0",
BegindAndEndTime: [], BegindAndEndTime: [],
data:null data: null,
}; };
}, },
components: { components: {
Head, Head,
}, },
watch:{ watch: {
day(val){ day(val) {
if (val != 5) this.BegindAndEndTime = [] if (val != 5) this.BegindAndEndTime = [];
} },
}, },
mounted() { mounted() {
this.getData() this.getData();
}, },
methods: { methods: {
getData(){ getData() {
getOrderRanking({ getOrderRanking({
selected:this.day == 5 ? null : this.day, selected: this.day == 5 ? null : this.day,
time:this.BegindAndEndTime time: this.BegindAndEndTime,
}).then(res=>{ }).then((res) => {
this.data = res.data this.data = res.data;
}) });
}, },
rangePickerChange(val) { rangePickerChange(val) {
console.log(val); console.log(val);
...@@ -99,6 +107,7 @@ export default { ...@@ -99,6 +107,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.HeatRanking-Container { .HeatRanking-Container {
width: 100%;
& > .pm { & > .pm {
.heat_box { .heat_box {
display: flex; display: flex;
......
...@@ -94,6 +94,7 @@ export default { ...@@ -94,6 +94,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@headerH: 4.5rem; @headerH: 4.5rem;
#dataAnalyse-Container { #dataAnalyse-Container {
width: 100%;
height: 100% !important; height: 100% !important;
background: #eee; background: #eee;
display: flex; display: flex;
......
...@@ -149,15 +149,15 @@ export default { ...@@ -149,15 +149,15 @@ export default {
// 获取用户常用站点列表 // 获取用户常用站点列表
async getCollect() { async getCollect() {
let res = await getCollect(); let res = await getCollect();
if (res.data.code == 1) { if (res.code == 1) {
this.collectList = res.data.data; this.collectList = res.data;
} }
}, },
// 获取站点分类列表 // 获取站点分类列表
async appsListInterface() { async appsListInterface() {
let res = await appsListInterface({ siteId: this.siteId }); let res = await appsListInterface({ siteId: this.siteId });
if (res.data.code == 1) { if (res.code == 1) {
let { data } = res.data.data; let { data } = res.data;
this.siteModelList = data; this.siteModelList = data;
} }
}, },
...@@ -208,7 +208,7 @@ export default { ...@@ -208,7 +208,7 @@ export default {
// this.$message.success("设置成功"); // this.$message.success("设置成功");
// this.getCollect(); // this.getCollect();
// } // }
if (res.data.code != 1) { if (res.code != 1) {
this.getCollect(); this.getCollect();
} }
}, },
......
...@@ -38,13 +38,13 @@ ...@@ -38,13 +38,13 @@
listArr[active] ? listArr[active].productName : "--" listArr[active] ? listArr[active].productName : "--"
}}</span> }}</span>
<span class="count primary">{{ <span class="count primary">{{
listArr[active].curInfo.length listArr[active]?.curInfo.length
}}</span> }}</span>
</div> </div>
<div v-if="listArr[active].curInfo.length > 0"> <div v-if="listArr[active]?.curInfo.length > 0">
<div <div
class="list flex aic jcb" class="list flex aic jcb"
v-for="(i, j) in listArr[active].curInfo" v-for="(i, j) in listArr[active]?.curInfo"
:key="j" :key="j"
> >
<div class="app-name">{{ i.appName }}</div> <div class="app-name">{{ i.appName }}</div>
......
...@@ -207,6 +207,7 @@ export default { ...@@ -207,6 +207,7 @@ export default {
}, },
// 获取菜单列表 // 获取菜单列表
async getMenuList() { async getMenuList() {
this.tableLoading = true;
let res = await menuList({ let res = await menuList({
page: this.tablePagination.current, page: this.tablePagination.current,
size: -1, size: -1,
...@@ -218,10 +219,12 @@ export default { ...@@ -218,10 +219,12 @@ export default {
this.firstStair = data.filter((v) => v.parentId === -1); this.firstStair = data.filter((v) => v.parentId === -1);
let childrens = data.filter((v) => v.parentId !== -1); let childrens = data.filter((v) => v.parentId !== -1);
this.menusTreeData = this.fliterEvent(this.firstStair, childrens); this.menusTreeData = this.fliterEvent(this.firstStair, childrens);
this.tableLoading = false;
}, },
// 搜索 // 搜索
async searchData() { async searchData() {
if (this.searchForm.parentId || this.searchForm.name) { if (this.searchForm.parentId || this.searchForm.name) {
this.tableLoading = true;
let obj = { ...this.searchForm }; let obj = { ...this.searchForm };
obj.name = "%" + this.searchForm.name + "%"; obj.name = "%" + this.searchForm.name + "%";
let res = await menuList({ let res = await menuList({
...@@ -232,6 +235,7 @@ export default { ...@@ -232,6 +235,7 @@ export default {
let { data, total } = res.data; let { data, total } = res.data;
this.tablePagination.total = total; this.tablePagination.total = total;
this.menusTreeData = data; this.menusTreeData = data;
this.tableLoading = false;
} else { } else {
this.getMenuList(); this.getMenuList();
} }
......
...@@ -139,6 +139,7 @@ export default { ...@@ -139,6 +139,7 @@ export default {
}, },
methods: { methods: {
async getRoleList() { async getRoleList() {
this.tableLoading = true;
let res = await roleList({ let res = await roleList({
page: this.tablePagination.current, //当前页 page: this.tablePagination.current, //当前页
size: this.tablePagination.pageSize, //每页条数 size: this.tablePagination.pageSize, //每页条数
...@@ -155,6 +156,7 @@ export default { ...@@ -155,6 +156,7 @@ export default {
this.tableSourceData = data.data; this.tableSourceData = data.data;
this.roleDict = dict; this.roleDict = dict;
} }
this.tableLoading = false;
}, },
pagTableChange(pag) { pagTableChange(pag) {
this.tablePagination.current = pag.current; this.tablePagination.current = pag.current;
......
...@@ -197,6 +197,7 @@ export default { ...@@ -197,6 +197,7 @@ export default {
// 获取用户列表 // 获取用户列表
async getUserList() { async getUserList() {
this.tableLoading = true;
let realName = ""; let realName = "";
let mobile = ""; let mobile = "";
if (this.userform.searchVal) { if (this.userform.searchVal) {
...@@ -227,6 +228,7 @@ export default { ...@@ -227,6 +228,7 @@ export default {
this.tablePagination.total = total; this.tablePagination.total = total;
this.userDict = this.transverter(roleId); this.userDict = this.transverter(roleId);
this.tableSourceData = data; this.tableSourceData = data;
this.tableLoading = false;
}, },
// 添加用户 // 添加用户
......
...@@ -174,6 +174,7 @@ export default { ...@@ -174,6 +174,7 @@ export default {
}, },
dict: {}, dict: {},
total: 0, total: 0,
tableLoading: false,
}; };
}, },
components: { components: {
...@@ -184,6 +185,7 @@ export default { ...@@ -184,6 +185,7 @@ export default {
}, },
methods: { methods: {
getList() { getList() {
this.tableLoading = true;
getInterfaceList({ getInterfaceList({
page: this.tablePagination.current, page: this.tablePagination.current,
size: this.tablePagination.pageSize, size: this.tablePagination.pageSize,
...@@ -195,8 +197,8 @@ export default { ...@@ -195,8 +197,8 @@ export default {
this.dict = dict; this.dict = dict;
this.tableSourceData = data; this.tableSourceData = data;
this.tablePagination.total = total; this.tablePagination.total = total;
return data;
} }
this.tableLoading = false;
}); });
}, },
QueueState(type) { QueueState(type) {
......
...@@ -142,6 +142,7 @@ export default { ...@@ -142,6 +142,7 @@ export default {
deveLanguage: {}, deveLanguage: {},
isEnable: {}, isEnable: {},
}, },
tableLoading: false,
}; };
}, },
components: { components: {
...@@ -153,6 +154,7 @@ export default { ...@@ -153,6 +154,7 @@ export default {
}, },
methods: { methods: {
getList(search) { getList(search) {
this.tableLoading = true;
getApps({ getApps({
page: this.tablePagination.current, page: this.tablePagination.current,
size: this.tablePagination.pageSize, size: this.tablePagination.pageSize,
...@@ -164,6 +166,7 @@ export default { ...@@ -164,6 +166,7 @@ export default {
this.dict = dict; this.dict = dict;
this.tableSourceData = data; this.tableSourceData = data;
this.tablePagination.total = total; this.tablePagination.total = total;
this.tableLoading = false;
return data; return data;
} }
}); });
......
...@@ -113,6 +113,7 @@ export default { ...@@ -113,6 +113,7 @@ export default {
current: 1, current: 1,
pageSize: 10, pageSize: 10,
}, },
tableLoading: false,
}; };
}, },
components: { components: {
...@@ -124,6 +125,7 @@ export default { ...@@ -124,6 +125,7 @@ export default {
}, },
methods: { methods: {
getList(search) { getList(search) {
this.tableLoading = true;
getDocument({ getDocument({
page: this.tablePagination.current, page: this.tablePagination.current,
size: this.tablePagination.pageSize, size: this.tablePagination.pageSize,
...@@ -136,6 +138,7 @@ export default { ...@@ -136,6 +138,7 @@ export default {
this.dict = dict; this.dict = dict;
this.tableSourceData = data; this.tableSourceData = data;
this.tablePagination.total = total; this.tablePagination.total = total;
this.tableLoading = false;
return data; return data;
} }
}); });
......
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