2 Achegas 85a2902f93 ... 184c2d9e4d

Autor SHA1 Mensaxe Data
  tom_glb 184c2d9e4d yyl update %!s(int64=4) %!d(string=hai) anos
  tom_glb 146546457d yyl update %!s(int64=4) %!d(string=hai) anos
Modificáronse 6 ficheiros con 101 adicións e 381 borrados
  1. 3 0
      .gitignore
  2. 27 52
      src/api/ajax.js
  3. 3 178
      src/api/index.js
  4. 5 0
      src/components/PatrolmanStatistics/1.vue
  5. 0 16
      src/pages/Home.vue
  6. 63 135
      src/pages/PatrolmanStatistics.vue

+ 3 - 0
.gitignore

@@ -19,3 +19,6 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
+
+*.js
+*.vue

+ 27 - 52
src/api/ajax.js

@@ -1,64 +1,39 @@
-import axios from 'axios';
-import qs from 'qs';
-import { Message } from 'element-ui';
+import axios from 'axios'
+import qs from 'qs'
+import storageUtil from '../util/storageUtil'
+
+export default function ajax (url, data={}, type='GET') {
 
-axios.defaults.headers.common['Content-Type'] = 'application/json; charset=UTF-8';
-axios.defaults.baseURL = 'https://ccss.windd.cn/screen/';
-// axios.defaults.baseURL = 'http://114.55.254.203/screen/';
-// axios.defaults.baseURL = 'http://10.16.4.3:7001/';
-//网络请求
-export default function ajax(url, data = {}, type = 'GET', isupload) {
     return new Promise(function (resolve, reject) {
-        let promise;
+        let promise
         if (type === 'GET') {
-            let dataStr = '';
+            let dataStr = ''
             Object.keys(data).forEach(key => {
-                dataStr += key + '=' + data[key] + '&';
-            });
+                dataStr += key + '=' + data[key] + '&'
+            })
             if (dataStr !== '') {
-                dataStr = dataStr.substring(0, dataStr.lastIndexOf('&'));
+                dataStr = dataStr.substring(0, dataStr.lastIndexOf('&'))
                 url = url + '?' + dataStr;
-            }
-            promise = axios.get(url);
-        } else if (type === 'DELETE') {
-            let dataString = '';
-            Object.keys(data).forEach(key => {
-                dataString += key + '=' + data[key] + '&';
-            });
-            if (dataString !== '') {
-                dataString = dataString.substring(0, dataString.lastIndexOf('&'));
-                url = url + '?' + dataString;
-            }
-            promise = axios.delete(url);
-        } else {
-            if (isupload) {
-                promise = axios.post(url, data, {
-                    headers: {
-                        'Content-Type': 'multipart/form-data',
-                    },
-                    transformRequest: [
-                        function (data) {
-                            return data;
-                        },
-                    ],
-                });
             } else {
-                promise = axios.post(url, qs.stringify(data));
+                url = url;
             }
-        }
-        promise
-            .then(function (response) {
 
-                resolve(response.data);
+            promise = axios.get(url, {
+                headers: {
+                    'cipherText': storageUtil.read("userInfo")
+                }
             })
-            .catch(function (error) {
-                Message({
-                    message: '系统异常,请联系管理员',
-                    type: 'error',
-                    duration: 5000,
-                });
-                console.error("异常", error);
-                reject(error);
+        } else {
+            promise = axios.post(url, qs.stringify(data), {
+                headers: {
+                    'cipherText': storageUtil.read("userInfo")
+                }
             });
-    });
+        }
+        promise.then(function (response) {
+            resolve(response.data);
+        }).catch(function (error) {
+            reject(error);
+        })
+    })
 }

+ 3 - 178
src/api/index.js

@@ -1,182 +1,7 @@
 import ajax from './ajax'
-// export const BASE_URL = 'http://10.16.4.3:7001';
-// //对于前端的优化  默认增删改后 请求网络数据进行更新  可以优化成 增删改后进行本地的数据修正
-// Vue.prototype.serverUrl = BASE_URL;
-/**
- * 首页接口
- */
-// 1.平台成果统计
-export const platformResult = (params) => ajax(`/money/money`, params, 'GET');
-/**
- * 企业信息统计
- */
-export const enterpriseResult = (params) => ajax(`/companyUser/companyUserCount`, params, 'GET');
-/**
- * 地区信息统计
- */
-export const addressResult = (params) => ajax(`/address/addressInfoCount`, params, 'GET');
-/**
- * 放款统计
- */
-export const loanResult = (params) => ajax(`/bank/bankMoneyCount`, params, 'GET');
-// 111111111111融资成功率
-export const financingSuccessRate = (params) => ajax(`/other/financingSuccessRate`, params, 'GET');
-/**
- * 对接成功率(弃用)
- */
-export const dockingSuccessRate = (params) => ajax(`/other/dockingSuccessRate`, params, 'GET');
-/**
- * 2222222222融资需求满足率
- */
-export const financingDemandSatisfactionRate = (params) => ajax(`/other/financingDemandSatisfactionRate`, params, 'GET');
-/**
- * 333333333平均办理时长
- */
-export const averageHandlingTime = (params) => ajax(`/other/averageHandlingTime`, params, 'GET');
-/**
-* 44444444平均利率
-*/
-export const averageInterestRate = (params) => ajax(`/other/averageInterestRate`, params, 'GET');
-/**
- * 对接成功率
- */
-export const DockingResult = (params) => ajax(`/money/money`, params, 'GET');
-/**
- * 平均利率
- */
-export const averageResult = (params) => ajax(`/money/money`, params, 'GET');
-/**
- * 融资需求满足率
- */
-export const financingResult = (params) => ajax(`/money/money`, params, 'GET');
-/**
- * 地图上面的5个数据
- */
-export const fiveNum = (params) => ajax(`/fivenum/fiveNum`, params, 'GET');
-/**
- *  右下角的实时对接
- */
-export const ssdj = (params) => ajax(`/ssdj/ssdj`, params, 'GET');
-/**
- *  地图
- */
-export const mapfirst = (params) => ajax(`/mapfirst/mapfirst`, params, 'GET');
-export const mapsec = (params) => ajax(`/mapfirst/mapsec`, params, 'GET');
-
-/*-----------------------------------------平台注册------------------------------------------------------------*/
-/*-------------------------------------------------------------------------------------------------------*/
-/*-------------------------------------------------------------------------------------------------------*/
-/**
- *  推送笔数(最近七天)
- */
-export const tuisongResult = (params) => ajax(`/money/numberOfPush`, params, 'GET');
-/**
- *  推送金额(最近七天)
- */
-export const pushAmountResult = (params) => ajax(`/money/pushAmount`, params, 'GET');
-/**
- *  放款笔数(最近五天)
- */
-export const numberOfLoansResult = (params) => ajax(`/money/numberOfLoans`, params, 'GET');
-/**
- *  接单笔数(最近七天)
- */
-export const jieDanResult = (params) => ajax(`/money/numberOfSingleTransactionReceived`, params, 'GET');
-/**
- *  接单金额(最近七天)
- */
-export const jindanjinerResult = (params) => ajax(`/money/receiptAmount`, params, 'GET');
-/**
- *  放款金额(最近七天)
- */
-export const fangkuanzongeResult = (params) => ajax(`/money/loanAmount`, params, 'GET');
-/**
-/**
- *  注册用户
- */
-export const zcyh = (params) => ajax(`/zcyh/zcyh`, params, 'GET');
-/**
- *  获得贷款企业数量
- */
-export const dkqynum = (params) => ajax(`/dkqynum/dkqynum`, params, 'GET');
-/**
- *  发布需求企业
- */
-export const fwqisum = (params) => ajax(`/fwqisum/fwqisum`, params, 'GET');
-// 申请笔数放款笔数放款金额申请金额
-export const fournum = (params) => ajax(`/fournum/fournum`, params, 'GET');
-//申请企业数量最近七天
-export const applyCompanyCountResult = (params) => ajax(`/companyUser/applyCompanyCount`, params, 'GET');
-// 放款企业数量最近七天
-export const numberOfLendingEnterprisesResult = (params) => ajax(`/companyUser/numberOfLendingEnterprises`, params, 'GET');
-// 注册用户数量最近七天
-export const numberOfRegisteredUsers = (params) => ajax(`/companyUser/numberOfRegisteredUsers`, params, 'GET');
-// 需求发布率 需要第一个大屏五个数据中的一个
-export const DemandReleaseRate = (params) => ajax(`/fivenum/fiveNum`, params, 'GET');
-/*-------------------------------------------------------------------------------------------------------*/
-export const tuis = (params) => ajax(`/tuis/tuis`, params, 'GET');
-/*-------------------------------------------------------------------------------------------------------*/
-/*-------------------------------------------------------------------------------------------------------*/
-/*-------------------------------------------------------------------------------------------------------*/
-/*-------------------------------------------------------------------------------------------------------*/
-/*-------------------------------------------------------------------------------------------------------*/
-/*-------------------------------------------------------------------------------------------------------*/
-/**
- *   放款 接单笔数 接单金额
- */
-export const jdnumResult = (params) => ajax(`/jdnum/jdnum`, params, 'GET');
-/**
- *   放款 平均办理时长
- */
-export const averageHandling = (params) => ajax(`/other/averageHandlingTime`, params, 'GET');
-/**
- *   放款 平均期限
- */
-export const pingjunqixian = (params) => ajax(`/avgtime/avgtime`, params, 'GET');
+const BASE_URL = 'http://10.16.4.8'
 
 /**
- *   放款 平均利率
+ * 用户登录
  */
-export const pingjunlilv = (params) => ajax(`/other/averageInterestRate`, params, 'GET');
-
-/**
- *   放款 平均放款额度
- */
-export const pingjunfangkuanedu = (params) => ajax(`/avgfkmoney/avgfkmoney`, params, 'GET');
-
-/**
- *   放款 返款数量top5
- */
-export const fangkuantopfive = (params) => ajax(`/fktop5/fktop5`, params, 'GET');
-/**
- *   放款 返款数量top5
- */
-export const chanpinleixinghzanbi = (params) => ajax(`/fkcplx/fkcplx`, params, 'GET');
-/**
- *   放款 融资需求满足率
- */
-export const rongzixuqiumanzulv = (params) => ajax(`/other/financingDemandSatisfactionRate`, params, 'GET');
-
-/**
- *   放款 入驻平台产品最多银行
- */
-export const ruzhuyhtop = (params) => ajax(`/maxcp/maxcp`, params, 'GET');
-
-// 放款统计转圈圈的六个接口
-// 放款金额最多
-export const maximumAmountOfLoan = (params) => ajax(`/bank/maximumAmountOfLoan`, params, 'GET');
-// 放款笔数最多
-export const fkmax = (params) => ajax(`/fkmax/fkmax`, params, 'GET');
-// 融资成功率最高
-export const rzsuccesshigh = (params) => ajax(`/rzsuccesshigh/rzsuccesshigh`, params, 'GET');
-// 入驻平台产品最多
-export const maxcp = (params) => ajax(`/maxcp/maxcp`, params, 'GET');
-// 平均办理时长最短
-export const avgblsc = (params) => ajax(`/avgblsc/avgblsc`, params, 'GET');
-// 平均放款利率最低
-export const lowestAverageLendingRate = (params) => ajax(`/bank/lowestAverageLendingRate`, params, 'GET');
-
-// 第二个地图优化接口
-export const threemap = (params) => ajax(`/threemap/threemap`, params, 'GET');
-
-
+export const findDept = (params, requestMethod) => ajax(`${BASE_URL}/chart/dept/findDept`, params, requestMethod);

+ 5 - 0
src/components/PatrolmanStatistics/1.vue

@@ -15,6 +15,11 @@
                 colorArr: ['rgba(0, 227,255, 1)', 'rgba(253, 200, 1, 1)']
             }
         },
+        methods: {
+            usedInPar(str){
+                console.log(str);
+            }
+        },
         mounted() {
             const seriesArr = [];
             const titleArr = [];

+ 0 - 16
src/pages/Home.vue

@@ -281,22 +281,6 @@
     import com5 from "../components/index/5.vue";
     import vueSeamlessScroll from "vue-seamless-scroll";
     import moment from "moment";
-    import {
-        platformResult,
-        enterpriseResult,
-        fiveNum,
-        ssdj,
-        zcyh,
-        mapfirst,
-        mapsec,
-        loanResult,
-        addressResult,
-        pingjunfangkuanedu,
-        // financingSuccessRate,
-        averageInterestRate,
-        financingDemandSatisfactionRate
-        // averageHandlingTime
-    } from "../api";
 
     export default {
         name: "Home",

+ 63 - 135
src/pages/PatrolmanStatistics.vue

@@ -5,17 +5,17 @@
         <div class="return-btn" @click="goHome">返回首页</div>
         <div class="select-div">
             <span class="address-title">省:</span>
-            <el-select class="input" v-model="dept1" clearable :popper-append-to-body="false" placeholder="请选择">
+            <el-select class="input" v-model="dept1" clearable :popper-append-to-body="false" placeholder="请选择" @change="provinceChange">
                 <el-option
                         v-for="item in provinces"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value"
-                        :disabled="item.disabled">
+                        :disabled="item.disabled" >
                 </el-option>
             </el-select>
             <span class="address-title">地市:</span>
-            <el-select class="input" v-model="dept2" clearable :popper-append-to-body="false" placeholder="请选择">
+            <el-select class="input" v-model="dept2" clearable :popper-append-to-body="false" placeholder="请选择" @change="cityChange">
                 <el-option
                         v-for="item in citys"
                         :key="item.value"
@@ -25,7 +25,7 @@
                 </el-option>
             </el-select>
             <span class="address-title">县(市区):</span>
-            <el-select class="input1" v-model="dept3" clearable :popper-append-to-body="false" placeholder="请选择">
+            <el-select class="input1" v-model="dept3" clearable :popper-append-to-body="false" placeholder="请选择" @change="areaChange">
                 <el-option
                         v-for="item in areas"
                         :key="item.value"
@@ -38,7 +38,7 @@
             <span v-else class="bj-shouqi" @click="guanbi"></span>
             <span class="bj-qeuren" @click="queren"></span>
             <span v-if="isZhankai" class="address-title">乡镇(街道):</span>
-            <el-select v-if="isZhankai" class="input1" clearable :popper-append-to-body="false" v-model="dept4" placeholder="请选择">
+            <el-select v-if="isZhankai" class="input1" clearable :popper-append-to-body="false" v-model="dept4" placeholder="请选择" @change="countyChange">
                 <el-option
                         v-for="item in countys"
                         :key="item.value"
@@ -96,7 +96,7 @@
             </div>
             <div class="tu-four">
                 <p class="title1">巡访员性别分布统计</p>
-                <com1></com1>
+                <com1 ref='c1'></com1>
             </div>
             <div class="tu-five">
                 <p class="title1">巡访员认证数据统计</p>
@@ -140,7 +140,6 @@
     </div>
 </template>
 <script>
-    // import jlMap from "../components/index/jlMap.vue";
     import com1 from "../components/PatrolmanStatistics/1.vue";
     import com2 from "../components/PatrolmanStatistics/2.vue";
     import com3 from "../components/PatrolmanStatistics/3.vue";
@@ -150,72 +149,20 @@
     import com7 from "../components/PatrolmanStatistics/7.vue";
     import com8 from "../components/PatrolmanStatistics/8.vue";
     import com9 from "../components/PatrolmanStatistics/9.vue";
-    // import vueSeamlessScroll from "vue-seamless-scroll";
-    import moment from "moment";
 
-    import {
-        platformResult,
-        enterpriseResult
-    } from "../api";
+    import storageUtil from '../util/storageUtil'
+    import { findDept } from '../api'
 
     export default {
         name: "Home",
         components: {com1, com2, com3, com4, com5, com6, com7, com8, com9},
         data() {
             return {
-                provinces: [
-                    {
-                        value: '1',
-                        label: '吉林省',
-                    }, {
-                        value: '2',
-                        label: '辽宁省'
-                    }
-                ],   // 省份
-                citys: [
-                    {
-                        value: '3',
-                        label: '长春市',
-                    }, {
-                        value: '4',
-                        label: '四平市'
-                    }, {
-                        value: '5',
-                        label: '辽源市'
-                    }, {
-                        value: '6',
-                        label: '白城市'
-                    }], // 市
-                areas: [
-                    {
-                        value: '7',
-                        label: '宽城区'
-                    },
-                    {
-                        value: '8',
-                        label: '朝阳区'
-                    },
-                ],   // 县
-                countys: [
-                    {
-                        value: '9',
-                        label: '南广街道办事处'
-                    },
-                    {
-                        value: '10',
-                        label: '西广街道办事处'
-                    },
-                ],  // 乡
-                villages: [
-                    {
-                        value: '11',
-                        label: '东三条社区'
-                    },
-                    {
-                        value: '12',
-                        label: '西三条社区'
-                    },
-                ],  // 村
+                provinces: [],   // 省份
+                citys: [], // 市
+                areas: [],   // 县
+                countys: [],  // 乡
+                villages: [],  // 村
                 dept1: '',
                 dept2: '',
                 dept3: '',
@@ -273,39 +220,72 @@
                         address: '长春街道办事处撒旦撒旦多',
                         score: 15000,
                     },
-
                 ],
-
             };
         },
-        mounted() {
-            this.platformResult();
-            this.enterpriseResult();
+        async mounted() {
+            this.$refs.c1.usedInPar('调用子组件中的方法');
+            this.provinces = await this.findDept({'level': '1'});
         },
         methods: {
+            //获取地区
+            async findDept(data) {
+                const result = await findDept(data, 'POST');
+                return result;
+            },
+            async provinceChange(val) {
+                this.citys = await this.findDept({ fid: val });
+                this.dept2 = '';
+                this.dept3 = '';
+                this.dept4 = '';
+                this.dept5 = '';
+            },
+            async cityChange(val) {
+                this.areas = await this.findDept({ fid: val });
+                this.dept3 = '';
+                this.dept4 = '';
+                this.dept5 = '';
+            },
+            async areaChange(val) {
+                this.countys = await this.findDept({ fid: val });
+                this.dept4 = '';
+                this.dept5 = '';
+            },
+            async countyChange(val) {
+                this.villages = await this.findDept({ fid: val });
+                this.dept5 = '';
+            },
             //返回首页
             goHome() {
-                this.$router.push({
-                    path: '/'
-                });
+                storageUtil.save('dept-array', '');
+                this.$router.push({ path: '/' });
             },
             zhankai() {
                 console.log("111")
                 this.isZhankai = !this.isZhankai
-
             },
             guanbi() {
                 console.log("222")
                 this.isZhankai = !this.isZhankai
             },
-
             queren() {
-                console.log(this.dept1)
-                console.log(this.dept2)
-                console.log(this.dept3)
-                console.log(this.dept4)
-                console.log(this.dept5)
-                console.log("确定了")
+                let arr = new Array();
+                if(this.dept1 != '') {
+                    arr.push(this.dept1);
+                }
+                if(this.dept2 != '') {
+                    arr.push(this.dept1);
+                }
+                if(this.dept3 != '') {
+                    arr.push(this.dept1);
+                }
+                if(this.dept4 != '') {
+                    arr.push(this.dept1);
+                }
+                if(this.dept5 != '') {
+                    arr.push(this.dept1);
+                }
+                storageUtil.save('dept-array', arr);
             },
             // 滚动颜色
             scrollTextisColor: function (i) {
@@ -316,51 +296,7 @@
                 } else if (i == 2) {
                     return require("../assets/PatrolmanStatistics/top3.png")
                 }
-                // let inde = i % 3;
-                // //console.log(inde)
-                // if (inde === 0) {
-                //     return require("../assets/index/red.png")
-                // } else if (inde === 1) {
-                //     return require("../assets/index/lv.png")
-                // } else if (inde === 2) {
-                //     return require("../assets/index/huang.png")
-                // }
-            },
-            async platformResult() {
-                const response = await platformResult();
-                // console.log(response);
-                // this.dataArr1 = response.data1;
-                this.dataArr1 = this.utiljsonTwo(response);
-            },
-            // 左二接口
-            async enterpriseResult() {
-                const response = await enterpriseResult();
-                let jsonArr = {};
-                let arr1 = response.data1.map(item => {
-                    let json = {};
-                    json.label = moment(item.label, "YYYY-MM-DD").format("D");
-                    json.value = item.value;
-                    return json;
-                });
-                let arr2 = response.data2.map(item => {
-                    let json = {};
-                    json.label = moment(item.label, "YYYY-MM-DD").format("D");
-                    json.value = item.value;
-                    return json;
-                });
-                jsonArr.data1 = arr1;
-                jsonArr.data2 = arr2;
-                this.dataArr2.push(jsonArr);
-            },
-            utiljsonTwo(response) {
-                let arr1 = response.data1.map(item => {
-                    let json = {};
-                    json.label = moment(item.label, "YYYY-MM-DD").format("D");
-                    json.value = item.value;
-                    return json;
-                });
-                return arr1;
-            },
+            }
         },
         computed: {}
     };
@@ -403,7 +339,6 @@
         padding: 0 10px;
         color: #00afde;
         z-index: 9999;
-
     }
 
     .return-btn:hover {
@@ -689,11 +624,4 @@
     /deep/ .el-select-dropdown__item:hover {
         color: #409eff;
     }
-
-    /*/deep/ .el-select-dropdown{*/
-    /*   background: #01135B;*/
-
-    /*}*/
-
-
 </style>