联调bug fixed

src/api/article_z.js

@@ -23,9 +23,13 @@ export default {
   queryServiceMap(params) {
     return axios.post(`/dash/service/operations/stat`, params)
   },
-  // todo 设备运营主题（重点区域/道路）
-  queryServiceList(params) {
-    return axios.post(`/dash/service/operations/page`, params)
+  //  设备运营主题（重点区域）
+  zdqyList(params) {
+    return axios.get(`/dash/service/operations/keyDevicePage`, {params})
+  },
+  // 设备运营主题（道路）
+  dlList(params) {
+    return axios.get(`/dash/service/operations/streetDevicePage`, {params})
   },
   // 区域停车主题_区域饱和度
   queryParkingArea_qybhd(params) {

src/api/audit.js

@@ -21,13 +21,13 @@ export default {
   tccqkListByPage(params) {
     return axios.get('/dash/parking/lot/situation/page', {params})
   },
-  // todo 停车场情况-进场
+  // 停车场情况-进场
   jcListByPage(params) {
-    return axios.get('/dash/parking/lot/situation/page', {params})
+    return axios.get('/dash/parking/lot/situation/parking/inrecord', {params})
   },
-  // todo 停车场情况-出场
+  // 停车场情况-出场
   ccListByPage(params) {
-    return axios.get('/dash/parking/lot/situation/page', {params})
+    return axios.get('/dash/parking/lot/situation/parking/outrecord', {params})
   },
   // 停车场情况-总览
   tccqkView(params) {

src/config/index.js

@@ -4,7 +4,7 @@
 const Config = {
   dev: {
 // BASE_API: 'https://172.16.36.211:8800', // http://172.16.36.211:8800
-    BASE_API: 'http://localhost:16399/luohe2_ee/api', // http://172.16.36.211:8800
+    BASE_API: 'https://park.lhzhtc.cn/luohe2_ee/api', // http://172.16.36.211:8800
   },
   build: {
 //服务地址及端口配置

src/pages/index/components/berths_information.vue

@@ -2,17 +2,17 @@
   <div class="body-wrapper">
     <el-form class="form-wrapper" :inline="true" :model="formInline">
       <el-form-item label="行政区">
-        <el-select v-model="formInline.regionCode" placeholder="请选择" popper-class="cur-select">
+        <el-select clearable  v-model="formInline.regionCode" placeholder="请选择" popper-class="cur-select">
           <el-option v-for="item in options"  :key="item.label" :label="item.label" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="重点区域">
-        <el-select v-model="formInline.keyAreas" placeholder="请选择" popper-class="cur-select">
+        <el-select clearable v-model="formInline.keyAreas" placeholder="请选择" popper-class="cur-select">
           <el-option  v-for="item in options1"  :key="item.label" :label="item.label" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="具体道路">
-        <el-input v-model="formInline.streetName" placeholder="请输入"></el-input>
+        <el-input  v-model="formInline.streetName" placeholder="请输入"></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="onSubmit">查询</el-button>
@@ -166,7 +166,6 @@ export default {
     },
     dashBerthsInformationStat3(){
       api.dashBerthsInformationStat3({...this.formInline}).then(res =>{
-        console.log(res.data)
         this.modelData3 = res.data
       })
     },

src/pages/index/components/berths_revenue.vue

@@ -5,16 +5,16 @@
     <br>
     <el-form class="form-wrapper" :inline="true" :model="formInline">
       <el-form-item label="行政区">
-        <el-select v-model="formInline.regionCode" placeholder="请选择" popper-class="cur-select">
+        <el-select clearable v-model="formInline.regionCode" placeholder="请选择" popper-class="cur-select">
           <el-option v-for="item in options"  :key="item.label" :label="item.label" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="重点区域">
-        <el-select v-model="formInline.keyAreas" placeholder="请选择" popper-class="cur-select">
+      <el-form-item clearable label="重点区域">
+        <el-select clearable v-model="formInline.keyAreas" placeholder="请选择" popper-class="cur-select">
           <el-option  v-for="item in options1"  :key="item.label" :label="item.label" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="具体道路">
+      <el-form-item clearable label="具体道路">
         <el-input v-model="formInline.streetName" placeholder="请输入"></el-input>
       </el-form-item>
       <el-form-item>
@@ -160,6 +160,19 @@ export default {
         value: '411122',
         label: '临颍县'
       }],
+      options1: [{
+        value: '商圈',
+        label: '商圈'
+      }, {
+        value: '学校',
+        label: '学校'
+      }, {
+        value: '医院',
+        label: '医院'
+      }, {
+        value: '旅游景点',
+        label: '旅游景点'
+      }],
       linedata: [],
       linedata2: [],
       linedata3: [],

src/pages/index/components/berths_usage.vue

@@ -2,12 +2,12 @@
   <div class="body-wrapper">
     <el-form class="form-wrapper" :inline="true" :model="formInline">
       <el-form-item label="行政区">
-        <el-select v-model="formInline.regionCode" placeholder="请选择" popper-class="cur-select">
+        <el-select clearable v-model="formInline.regionCode" placeholder="请选择" popper-class="cur-select">
           <el-option v-for="item in options"  :key="item.label" :label="item.label" :value="item.value"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="重点区域">
-        <el-select v-model="formInline.keyAreas" placeholder="请选择" popper-class="cur-select">
+        <el-select clearable v-model="formInline.keyAreas" placeholder="请选择" popper-class="cur-select">
           <el-option  v-for="item in options1"  :key="item.label" :label="item.label" :value="item.value"></el-option>
         </el-select>
       </el-form-item>

src/pages/index/components/customer_complaint.vue

@@ -6,7 +6,7 @@
     <br>
     <el-form class="form-wrapper" :inline="true" :model="formInline">
       <el-form-item label="投诉类型">
-        <el-select v-model="formInline.comType" placeholder="投诉类型" popper-class="cur-select">
+        <el-select clearable v-model="formInline.comType" placeholder="投诉类型" popper-class="cur-select">
           <el-option label="全部" value=""></el-option>
           <el-option label="经营服务类停车问题" value="经营服务类停车问题"></el-option>
           <el-option label="非法经营停车问题" value="非法经营停车问题"></el-option>
@@ -54,7 +54,7 @@
       custom-class="audit-dialog">
       <el-form  class="form-div"  style="height: 120px"   ref="formLabelAlign" label-position="left" label-width="80px" :model="formLabelAlign" >
         <el-form-item label="投诉类型" required>
-          <el-select v-model="formLabelAlign.comType" placeholder="投诉类型">
+          <el-select clearable v-model="formLabelAlign.comType" placeholder="投诉类型">
             <el-option label="经营服务类停车问题" value="经营服务类停车问题"></el-option>
             <el-option label="非法经营停车问题" value="非法经营停车问题"></el-option>
             <el-option label="不提供税票" value="不提供税票"></el-option>

src/pages/index/components/gap_analysis.vue

@@ -2,7 +2,7 @@
   <div>
     <div style="color: #d5d3d3" class="middle-map">
       <div align="center" style="color: #3498db;font-size: 23px;margin-bottom: 20px">停车缺口分析</div>
-      <el-select v-model="value" filterable remote reserve-keyword placeholder="请选择时段">
+      <el-select clearable v-model="value" filterable remote reserve-keyword placeholder="请选择时段">
         <el-option
           v-for="item in options"
           :key="item.value"

src/pages/index/components/park_easy.vue

@@ -2,7 +2,7 @@
   <div>
     <div style="color: #d5d3d3" class="middle-map">
       <div align="center" style="color: #3498db;font-size: 23px;margin-bottom: 20px">停车难易指数</div>
-      <el-select v-model="value" filterable remote reserve-keyword placeholder="请选择时段">
+      <el-select clearable v-model="value" filterable remote reserve-keyword placeholder="请选择时段">
         <el-option
           v-for="item in options"
           :key="item.value"

src/pages/index/components/parking_lot_situation.vue

@@ -28,9 +28,9 @@
           </el-pagination>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="实时进场" name="实时进出场">
+      <el-tab-pane label="实时进出场" name="实时进出场">
         <div style="display: flex; justify-content: space-between">
-          <div style="width: 50%">
+          <div style="width: 45%">
             <el-table :data="tableData1">
               <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
               </el-table-column>
@@ -103,6 +103,20 @@ export default {
       formInline1: {
         plateNo: ''
       },
+      columns1: [
+        {
+          label: '停车场名称',
+          key: 'carParkName'
+        },
+        {
+          label: '车牌号',
+          key: 'plateNo'
+        },
+        {
+          label: '出场时间',
+          key: 'outTime'
+        }
+      ],
       columns2: [
         {
           label: '停车场名称',
@@ -163,14 +177,14 @@ export default {
     },
     getTableData1() {
       const {pageNum1, pageSize1} = this
-      api.tccqkListByPage({current: pageNum1, size: pageSize1}).then(res => {
+      api.ccListByPage({current: pageNum1, size: pageSize1}).then(res => {
         this.tableData1 = res.data.records || []
         this.total1 = res.data.total || 0
       })
     },
     getTableData2() {
       const {pageNum2, pageSize2} = this
-      api.tccqkListByPage({current: pageNum2, size: pageSize2}).then(res => {
+      api.jcListByPage({current: pageNum2, size: pageSize2}).then(res => {
         this.tableData2 = res.data.records || []
         this.total2 = res.data.total || 0
       })

src/pages/index/components/record_query.vue

@@ -51,7 +51,7 @@
           </el-pagination>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="轨迹查询" name="轨迹查询">
+      <el-tab-pane label="轨迹跟踪" name="轨迹跟踪">
         <el-form class="form-wrapper" :inline="true" :model="formInline3" style="margin-bottom: 20px;">
           <el-row>
             <el-col :span="8">

src/pages/index/components/service_call_function.vue

@@ -46,9 +46,13 @@ export default {
         if (valid) {
           let params = this.ruleForm
           api.fwdy(params).then(res => {
-            this.$message({type: 'success', message: '调用成功!'})
-            //this.resetForm(formName)
-            this.resStr = res.data
+            if(res.code === 200) {
+              this.$message({type: 'success', message: '调用成功!'})
+              //this.resetForm(formName)
+              this.resStr = res.data
+            } else {
+              this.$message({type: 'error', message: '调用失败!'})
+            }
           })
         } else {
           console.log('error submit!!');

src/pages/index/components/service_operations.vue

@@ -9,7 +9,7 @@
     <el-tab-pane label="重点区域" name="重点区域">
         <el-form class="form-wrapper" :inline="true" :model="formInline">
           <el-form-item label="重点区域">
-            <el-select v-model="formInline1.keyArea" placeholder="请选择" popper-class="cur-select">
+            <el-select clearable v-model="formInline1.keyAreas" placeholder="请选择" popper-class="cur-select">
               <el-option v-for="item in options"  :key="item.label" :label="item.label" :value="item.value"></el-option>
             </el-select>
           </el-form-item>
@@ -30,10 +30,10 @@
     <el-tab-pane label="具体道路" name="具体道路">
         <el-form class="form-wrapper" :inline="true" :model="formInline2">
           <el-form-item label="具体道路">
-            <el-input v-model="formInline1.plateNo" placeholder="请输入"></el-input>
+            <el-input v-model="formInline2.streetName" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="onSubmit1">查询</el-button>
+            <el-button type="primary" @click="onSubmit2">查询</el-button>
           </el-form-item>
         </el-form>
         <el-table :data="tableData2">
@@ -41,7 +41,7 @@
           </el-table-column>
         </el-table>
         <div class="table-pagination">
-          <el-pagination layout="prev, pager, next" :total="total1" @current-change="handlePageChange1"
+          <el-pagination layout="prev, pager, next" :total="total1" @current-change="handlePageChange2"
                          :current-page.sync="pageNum2" :page-size.sync="pageSize2">
           </el-pagination>
         </div>
@@ -155,11 +155,11 @@ export default {
       columns1: [
         {
           label: '重点区域',
-          key: 'plateNo'
+          key: 'keyAreas'
         },
         {
           label: '设备数',
-          key: 'carType'
+          key: 'deviceNum'
         }
       ],
       tableData1: [],
@@ -167,16 +167,16 @@ export default {
       pageSize1: 10,
       pageNum1: 1,
       formInline1: {
-        keyArea: ''
+        keyAreas: ''
       },
       columns2: [
         {
           label: '道路',
-          key: 'streatName'
+          key: 'streetName'
         },
         {
           label: '设备数',
-          key: 'carParkName'
+          key: 'deviceNum'
         },
       ],
       tableData2: [],
@@ -184,7 +184,7 @@ export default {
       pageSize2: 10,
       pageNum2: 1,
       formInline2: {
-        streatName: ''
+        streetName: ''
       },
     };
   },
@@ -205,13 +205,15 @@ export default {
     },
     getTableData1() {
       const {pageNum1, pageSize1} = this
-      api.queryServiceList({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
+      api.zdqyList({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
         this.tableData1 = res.data.records || [];
         this.total1 = res.data.total || 0
       })
     },
     getTableData2() {
-      api.queryServiceList({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
+      const {pageNum2, pageSize2} = this
+      console.log('22222')
+      api.dlList({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
         this.tableData2 = res.data.records || [];
         this.total2 = res.data.total || 0
       })
@@ -236,6 +238,8 @@ export default {
     },
   },
   mounted() {
+    this.getTableData1()
+    this.getTableData2()
     api.queryServiceMap().then(res => {
       let arr = []
       let dataSoure = res.data || {}

static/mung-local-config.js

@@ -1,6 +1,6 @@
 window.mungConfig = {
   dev: {
-    BASE_API: "http://localhost:16399/luohe2_ee/api"
+    BASE_API: "https://park.lhzhtc.cn/luohe2_ee/api"
   },
   build: {
     BASE_API: "https://park.lhzhtc.cn/luohe2_ee/api"