Merge remote-tracking branch 'origin/master'

src/pages/home/components/demo.vue

@@ -1,164 +0,0 @@
-<template>
-  <div class="body-wrapper">
-    <div class="search-card">
-        <el-input class="input-wrapper" v-model="searchWords" placeholder="请输入关键字">
-          <el-button slot="append" icon="el-icon-search"  @click="getTableData"></el-button>
-        </el-input>
-    </div>
-    <el-table :data="tableData">
-      <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
-      </el-table-column>
-      <el-table-column
-        label="操作"
-        width="100">
-        <template slot-scope="scope">
-            <el-button v-if="scope.row && scope.row.applyType === '1'" @click="handleAudit(scope.row)" type="text" size="small">审核</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="table-pagination">
-      <el-pagination :background="false" layout="total, prev, pager, next" :total="total" @current-change="handlePageChange"
-        :current-page.sync="pageNum" :page-size.sync="pageSize">
-      </el-pagination>
-    </div>
-    <el-dialog
-        title="审核"
-        :visible.sync="dialogVisible"
-        width="60%"
-        custom-class="audit-dialog">
-        <el-row class="mg-bt">
-            <el-col class="label" :span="4">审核：</el-col>
-            <el-col :span="18">
-                <el-radio v-model="radio" label="2">通过</el-radio>
-                <el-radio v-model="radio" label="3">驳回</el-radio>
-            </el-col>
-        </el-row>
-        <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="handleConfirm">确 定</el-button>
-        </span>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import api from "@/api/audit.js";
-
-export default {
-    components: {},
-    data() {
-      return {
-        columns: [
-          {
-            label: '资源名称',
-            key: 'resourceName'
-          },
-          {
-            label: '资源类型',
-            key: 'resourceType'
-          },
-          {
-            label: '申请人',
-            key: 'userName'
-          },
-          {
-            label: '状态',
-            key: 'applyTypeText'
-          }
-        ],
-        tableData: [],
-        total: 0,
-        pageSize: 10,
-        pageNum: 1,
-        radio: '2',
-        dialogVisible: false,
-        selRow: {},
-        searchWords: undefined
-      }
-    },
-    mounted() {
-      this.getTableData()
-    },
-    watch: {
-    },
-    methods: {
-      handlePageChange() {
-        this.getTableData()
-      },
-      handleAudit(row) {
-        this.selRow = row
-        this.dialogVisible = true
-      },
-      handleCancelApply(row) {
-        console.log('enter handle cancel apply')
-      },
-      handleConfirm() {
-        const {id} = this.selRow
-        console.log('radio', this.radio)
-        api.applyResource({id, applyType: this.radio}).then(res => {
-          if(res.success) {
-            this.dialogVisible = false
-            this.$message({
-              message: '审核成功!',
-              type: 'success'
-            })
-            this.getTableData()
-          }
-        })
-      },
-      getTableData() {
-        const {pageNum, pageSize, searchWords} = this
-        api.applyList({pageNum, pageSize, resourceName: searchWords}).then(res => {
-          this.tableData = []
-          res.data.records.map((item, index) => {
-            const newItem = {...item}
-            newItem.applyTypeText = this.getApplyTypeText(item.applyType)
-            this.tableData.push(newItem)
-          })
-          this.total = res.data.total
-        })
-      },
-      getApplyTypeText(val) {
-        if (!val){
-          return '未申请'
-        }
-        const textMap = {
-          1: '待审批',
-          2: '审批通过',
-          3: '审批驳回'
-        }
-        return textMap[val]
-      },
-      handleSearch() {
-        this.pageNum = 1
-        this.getTableData()
-      }
-    }
-}
-</script>
-<style  lang="scss" scoped>
-.body-wrapper {
-  padding: 20px;
-  .button-block{
-    text-align: right;
-    margin-bottom: 20px;
-  }
-  .table-pagination{
-    text-align: right;
-  }
-  .search-card{
-    margin-bottom: 20px;
-    text-align: center;
-    .input-wrapper{
-        width: 36%;
-    }
-  }
-}
-.audit-dialog{
-    .mg-bt{
-        margin-bottom: 24px;
-    }
-    .label{
-        text-align: right;
-    }
-}
-</style>

src/pages/home/home.html

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <title>监管平台管理</title>
-    <script src="static/mung-local-config.js"></script>
-    <script src="static/jquery-3.1.0.min.js"></script>
-  </head>
-  <body>
-    <div id="home"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>

src/pages/home/home.js

@@ -1,21 +0,0 @@
-import Vue from 'vue'
-import ElementUI from "element-ui"
-import "element-ui/lib/theme-chalk/index.css"
-import mixins from '../../mixins'
-import home from './home.vue'
-import router from "../../router/home"
-import config from '@/config/index';
-
-Vue.mixin(mixins)
-Vue.use(ElementUI);
-Vue.prototype.baseUrl =
-  process.env.NODE_ENV !== "development"
-    ? config.build.BASE_API
-    : config.dev.BASE_API;
-
-/* eslint-disable no-new */
-new Vue({
-  router,
-  el: '#home',
-  render: h => h(home)
-})

src/pages/home/home.vue

@@ -1,5 +0,0 @@
-<template>
-  <div id="home">
-    <router-view />
-  </div>
-</template>

src/pages/home/layouts/homeLayout.vue

@@ -1,70 +0,0 @@
-<template>
-  <div :class="['home-wrapper']">
-<!--    <div class="maintitle">漯河管理系统</div>-->
-    <el-container style="height: 100%;">
-      <!-- default-active设置进入页面时默认打开的菜单条目路由（这里的/indexpage是首页菜单条目的路由）；:router设置为真，打开路由；:collapse这里联合折叠图标实现菜单折叠与展开 -->
-      <el-menu v-if="showMenu" default-active="/redirectMaintain" :router="true" background-color="#001529"
-               text-color="#fff" style="overflow-y: scroll; width: 200px; border: none;">
-<!--        <div class="fold">-->
-          <!--折叠菜单的图标 -->
-<!--          <i class="icon" :class="foldphoto"></i>-->
-<!--        </div>-->
-        <div class="luohetitle">漯河管理系统</div>
-        <el-submenu index="1" style="">
-          <template slot="title">
-            <!-- i标签的class值为element-UI官网icon图标值，可直接引用 -->
-            <i class="el-icon-s-home icon"></i>
-            <span>监管平台</span>
-          </template>
-          <!-- index为对应菜单条目的路由，在router文件夹的index.js中设置 -->
-          <el-menu-item v-for="(item, index) in menu" :key="index" :index="item.url">{{item.name}}</el-menu-item>
-        </el-submenu>
-      </el-menu>
-      <el-main class="main">
-        <!--引入跳转路由-->
-        <router-view></router-view>
-      </el-main>
-    </el-container>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      showMenu: process.env.NODE_ENV === 'development',
-      isCollapse: false,//默认为不折叠菜单
-      foldphoto: "el-icon-s-unfold",//菜单展开图标
-      menu: [
-        {name: '白色demo', url: '/demo'},
-      ]
-    }
-  },
-  mounted() {
-
-  },
-  methods: {
-    // isfold() {
-    //   //每次点击折叠图标值取反
-    //   this.isCollapse = !this.isCollapse
-    //   if (this.isCollapse) {
-    //     //折叠图标
-    //     this.foldphoto = "el-icon-s-fold"
-    //   } else {
-    //     //展开图标
-    //     this.foldphoto = "el-icon-s-unfold"
-    //   }
-    // }
-  }
-}
-</script>
-
-<style scoped>
-.home-wrapper {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  background-size: cover;
-  box-sizing: border-box;
-}
-</style>

src/pages/index/components/other_analyse.vue

@@ -210,27 +210,6 @@ export default {
   },
   data() {
     return {
-      options: [{
-        value: '源汇区',
-        label: '源汇区'
-      }, {
-        value: '召陵区',
-        label: '召陵区'
-      }],
-      options2: [{
-        value: '违规停车高发区',
-        label: '违规停车高发区'
-      }, {
-        value: '事故高发区',
-        label: '事故高发区'
-      }],
-      options3: [{
-        value: '团结路',
-        label: '团结路'
-      }, {
-        value: '人民东路',
-        label: '人民东路'
-      }],
       ccsl: ["#ff8700","#9078f8","#ff0000","#4cff37","#4382f6"],
       ccslvalue: [],
       bardata: [],

src/pages/index/components/saturation_warning.vue

@@ -2,16 +2,16 @@
   <div class="body-wrapper">
     <div style="color: #3498db;font-size: 23px;margin-bottom: 20px">全市停车饱和度</div>
     <el-form class="form-wrapper" :inline="true" :model="formInline">
-      <el-form-item label="区县:">
-        <el-select v-model="formInline.region0" placeholder="区县" popper-class="cur-select">
-          <el-option label="全部" value=""></el-option>
-          <el-option label="源汇区" value="源汇区"></el-option>
-          <el-option label="郾城区" value="郾城区"></el-option>
-          <el-option label="召陵区" value="召陵区"></el-option>
-          <el-option label="舞阳县" value="舞阳县"></el-option>
-          <el-option label="临颍县" value="临颍县"></el-option>
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="区县:">-->
+<!--        <el-select v-model="formInline.region0" placeholder="区县" popper-class="cur-select">-->
+<!--          <el-option label="全部" value=""></el-option>-->
+<!--          <el-option label="源汇区" value="源汇区"></el-option>-->
+<!--          <el-option label="郾城区" value="郾城区"></el-option>-->
+<!--          <el-option label="召陵区" value="召陵区"></el-option>-->
+<!--          <el-option label="舞阳县" value="舞阳县"></el-option>-->
+<!--          <el-option label="临颍县" value="临颍县"></el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="街道:">-->
 <!--        <el-select v-model="formInline.region1" placeholder="街道" popper-class="cur-select">-->
 <!--          <el-option label="老街街道" value="老街街道"></el-option>-->

src/router/home.js

@@ -1,26 +0,0 @@
-import Vue from "vue";
-import Router from "vue-router";
-
-// 解决重复点菜单报错问题
-const originalPush = Router.prototype.push;
-Router.prototype.push = function push(location) {
-  return originalPush.call(this, location).catch(err => err);
-};
-Vue.use(Router);
-
-export default new Router({
-  routes: [
-    { path: "/", redirect: "/demo" },
-    {
-      path: "/index",
-      component: () => import("../pages/home/layouts/homeLayout.vue"),
-      children: [
-        {
-          name: "demo",
-          path: "/demo",
-          component: () => import("../pages/home/components/demo.vue")
-        },
-      ]
-    }
-  ]
-});

src/router/index.js

@@ -10,6 +10,7 @@ Vue.use(Router);
 
 export default new Router({
   mode: 'history',
+  baseUrl: '/luohe_park',
   routes: [
     { path: "/", redirect: "/static_resource" },
     {