Hwt пре 2 година
родитељ
комит
4cb660ef66

+ 1 - 0
smart/package.json

@@ -8,6 +8,7 @@
     "dev-sit": "vue-cli-service serve --mode sit",
     "dev-production": "vue-cli-service serve --mode production",
     "build-sit": "vue-cli-service build --mode sit",
+    "build-production": "vue-cli-service build --mode production",
     "build": "vue-cli-service build"
   },
   "dependencies": {

+ 1 - 4
smart/src/config/env.development.js

@@ -9,7 +9,7 @@ module.exports = {
     edition: 'development',
     Env: 'prod', // // 测试环境 dev |  正式环境 prod
 
-    baseUrl: 'http://114.135.61.186:21020/sc-operation/', // 项目地址
+    baseUrl: 'http://114.135.61.186:21020/sc-park/', // 项目地址
 
     baseApi: 'http://114.135.61.186:21012/', // 本地api请求地址
     baseMapApi: 'http://114.135.61.187:38082', // arcgis API
@@ -17,9 +17,6 @@ module.exports = {
     baseExcelApi: 'http://114.135.61.187:38082', // excel请求地址
     loginUrl: 'http://114.135.61.186:21020/sc-login/',
     websoketUrl: '114.135.61.186:21012',
-    warnDetailUrl: 'http://114.135.61.188:18093/dispatch/warnDetail', // 综合调度系统-系统管理-报警管理-报警详情界面
-    taskManagementUrl: 'http://114.135.61.188:18093/maintenance/taskManagement', // 运维管理系统-巡检管理-任务管理界面
-    eventHiddenDangerUrl: 'http://114.135.61.188:18093/maintenance/eventHiddenDanger', // 运维管理系统-工单管理-事件隐患界面
 
     upload: {
         imageSize: 5, // MB

+ 6 - 9
smart/src/config/env.production.js

@@ -8,16 +8,13 @@
 module.exports = {
   edition: "production",
   Env: "prod", // // 测试环境 dev |  正式环境 prod
-  baseUrl: "http://114.135.61.186:21020/sc-login/", // 项目地址
-  baseApi: "http://114.135.61.186:21020", // 本地api请求地址
-  baseMapApi: "http://114.135.61.186:21020", // arcgis API
-  baseImgApi: "http://114.135.61.186:21020", // 图片api请求地址
-  baseExcelApi: "http://114.135.61.186:21020", // excel请求地址
-  loginUrl: "http://114.135.61.186:21020/sc-login/",
+  baseUrl: "https://sc.100zone.cn/sc-park/", // 项目地址
+  baseApi: "https://sc.100zone.cn/", // 本地api请求地址
+  baseMapApi: "https://sc.100zone.cn/", // arcgis API
+  baseImgApi: "https://sc.100zone.cn/", // 图片api请求地址
+  baseExcelApi: "https://sc.100zone.cn/", // excel请求地址
+  loginUrl: "https://sc.100zone.cn/sc-login/",
   websoketUrl: '114.135.61.186:21012',
-  warnDetailUrl: "http://114.135.61.188:18093/dispatch/warnDetail",// 综合调度系统-系统管理-报警管理-报警详情界面
-  taskManagementUrl: "http://114.135.61.188:18093/maintenance/taskManagement",// 运维管理系统-巡检管理-任务管理界面
-  eventHiddenDangerUrl: "http://114.135.61.188:18093/maintenance/eventHiddenDanger",// 运维管理系统-工单管理-事件隐患界面
 
   upload: {
     imageSize: 5, // MB

+ 1 - 7
smart/src/config/env.sit.js

@@ -8,19 +8,13 @@
 module.exports = {
     edition: "production",
     Env: "sit", // 商用环境: prod   |   演示环境: demo
-    baseUrl: "http://114.135.61.186:21020/sc-login/", // 项目地址
+    baseUrl: "http://114.135.61.186:21020/sc-park/", // 项目地址
     baseApi: "http://114.135.61.186:21020", // 本地api请求地址
     baseImgApi: "http://114.135.61.186:21020", // 图片api请求地址
     baseExcelApi: "http://114.135.61.186:21020", // excel请求地址
     baseMapApi:"http://114.135.61.187:38082",
     loginUrl: "http://114.135.61.186:21020/sc-login/", // 项目地址
     websoketUrl: '114.135.61.186:21012',
-    warnDetailUrl:"http://114.135.61.186:21020/dispatch/warnDetail",// 综合调度系统-系统管理-报警管理-报警详情界面
-    twosupplywarnDetailUrl:"http://114.135.61.186:21020/secondwatersupply/warnDetail",// 二供系统-报警管理-报警详情界面
-    pdwarnDetailUrl:"http://114.135.61.186:21020/productionmanage/warnDetail",//生产管理系统-报警管理-报警详情界面
-    gwwarnDetailUrl:"http://114.135.61.186:21020/gwmangement/warnDetail",//管网管理系统-报警管理-报警详情界面
-    taskManagementUrl:"http://114.135.61.186:21020/maintenance/taskManagement",// 运维管理系统-巡检管理-任务管理界面
-    eventHiddenDangerUrl:"http://114.135.61.186:21020/maintenance/eventHiddenDanger",// 运维管理系统-工单管理-事件隐患界面
     
     upload: {
       imageSize: 5, // MB

+ 0 - 7
smart/src/views/accessRecord/index.vue

@@ -126,13 +126,6 @@ export default {
         this.mixins_query = { plateNo: this.mixins_query.plateNo, parkId: this.mixins_query.parkId, parkName: this.parkName, startTime: this.mixins_query.startTime, endTime: this.mixins_query.endTime };
         this.mixins_search();
       }
-
-
-
-
-
-
-
     },
     viewDetails (row) {
       // 详情

+ 6 - 6
smart/src/views/channelManagement/index.vue

@@ -114,7 +114,7 @@ export default {
   methods: {
     // 获取停车场名称
     nameParking () {
-      this.$http.post('/sc-community-web/parkingCar/findParkInfo', { pageNum: this.mixins_page.pageNum, pageSize: this.mixins_page.pageSize }).then(({ data, status, msg }) => {
+      this.$http.post('/sc-community/parkingCar/findParkInfo', { pageNum: this.mixins_page.pageNum, pageSize: this.mixins_page.pageSize }).then(({ data, status, msg }) => {
         console.log(data.list);
         for (let i = 0; i < data.list.length; i++) {
           this.nameParkingLot.push({
@@ -135,7 +135,7 @@ export default {
       if (this.nameParkingLotName.length == 0) {
         this.$message.error('请选择停车场名称');
       } else {
-        this.mixins_dataUrl = '/sc-community-web/parkingCar/findChannelInfo';
+        this.mixins_dataUrl = '/sc-community/parkingCar/findChannelInfo';
         this.mixins_query = { parkId: this.mixins_query.parkId, pageIndex: this.mixins_page.pageNum, pageSize: this.mixins_page.pageSize, parkName: this.nameParkingLotName, nodeName: this.nodeName };
         this.mixins_search();
       }
@@ -143,7 +143,7 @@ export default {
     },
     // 开闸
     switchOn (row) {
-      this.$http.post('/sc-community-web/parkingCar/operateChannel', { parkId: this.mixins_query.parkId, type: '0', nodeId: row.id }).then(({ data, status, msg }) => {
+      this.$http.post('/sc-community/parkingCar/operateChannel', { parkId: this.mixins_query.parkId, type: '0', nodeId: row.id }).then(({ data, status, msg }) => {
         if (status == 0) {
           this.$message.success('开闸成功');
         } else {
@@ -154,7 +154,7 @@ export default {
     },
     // 关闸
     closeGate (row) {
-      this.$http.post('/sc-community-web/parkingCar/operateChannel', { parkId: this.mixins_query.parkId, type: '1', nodeId: row.id }).then(({ data, status, msg }) => {
+      this.$http.post('/sc-community/parkingCar/operateChannel', { parkId: this.mixins_query.parkId, type: '1', nodeId: row.id }).then(({ data, status, msg }) => {
         if (status == 0) {
           this.$message.success('关闸成功');
         } else {
@@ -164,7 +164,7 @@ export default {
     },
     // 强制常开
     forcedNormallyOpen (row) {
-      this.$http.post('/sc-community-web/parkingCar/operateChannel', { parkId: this.mixins_query.parkId, type: '2', nodeId: row.id }).then(({ data, status, msg }) => {
+      this.$http.post('/sc-community/parkingCar/operateChannel', { parkId: this.mixins_query.parkId, type: '2', nodeId: row.id }).then(({ data, status, msg }) => {
         if (status == 0) {
           this.$message.success('强制常开成功');
         } else {
@@ -174,7 +174,7 @@ export default {
     },
     // 结束常开
     endNormallyOpen (row) {
-      this.$http.post('/sc-community-web/parkingCar/operateChannel', { parkId: this.mixins_query.parkId, type: '3', nodeId: row.id }).then(({ data, status, msg }) => {
+      this.$http.post('/sc-community/parkingCar/operateChannel', { parkId: this.mixins_query.parkId, type: '3', nodeId: row.id }).then(({ data, status, msg }) => {
         if (status == 0) {
           this.$message.success('强制常开成功');
         } else {

+ 4 - 4
smart/src/views/onSiteVehicles/setpPage/details.vue

@@ -197,11 +197,11 @@ export default {
     },
     licensePlatebtn () {
       this.flag = !this.flag;
-      // /sc-community-web/parkingCar/modifyPlateNumber
+      // /sc-community/parkingCar/modifyPlateNumber
       if (this.licensePlate.length == 0) {
         this.$message.error('请输入车牌号')
       } else {
-        this.$http.post('/sc-community-web/parkingCar/modifyPlateNumber', { oldplateNo: (this.params.row.plateNo == "" ? this.licensePlate : this.params.row.plateNo), plateNo: this.licensePlate, parkId: this.params.parkId }).then(({ data, status, msg }) => {
+        this.$http.post('/sc-community/parkingCar/modifyPlateNumber', { oldplateNo: (this.params.row.plateNo == "" ? this.licensePlate : this.params.row.plateNo), plateNo: this.licensePlate, parkId: this.params.parkId }).then(({ data, status, msg }) => {
           this.$message.success('成功');
           this.sumber();
         });
@@ -213,7 +213,7 @@ export default {
     },
     vehicle () {
       this.flags = !this.flags
-      this.$http.post('/sc-community-web/parkingCar/modifyType', { carStyle: this.vehicleType, parkId: this.params.parkId, plateNo: this.licensePlate }).then(({ data, status, msg }) => {
+      this.$http.post('/sc-community/parkingCar/modifyType', { carStyle: this.vehicleType, parkId: this.params.parkId, plateNo: this.licensePlate }).then(({ data, status, msg }) => {
         this.$message.success('成功');
         this.sumber();
       });
@@ -225,7 +225,7 @@ export default {
     },
     // OnSiteVehicleDetails () {
     // debugger
-    // this.$http.post('/sc-community-web/parkingCar/queryPresenceVehicles', { parkId: this.params.parkId, nodeId: this.params.nodeId }).then(({ data, status, msg }) => {
+    // this.$http.post('/sc-community/parkingCar/queryPresenceVehicles', { parkId: this.params.parkId, nodeId: this.params.nodeId }).then(({ data, status, msg }) => {
     //   console.log(data);
     // });
     // },

+ 2 - 2
smart/src/views/parkingManagement/index.vue

@@ -75,7 +75,7 @@ export default {
 
     // 获取社区名称
     queryCommunity () {
-      this.$http.get('/sc-community-web/assets/community/list').then(({ data, status, msg }) => {
+      this.$http.get('/sc-community/assets/community/list').then(({ data, status, msg }) => {
         console.log('data', data);
         this.community = [];
         for (let i = 0; i < data.length; i++) {
@@ -111,7 +111,7 @@ export default {
   },
   created () {
     // 默认查询
-    this.mixins_dataUrl = '/sc-community-web/parkingCar/findParkInfo';
+    this.mixins_dataUrl = '/sc-community/parkingCar/findParkInfo';
     this.mixins_query = {};
     this.mixins_search();
     // 社区名称

+ 2 - 2
smart/src/views/parkingManagement/setpPage/details.vue

@@ -35,10 +35,10 @@ export default {
     }
   },
   methods: {
-    // /sc-community-web/parkingCar/findAreaInfo
+    // /sc-community/parkingCar/findAreaInfo
     // 查询对应的信息
     region () {
-      this.$http.post('/sc-community-web/parkingCar/findAreaInfo', { parkId: this.params.id }).then(({ data, status, msg }) => {
+      this.$http.post('/sc-community/parkingCar/findAreaInfo', { parkId: this.params.id }).then(({ data, status, msg }) => {
         this.tableData = [];
         for (let i = 0; i < data.length; i++) {
           this.tableData.push({

+ 1 - 1
smart/src/views/parkingSpaceManagement/pageJump/parkingLotSaveEdits.vue

@@ -267,7 +267,7 @@ export default {
 
       console.log(this.ruleForm.garageId);
 
-      this.$http.post('/sc-community-web/parkingCar/findAreaInfo', { parkId: this.ruleForm.garageId }).then((res) => {
+      this.$http.post('/sc-community/parkingCar/findAreaInfo', { parkId: this.ruleForm.garageId }).then((res) => {
         res.data.map((res) => {
           onOption = {
             label: res.areaName,

+ 3 - 3
smart/src/views/rechargeRecord/index.vue

@@ -110,7 +110,7 @@ export default {
   },
   methods: {
     exportExcel () {
-      this.__exportExcel('/sc-community-web/parkingCar/getChargeInfoExcel', { parkId: this.mixins_query.parkId, plateNo: this.mixins_query.plateNo, startTime: this.mixins_query.startTime, endTime: this.mixins_query.endTime });
+      this.__exportExcel('/sc-community/parkingCar/getChargeInfoExcel', { parkId: this.mixins_query.parkId, plateNo: this.mixins_query.plateNo, startTime: this.mixins_query.startTime, endTime: this.mixins_query.endTime });
     },
     timeToggle (e) {
       console.log(e);
@@ -129,7 +129,7 @@ export default {
     },
     lookDetails () {
       console.log(this.mixins_query)
-      this.mixins_dataUrl = '/sc-community-web/parkingCar/queryChargeRecord';
+      this.mixins_dataUrl = '/sc-community/parkingCar/queryChargeRecord';
       // parkingTime: this.mixins_query.parkingTime,
       this.mixins_query = { parkingTime: this.mixins_query.parkingTime, parkId: this.mixins_query.parkId, plateNo: this.mixins_query.plateNo, startTime: this.mixins_query.startTime, endTime: this.mixins_query.endTime };
       console.log(this.mixins_query)
@@ -137,7 +137,7 @@ export default {
     },
     // 获取停车场名称
     nameParking () {
-      this.$http.post('/sc-community-web/parkingCar/findParkInfo', { pageNum: this.mixins_pageset.pageIndex, pageSize: this.mixins_pageset.pageSize }).then(({ data, status, msg }) => {
+      this.$http.post('/sc-community/parkingCar/findParkInfo', { pageNum: this.mixins_pageset.pageIndex, pageSize: this.mixins_pageset.pageSize }).then(({ data, status, msg }) => {
         console.log(data.list);
         for (let i = 0; i < data.list.length; i++) {
           this.nameParkingLot.push({

+ 3 - 3
smart/src/views/temporaryStopCharge/index.vue

@@ -153,7 +153,7 @@ export default {
     },
     // 获取停车场名称
     nameParking () {
-      this.$http.post('/sc-community-web/parkingCar/findParkInfo', { pageNum: this.mixins_page.pageNum, pageSize: this.mixins_page.pageSize }).then(({ data, status, msg }) => {
+      this.$http.post('/sc-community/parkingCar/findParkInfo', { pageNum: this.mixins_page.pageNum, pageSize: this.mixins_page.pageSize }).then(({ data, status, msg }) => {
         console.log(data.list);
         for (let i = 0; i < data.list.length; i++) {
           this.nameParkingLot.push({
@@ -165,12 +165,12 @@ export default {
     },
     // 导出
     exportExcel () {
-      this.__exportExcel('/sc-community-web/parkingCar/getPayInfoExcel', this.mixins_query);
+      this.__exportExcel('/sc-community/parkingCar/getPayInfoExcel', this.mixins_query);
       // alert('暂无');
     }
   },
   created () {
-    this.mixins_dataUrl = '/sc-community-web/parkingCar/queryPayRecord';
+    this.mixins_dataUrl = '/sc-community/parkingCar/queryPayRecord';
     this.mixins_query = {};
     // console.log('mixins_list', this.mixins_query);
     this.mixins_search();

+ 7 - 7
smart/src/views/vehicleInformation/index.vue

@@ -169,7 +169,7 @@ export default {
           type: 'success',
           message: '删除成功!'
         });
-        this.$http.get('/sc-community-web/parkingCar/deleteVehicleInfor', { id: row.cardId, parkId: row.parkId }).then(({ data, msg, status }) => {
+        this.$http.get('/sc-community/parkingCar/deleteVehicleInfor', { id: row.cardId, parkId: row.parkId }).then(({ data, msg, status }) => {
           this.mixins_search();
         }).catch(() => { });
 
@@ -198,14 +198,14 @@ export default {
       }
       if (command === 'template') {
         // this.__exportExcel('/sc-community/excel/download/template', { importType: 'FACILITY' });
-        this.__exportExcel('/sc-community-web/excel/download/template', { importType: 'CAR' });
-        // this.__exportExcel(' /sc-community-web/excel/import/excel', { importType: 'CAR' });
-        // /sc-community-web/excel/import/excel
+        this.__exportExcel('/sc-community/excel/download/template', { importType: 'CAR' });
+        // this.__exportExcel(' /sc-community/excel/import/excel', { importType: 'CAR' });
+        // /sc-community/excel/import/excel
         return;
       }
     },
     exportExcel () {
-      this.__exportExcel('/sc-community-web/parkingCar/getCarInfoExcel', this.mixins_query);
+      this.__exportExcel('/sc-community/parkingCar/getCarInfoExcel', this.mixins_query);
     },
     details (row) {
       // 添加
@@ -281,7 +281,7 @@ export default {
     },
     // 获取停车场名称
     nameParking () {
-      this.$http.post('/sc-community-web/parkingCar/findParkInfo', { pageNum: this.mixins_pageset.pageIndex, pageSize: this.mixins_pageset.pageSize }).then(({ data, status, msg }) => {
+      this.$http.post('/sc-community/parkingCar/findParkInfo', { pageNum: this.mixins_pageset.pageIndex, pageSize: this.mixins_pageset.pageSize }).then(({ data, status, msg }) => {
         console.log(data.list);
         for (let i = 0; i < data.list.length; i++) {
           this.nameParkingLot.push({
@@ -293,7 +293,7 @@ export default {
     },
   },
   created () {
-    this.mixins_dataUrl = '/sc-community-web/parkingCar/queryCars';
+    this.mixins_dataUrl = '/sc-community/parkingCar/queryCars';
     this.mixins_query = {};
     this.mixins_search();
     this.nameParking();

+ 6 - 6
smart/src/views/vehicleInformation/setpPage/details.vue

@@ -780,7 +780,7 @@ export default {
     rechargeRules () {
       this.recharge = []
       this.$http
-        .get('/sc-community-web/parkingCar/queryRechargeRules', {
+        .get('/sc-community/parkingCar/queryRechargeRules', {
           carType: this.formDate.carTypes == '临时车' ? '0' :
             this.formDate.carTypes == 'VIP车' ? '1' :
               this.formDate.carTypes == '月租车' ? '2' :
@@ -972,7 +972,7 @@ export default {
     // 获取停车场名称
     nameParking () {
       this.nameParkingLot = [];
-      this.$http.post('/sc-community-web/parkingCar/findParkInfo', { pageNum: 1, pageSize: 15 }).then(({ data, status, msg }) => {
+      this.$http.post('/sc-community/parkingCar/findParkInfo', { pageNum: 1, pageSize: 15 }).then(({ data, status, msg }) => {
         for (let i = 0; i < data.list.length; i++) {
           this.nameParkingLot.push({
             name: data.list[i].garageName,
@@ -992,7 +992,7 @@ export default {
     },
     region () {
 
-      this.$http.post('/sc-community-web/parkingCar/findAreaInfo', { parkId: this.formDate.parkId }).then(({ data, status, msg }) => {
+      this.$http.post('/sc-community/parkingCar/findAreaInfo', { parkId: this.formDate.parkId }).then(({ data, status, msg }) => {
         this.eloption = [];
         for (let i = 0; i < data.length; i++) {
           this.eloption.push({
@@ -1010,9 +1010,9 @@ export default {
     },
     submit () {
       if (this.params.comm == 'add') {
-        this.url = '/sc-community-web/parkingCar/updateVehicleInfor'
+        this.url = '/sc-community/parkingCar/updateVehicleInfor'
       } else {
-        this.url = '/sc-community-web/parkingCar/addVehicleInfor'
+        this.url = '/sc-community/parkingCar/addVehicleInfor'
       }
       this.$refs.formDate.validate((valid) => {
         if (valid) {
@@ -1133,7 +1133,7 @@ export default {
       this.formDate.againLicense = '验证'
 
       this.params.cardId;
-      this.$http.get('/sc-community-web/parkingCar/getVehicleInfor', { id: this.params.cardId }).then(({ data, msg, status }) => {
+      this.$http.get('/sc-community/parkingCar/getVehicleInfor', { id: this.params.cardId }).then(({ data, msg, status }) => {
         console.log(data);
 
         this.formDate.userName = data.userName

+ 1 - 1
smart/src/views/vehicleInformation/setpPage/native.vue

@@ -186,7 +186,7 @@ export default {
       }
     },
     garage () {
-      this.$http.get('/sc-community-web/assets/tree/garage/find').then(({ data, status, msg }) => {
+      this.$http.get('/sc-community/assets/tree/garage/find').then(({ data, status, msg }) => {
         this.dataRes = data;
         this.filterTreeData(this.dataRes);
         this.tenantsTree = this.dataRes;

+ 2 - 2
smart/src/views/vehicleInformation/setpPage/recharge.vue

@@ -365,7 +365,7 @@ export default {
     // 充值规则
     rechargeRules () {
       this.$http
-        .get('/sc-community-web/parkingCar/queryRechargeRules', { carType: this.cardType, parkingId: this.parkId })
+        .get('/sc-community/parkingCar/queryRechargeRules', { carType: this.cardType, parkingId: this.parkId })
         .then(({ data, msg, status }) => {
           this.rechargeDate = data;
           var daraRes = {
@@ -411,7 +411,7 @@ export default {
     submit () {
       this.$refs.formDate.validate((valid) => {
         if (valid) {
-          this.$http.post('/sc-community-web/parkingCar/carCharge', {
+          this.$http.post('/sc-community/parkingCar/carCharge', {
             amount: this.chargeAmount * 100,
             communityId: this.communityId,
             carType: this.cardType,

+ 1 - 1
smart/vue.config.js

@@ -13,7 +13,7 @@ function resolve(dir) {
 }
 
 module.exports = {
-    publicPath: process.env.NODE_ENV === 'sit' ? '/sc-park' : '/',
+    publicPath:  '/sc-park',
     productionSourceMap: false,
     filenameHashing: false,
     chainWebpack: (config) => {