Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/pages/index/layouts/indexLayout.vue

config/index.js

@@ -11,7 +11,8 @@ module.exports = {
     assetsPublicPath: "/",
 
     // Various Dev Server settings
-    host: process.env.HOST || "localhost", // can be overwritten by process.env.HOST
+    host: '0.0.0.0', // can be overwritten by process.env.HOST
+    // host: process.env.HOST || "localhost", // can be overwritten by process.env.HOST
     port: process.env.PORT || 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

src/pages/index/components/announcement_function.vue

@@ -2,7 +2,7 @@
   <div class="body-wrapper">
     <div>
       <h2 style="color: white;margin-bottom: 20px;display: inline-block;width: 90%">公告信息</h2>
-      <el-button type="primary">发布公告</el-button>
+      <el-button type="primary" @click="handleAdd">发布公告</el-button>
     </div>
     <el-table :data="tableData" style="background: #2a2a2a;border-color: #333;">
       <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
@@ -13,6 +13,26 @@
                      :current-page.sync="pageNum" :page-size.sync="pageSize">
       </el-pagination>
     </div>
+    <el-dialog
+      :title="title"
+      :visible.sync="dialogVisible"
+      width="50%"
+      custom-class="audit-dialog">
+      <div style="height: 100px" class="form-div">
+        <el-form label-position="left" label-width="80px" :model="formLabelAlign">
+          <el-form-item label="发布标题">
+            <el-input v-model="formLabelAlign.publicTitle"></el-input>
+          </el-form-item>
+          <el-form-item label="发布人">
+            <el-input v-model="formLabelAlign.publicPerson"></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <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>
@@ -45,7 +65,13 @@ export default {
       radio: '2',
       dialogVisible: false,
       selRow: {},
-      searchWords: undefined
+      searchWords: undefined,
+      formLabelAlign: {
+        publicTitle: '',
+        // publicTime: '',
+        publicPerson: ''
+      },
+      title: ''
     }
   },
   mounted() {
@@ -64,10 +90,17 @@ export default {
     handleCancelApply(row) {
       console.log('enter handle cancel apply')
     },
+    handleAdd () {
+      this.title = '发布公告'
+      this.formLabelAlign.publicTitle = ''
+      // this.formLabelAlign.publicTime = ''
+      this.formLabelAlign.publicPerson = ''
+      this.dialogVisible = true
+    },
     handleConfirm() {
       const {id} = this.selRow
       console.log('radio', this.radio)
-      api.applyResource({id, applyType: this.radio}).then(res => {
+      api.applyResource({id, applyType: this.formLabelAlign.publicTitle}).then(res => {
         if(res.success) {
           this.dialogVisible = false
           this.$message({
@@ -155,5 +188,14 @@ export default {
   .label{
     text-align: right;
   }
+  .form-div{
+    /deep/ .el-input__inner{
+      background: white;
+      height: 35px;
+      width: 90%;
+      border: 1px solid #a6a5a5;
+      color: black;
+    }
+  }
 }
 </style>

src/pages/index/components/message.vue

@@ -8,7 +8,7 @@
       </el-table-column>
       <el-table-column label="操作" width="150">
       <div slot-scope="scope">
-        <el-button type="primary" size="mini">详情</el-button>
+        <el-button  @click="handleDetail(scope.row)" type="primary" size="mini">详情</el-button>
       </div>
     </el-table-column>
     </el-table>
@@ -17,6 +17,17 @@
                      :current-page.sync="pageNum" :page-size.sync="pageSize">
       </el-pagination>
     </div>
+    <el-dialog
+      title="详情"
+      :visible.sync="dialogVisible"
+      width="50%"
+      custom-class="audit-dialog">
+      <div class="form-div">
+        <el-input disabled v-model="selRow.title"></el-input>
+        <el-input type="textarea" disabled v-model="selRow.messageType"></el-input>
+        <el-input disabled v-model="selRow.publicTime"></el-input>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -68,6 +79,10 @@ export default {
     handleCancelApply(row) {
       console.log('enter handle cancel apply')
     },
+    handleDetail(row) {
+      this.selRow = row
+      this.dialogVisible = true
+    },
     handleConfirm() {
       const {id} = this.selRow
       console.log('radio', this.radio)
@@ -127,5 +142,19 @@ export default {
   .label{
     text-align: right;
   }
+  .form-div{
+    width: 90%;
+    /deep/ .el-input__inner{
+      background: white;
+      height: 35px;
+      color: black;
+      margin-bottom: 10px;
+    }
+    /deep/ .el-textarea.is-disabled .el-textarea__inner {
+      background: white;
+      color: black;
+      margin-bottom: 10px;
+    }
+  }
 }
 </style>

src/pages/index/components/parking_fee.vue

@@ -25,13 +25,12 @@
       <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="150">
-        <div slot-scope="scope">
-          <el-button
-            size="mini">编辑</el-button>
-          <el-button
-            size="mini"
-            type="danger">删除</el-button>
-        </div>
+        <template slot-scope="scope" style="display: inline-block">
+          <el-button type="primary" @click="handleAudit(scope.row)" slot="reference">修改</el-button>
+          <el-popconfirm title="确定删除吗？" @confirm="deleteRow(scope.row)">
+            <el-button type="danger" slot="reference">删除</el-button>
+          </el-popconfirm>
+        </template>
       </el-table-column>
     </el-table>
     <div class="table-pagination">
@@ -39,6 +38,44 @@
                      :current-page.sync="pageNum" :page-size.sync="pageSize">
       </el-pagination>
     </div>
+    <el-dialog
+      :title="title"
+      :visible.sync="dialogVisible"
+      width="50%"
+      custom-class="audit-dialog">
+      <div style="height: 350px" class="form-div">
+        <el-form label-position="left" label-width="80px" :model="formLabelAlign">
+          <el-form-item label="停车路段">
+            <el-input v-model="formLabelAlign.parkRoad"></el-input>
+          </el-form-item>
+          <el-form-item label="停车位置">
+            <el-input v-model="formLabelAlign.parkStall"></el-input>
+          </el-form-item>
+          <el-form-item label="车牌号">
+            <el-input v-model="formLabelAlign.plateCode"></el-input>
+          </el-form-item>
+          <el-form-item label="车牌类型">
+            <el-input v-model="formLabelAlign.plateType"></el-input>
+          </el-form-item>
+          <el-form-item label="停车时间">
+            <el-input v-model="formLabelAlign.parkTime"></el-input>
+          </el-form-item>
+          <el-form-item label="离开时间">
+            <el-input v-model="formLabelAlign.leaveTime"></el-input>
+          </el-form-item>
+          <el-form-item label="修改人">
+            <el-input v-model="formLabelAlign.revisePerson"></el-input>
+          </el-form-item>
+          <el-form-item label="修改时间">
+            <el-input v-model="formLabelAlign.reviseTime"></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <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>
@@ -95,7 +132,18 @@ export default {
       formInline: {
         searchTime: '',
         searchWord: ''
-      }
+      },
+      formLabelAlign: {
+        parkRoad: '',
+        parkStall: '',
+        plateCode: '',
+        plateType: '',
+        parkTime: '',
+        leaveTime: '',
+        revisePerson: '',
+        reviseTime: '',
+      },
+      title: ''
     }
   },
   mounted() {
@@ -104,6 +152,22 @@ export default {
   watch: {
   },
   methods: {
+    handleAudit(row) {
+      this.title = '修改停车收费取证'
+      this.formLabelAlign.parkRoad = row.resourceName
+      this.formLabelAlign.parkStall = row.resourceName
+      this.formLabelAlign.plateCode = row.resourceName
+      this.formLabelAlign.plateType = row.resourceName
+      this.formLabelAlign.parkTime = row.resourceName
+      this.formLabelAlign.leaveTime = row.resourceName
+      this.formLabelAlign.revisePerson = row.resourceName
+      this.formLabelAlign.reviseTime = row.resourceName
+      this.formLabelAlign=row
+      this.dialogVisible = true
+    },
+    deleteRow (record) {
+      console.log(record)
+    },
     handlePageChange() {
       this.getTableData()
     },
@@ -111,9 +175,7 @@ export default {
       console.log('enter handle cancel apply')
     },
     handleConfirm() {
-      const {id} = this.selRow
-      console.log('radio', this.radio)
-      api.applyResource({id, applyType: this.radio}).then(res => {
+      api.applyResource({id, applyType: this.formLabelAlign.parkRoad}).then(res => {
         if(res.success) {
           this.dialogVisible = false
           this.$message({
@@ -124,6 +186,9 @@ export default {
         }
       })
     },
+    onSubmit () {
+      this.getTableData()
+    },
     getTableData() {
       const {pageNum, pageSize, searchWords} = this
       api.applyList({pageNum, pageSize, resourceName: searchWords}).then(res => {
@@ -144,44 +209,6 @@ export default {
 }
 </script>
 <style  lang="scss" scoped>
-
-.form-wrapper {
-  margin-bottom: 20px;
-}
-/deep/ .el-input__inner {
-  background: #2d3744;
-  border: none;
-  border-radius: 0;
-}
-/deep/ .el-select {
-  height: 40px;
-  .el-input__inner {
-    height: 40px;
-  }
-  .el-input__prefix, .el-input__suffix {
-    height: 40px;
-  }
-
-  /* 下面设置右侧按钮居中 */
-  .el-input__suffix {
-    top: 0px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex-wrap: nowrap;
-    flex-direction: row;
-    align-content: flex-start;
-  }
-  /* 输入框加上上下边是 32px + 2px =34px */
-  .el-input__icon {
-    line-height: 0px;
-  }
-}
-/deep/ .form-wrapper .el-button {
-  background: linear-gradient(90deg,#0158d9,#3c97e4);
-  width: 100px;
-  height: 40px;
-}
 .body-wrapper {
   padding: 20px;
   background: #0c0c0c;
@@ -208,5 +235,14 @@ export default {
   .label{
     text-align: right;
   }
+  .form-div{
+    /deep/ .el-input__inner{
+      background: white;
+      height: 35px;
+      width: 90%;
+      border: 1px solid #a6a5a5;
+      color: black;
+    }
+  }
 }
 </style>

src/pages/index/components/service_publish.vue

@@ -2,7 +2,7 @@
   <div class="body-wrapper">
     <div>
       <h2 style="color: white;margin-bottom: 20px;display: inline-block;width: 90%">服务发布列表</h2>
-      <el-button type="primary">配置服务</el-button>
+      <el-button type="primary" @click="handleAdd">配置服务</el-button>
     </div>
     <el-table :data="tableData" style="background: #2a2a2a;border-color: #333;">
       <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
@@ -13,6 +13,32 @@
                      :current-page.sync="pageNum" :page-size.sync="pageSize">
       </el-pagination>
     </div>
+    <el-dialog
+      :title="title"
+      :visible.sync="dialogVisible"
+      width="50%"
+      custom-class="audit-dialog">
+      <div style="height: 100px" class="form-div">
+        <el-form label-position="left" label-width="80px" :model="formLabelAlign">
+          <el-form-item label="接口名称">
+            <el-input v-model="formLabelAlign.interfaceName"></el-input>
+          </el-form-item>
+          <el-form-item label="接口地址">
+            <el-input v-model="formLabelAlign.interfaceAddress"></el-input>
+          </el-form-item>
+<!--          <el-form-item label="提交状态">-->
+<!--            <el-input v-model="formLabelAlign.submitState"></el-input>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="发布状态">-->
+<!--            <el-input v-model="formLabelAlign.publicState"></el-input>-->
+<!--          </el-form-item>-->
+        </el-form>
+      </div>
+      <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>
@@ -49,7 +75,14 @@ export default {
       radio: '2',
       dialogVisible: false,
       selRow: {},
-      searchWords: undefined
+      searchWords: undefined,
+      formLabelAlign: {
+        interfaceName: '',
+        interfaceAddress: '',
+        // submitState: '',
+        // publicState: ''
+      },
+      title: ''
     }
   },
   mounted() {
@@ -68,10 +101,18 @@ export default {
     handleCancelApply(row) {
       console.log('enter handle cancel apply')
     },
+    handleAdd () {
+      this.title = '配置服务'
+      this.formLabelAlign.interfaceName = ''
+      this.formLabelAlign.interfaceAddress = ''
+      // this.formLabelAlign.submitState = ''
+      // this.formLabelAlign.publicState = ''
+      this.dialogVisible = true
+    },
     handleConfirm() {
       const {id} = this.selRow
       console.log('radio', this.radio)
-      api.applyResource({id, applyType: this.radio}).then(res => {
+      api.applyResource({id, applyType: this.formLabelAlign.interfaceName}).then(res => {
         if(res.success) {
           this.dialogVisible = false
           this.$message({
@@ -127,5 +168,13 @@ export default {
   .label{
     text-align: right;
   }
+  .form-div{
+    /deep/ .el-input__inner{
+      height: 35px;
+      width: 90%;
+      border: 1px solid #a6a5a5;
+      color: black;
+    }
+  }
 }
 </style>

src/pages/index/components/support.vue

@@ -2,7 +2,7 @@
   <div class="body-wrapper">
     <div>
       <h2 style="color: white;margin-bottom: 20px;display: inline-block;width: 90%">技术支持</h2>
-      <el-button type="primary">申请技术支持</el-button>
+      <el-button type="primary" @click="handleAdd">申请技术支持</el-button>
     </div>
     <el-table :data="tableData" style="background: #2a2a2a;border-color: #333;">
       <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
@@ -13,6 +13,28 @@
                      :current-page.sync="pageNum" :page-size.sync="pageSize">
       </el-pagination>
     </div>
+    <el-dialog
+      :title="title"
+      :visible.sync="dialogVisible"
+      width="50%"
+      custom-class="audit-dialog">
+      <div style="height: 100px" class="form-div">
+        <el-form label-position="left" label-width="80px" :model="formLabelAlign">
+          <el-form label-position="left" label-width="80px" :model="formLabelAlign">
+            <el-form-item label="申请名称">
+              <el-input v-model="formLabelAlign.requestTitle"></el-input>
+            </el-form-item>
+            <el-form-item label="支持渠道">
+              <el-input v-model="formLabelAlign.supportChannel"></el-input>
+            </el-form-item>
+          </el-form>
+        </el-form>
+      </div>
+      <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>
@@ -48,7 +70,11 @@ export default {
       radio: '2',
       dialogVisible: false,
       selRow: {},
-      searchWords: undefined
+      searchWords: undefined,
+      formLabelAlign: {
+        requestTitle: '',
+        supportChannel: ''
+      },
     }
   },
   mounted() {
@@ -67,10 +93,16 @@ export default {
     handleCancelApply(row) {
       console.log('enter handle cancel apply')
     },
+    handleAdd () {
+      this.title = '技术支持申请'
+      this.formLabelAlign.requestTitle = ''
+      this.formLabelAlign.supportChannel = ''
+      this.dialogVisible = true
+    },
     handleConfirm() {
       const {id} = this.selRow
       console.log('radio', this.radio)
-      api.applyResource({id, applyType: this.radio}).then(res => {
+      api.applyResource({id, applyType: this.formLabelAlign.requestTitle}).then(res => {
         if(res.success) {
           this.dialogVisible = false
           this.$message({
@@ -126,5 +158,13 @@ export default {
   .label{
     text-align: right;
   }
+  .form-div{
+    /deep/ .el-input__inner{
+      height: 35px;
+      width: 90%;
+      border: 1px solid #a6a5a5;
+      color: black;
+    }
+  }
 }
 </style>

src/pages/index/layouts/indexLayout.vue

@@ -36,13 +36,10 @@ export default {
       isCollapse: false,//默认为不折叠菜单
       foldphoto: "el-icon-s-unfold",//菜单展开图标
       menu: [
-        {name: 'demo1', url: '/demo1'},
-        {name: 'demo2', url: '/demo2'},
-        {name: '车辆迁徒分析', url: '/bmap'},
-        {name: 'hot_map', url: '/hot_map'},
-        {name: 'heat_map', url: '/heat_map'},
         {name: '静态资源', url: '/static_resource'},
         {name: '记录查询', url: '/record_query'},
+        {name: '数据对接', url: '/data_docking'},
+        {name: '停车运行监管', url: '/park_monitor'},
         {name: '停车行为监测', url: '/park_bahavior'},
         {name: '设备运行监测', url: '/equipment_running'},
         {name: '从业人员资质', url: '/employee_qualification'},
@@ -50,15 +47,14 @@ export default {
         {name: '收费价格监管', url: '/charge_price'},
         {name: '车主信用监管', url: '/car_owner_credit'},
         {name: '企业服务监管', url: '/enterprise_service'},
-        {name: '数据对接', url: '/data_docking'},
         {name: '泊位基础情况', url: '/berths_information'},
+        {name: '泊位使用情况', url: '/berths_usage'},
+        {name: '泊位营收情况', url: '/berths_revenue'},
+        {name: '停车场情况', url: '/parking_lot_situation'},
         {name: '泊位运营分析', url: '/berth_peration_nalysis'},
         {name: '收费业务分析', url: '/charge_business_analysis'},
         {name: '接入数据分析', url: '/access_data_analysis'},
         {name: '道路(路内)泊位主题', url: '/berth_road'},
-        {name: '停车运行监管', url: '/park_monitor'},
-        {name: '停车行为检测', url: '/park_bahavior'},
-        {name: '设备运行检测', url: '/equipment_running'},
         {name: '经营性(路外)车场主题', url: '/berth_road_out'},
         {name: '停车收费取证主题', url: '/parking_fee'},
         {name: '车辆违规主题', url: '/vehicle_violations'},
@@ -66,26 +62,28 @@ export default {
         {name: '区域停车主题', url: '/parking_area'},
         {name: '设备运营主题', url: '/service_operations'},
         {name: '停车饱和预警', url: '/saturation_warning'},
+        {name: '车辆迁徒分析', url: '/bmap'},
         {name: '停车缺口分析', url: '/gap_analysis'},
         {name: '停车难易指数', url: '/park_easy'},
         {name: '全局停车诱导', url: '/park_guidance'},
         {name: '区域停车发展分析', url: '/park_development_analysis'},
         {name: '路内泊位设置推荐', url: '/berth_recommend'},
-        {name: '停车盲点挖招', url: '/blind_spot_digging'},
+        {name: '停车盲点挖掘', url: '/blind_spot_digging'},
+        {name: '其他分析', url: '/other_analyse'},
         {name: '服务发布功能', url: '/service_publish'},
         {name: '公告功能', url: '/announcement_function'},
         {name: '消息中心功能', url: '/message'},
         {name: '技术支持功能', url: '/support'},
         {name: '服务监控功能', url: '/service_monitor'},
-        {name: '泊位使用情况', url: '/berths_usage'},
-        {name: '泊位营收情况', url: '/berths_revenue'},
-        {name: '停车场情况', url: '/parking_lot_situation'},
-        {name: '其他分析', url: '/other_analyse'},
         {name: '凭证管理功能', url: '/credential_management_function'},
         {name: '服务订阅功能', url: '/service_subscription_function'},
         {name: 'IP白名单功能', url: '/ip_white_list'},
         {name: '服务调用功能', url: '/service_call_function'},
         {name: '操作日志功能', url: '/operation_log'},
+        {name: 'demo1', url: '/demo1'},
+        {name: 'demo2', url: '/demo2'},
+        {name: 'hot_map', url: '/hot_map'},
+        {name: 'heat_map', url: '/heat_map'},
       ]
     }
   },