productDev/dmvisit.git

doum

17 小时以前 341b02e3f63ceb8e9a96ab8c87451882bb7dbd17

更改头部

已删除3个文件

已修改7个文件

	admin/.env.development	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/business/inoutRecord.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/business/retention.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/views/index.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/whyc_admin/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/whyc_admin/static/css/app.70e94cae.css	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/whyc_admin/static/js/app.fd7a4de0.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/whyc_admin/static/js/app.fd7a4de0.js.map	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/visits/dmvisit_admin/src/main/resources/bootstrap.yml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 admin/.env.development

@@ -5,9 +5,9 @@

#VUE_APP_API_URL  = 'http://192.168.1.45:10010'

VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'
#VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'

#VUE_APP_API_URL  = 'http://localhost:10010'
VUE_APP_API_URL  = 'http://localhost:10010'

#keyï¼045542fc5f436b75e6c911c5c84ff8cd
#å¯é¥ï¼8bd38497f9aee2b75e7a888a4dfd1e6c

 admin/src/views/business/inoutRecord.vue

@@ -20,7 +20,7 @@
            <el-option label="è®¿å®¢" value="1"></el-option>
            <el-option label="åé¨äººå" value="2"></el-option>
            <el-option label="ç¸å³æ¹äººå" value="4"></el-option>
            <el-option label="è´§è¿å¸æº" value="5"></el-option>
<!--            <el-option label="è´§è¿å¸æº" value="5"></el-option>-->
          </el-select>
        </el-form-item>
        <el-form-item label="" prop="memberName">
@@ -83,7 +83,7 @@
            <span  v-if="row.memberType ==1">è®¿å®¢</span>
            <span  v-else-if="row.memberType ==2">åé¨äººå</span>
            <span  v-else-if="row.memberType ==4">ç¸å³æ¹äººå</span>
            <span  v-else-if="row.memberType ==5">è´§è¿å¸æº</span>
<!--            <span  v-else-if="row.memberType ==5">è´§è¿å¸æº</span>-->
            <span  v-else ></span>
          </template>
        </el-table-column>

 admin/src/views/business/retention.vue

@@ -14,7 +14,7 @@
            <el-option label="è®¿å®¢" value="1"></el-option>
            <el-option label="ç¸é¿æå³æ¹" value="4"></el-option>
            <el-option label="åé¨åå·¥" value="2"></el-option>
            <el-option label="è´§è¿å¸æº" value="5"></el-option>
<!--            <el-option label="è´§è¿å¸æº" value="5"></el-option>-->
          </el-select>
        </el-form-item>
        <el-form-item label="èµ·æ¢æ¶é´" prop="startTime">
@@ -65,7 +65,7 @@
            <span  v-if="row.type ==1">è®¿å®¢</span>
            <span  v-else-if="row.type ==2">åé¨äººå</span>
            <span  v-else-if="row.type ==4">ç¸å³æ¹äººå</span>
            <span  v-else-if="row.type ==5">è´§è¿å¸æº</span>
<!--            <span  v-else-if="row.type ==5">è´§è¿å¸æº</span>-->
            <span  v-else ></span>
          </template>
        </el-table-column>

 admin/src/views/index.vue

@@ -413,7 +413,9 @@
        arr.push({ name: 'è®¿å®¢', value: this.headerData.inParkVisitUserNum })
        arr.push({ name: 'åé¨åå·¥', value: this.headerData.todayInParkUserNum - this.headerData.inParkLwUserNum - this.headerData.inParkVisitUserNum - this.headerData.inParkDriverUserNum })
        arr.push({ name: 'é¿æç¸å³æ¹', value: this.headerData.inParkLwUserNum })
/*
        arr.push({ name: 'è´§è¿å¸æº', value: this.headerData.inParkDriverUserNum })
*/
        arr.sort((a, b) => b.value - a.value)
        this.manningRatio = arr
        this.initEchart1()

 admin/whyc_admin/index.html

@@ -1 +1 @@
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/whyc_admin/favicon.ico"><title>èæ¹çèæºæ§å®æ¶å®å¨é²èç³»ç»</title><link href="/whyc_admin/static/css/app.70e94cae.css" rel="preload" as="style"><link href="/whyc_admin/static/css/chunk-vendors.04c7bff3.css" rel="preload" as="style"><link href="/whyc_admin/static/js/app.fd7a4de0.js" rel="preload" as="script"><link href="/whyc_admin/static/js/chunk-vendors.6d4f879a.js" rel="preload" as="script"><link href="/whyc_admin/static/css/chunk-vendors.04c7bff3.css" rel="stylesheet"><link href="/whyc_admin/static/css/app.70e94cae.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but èæ¹çèæºæ§å®æ¶å®å¨é²èç³»ç» doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/whyc_admin/static/js/chunk-vendors.6d4f879a.js"></script><script src="/whyc_admin/static/js/app.fd7a4de0.js"></script></body></html>
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/whyc_admin/favicon.ico"><title>èæ¹çèæºæ§å®æ¶å®å¨é²èç³»ç»</title><link href="/whyc_admin/static/css/app.48cd5976.css" rel="preload" as="style"><link href="/whyc_admin/static/css/chunk-vendors.04c7bff3.css" rel="preload" as="style"><link href="/whyc_admin/static/js/app.ec8d6458.js" rel="preload" as="script"><link href="/whyc_admin/static/js/chunk-vendors.6d4f879a.js" rel="preload" as="script"><link href="/whyc_admin/static/css/chunk-vendors.04c7bff3.css" rel="stylesheet"><link href="/whyc_admin/static/css/app.48cd5976.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but èæ¹çèæºæ§å®æ¶å®å¨é²èç³»ç» doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/whyc_admin/static/js/chunk-vendors.6d4f879a.js"></script><script src="/whyc_admin/static/js/app.ec8d6458.js"></script></body></html>

 admin/whyc_admin/static/css/app.70e94cae.css

ÎÄ¼þÒÑÉ¾³ý

 admin/whyc_admin/static/js/app.fd7a4de0.js

ÎÄ¼þÒÑÉ¾³ý

 admin/whyc_admin/static/js/app.fd7a4de0.js.map

ÎÄ¼þÒÑÉ¾³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/service/impl/HkSyncEventServiceImpl.java

@@ -119,7 +119,7 @@
        HKService.cancelEventSub(param);//ååæ¶
//        HKService.eventSub(param);//æå°å·¥ä½ç¶æäºä»¶

        try{
       /* try{
            List<Warning> warningList = warningMapper.selectList(new QueryWrapper<Warning>().lambda()
                    .eq(Warning::getIsdeleted,Constants.ZERO)
                    .eq(Warning::getStatus,Constants.ONE)
@@ -137,11 +137,7 @@
            }
        }catch (Exception e){

        }




        }*/
    }
    /**
     * åæ¶è®¢éé¨ç¦äºä»¶ãè®¿å®¢äºä»¶ãååè½¦åºäºä»¶

 server/visits/dmvisit_admin/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: dev
    active: pro
  application:
    name: visitsAdmin
    # å®å¨éç½®

			@@ -5,9 +5,9 @@

			#VUE_APP_API_URL = 'http://192.168.1.45:10010'

			VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'
			#VUE_APP_API_URL = 'http://192.168.0.7/system_gateway'

			#VUE_APP_API_URL = 'http://localhost:10010'
			VUE_APP_API_URL = 'http://localhost:10010'

			#keyï¼045542fc5f436b75e6c911c5c84ff8cd
			#å¯é¥ï¼8bd38497f9aee2b75e7a888a4dfd1e6c

			@@ -20,7 +20,7 @@
			<el-option label="è®¿å®¢" value="1"></el-option>
			<el-option label="åé¨äººå" value="2"></el-option>
			<el-option label="ç¸å³æ¹äººå" value="4"></el-option>
			<el-option label="è´§è¿å¸æº" value="5"></el-option>
			<!-- <el-option label="è´§è¿å¸æº" value="5"></el-option>-->
			</el-select>
			</el-form-item>
			<el-form-item label="" prop="memberName">
			@@ -83,7 +83,7 @@
			<span v-if="row.memberType ==1">è®¿å®¢</span>
			<span v-else-if="row.memberType ==2">åé¨äººå</span>
			<span v-else-if="row.memberType ==4">ç¸å³æ¹äººå</span>
			<span v-else-if="row.memberType ==5">è´§è¿å¸æº</span>
			<!-- <span v-else-if="row.memberType ==5">è´§è¿å¸æº</span>-->
			<span v-else ></span>
			</template>
			</el-table-column>

			@@ -14,7 +14,7 @@
			<el-option label="è®¿å®¢" value="1"></el-option>
			<el-option label="ç¸é¿æå³æ¹" value="4"></el-option>
			<el-option label="åé¨åå·¥" value="2"></el-option>
			<el-option label="è´§è¿å¸æº" value="5"></el-option>
			<!-- <el-option label="è´§è¿å¸æº" value="5"></el-option>-->
			</el-select>
			</el-form-item>
			<el-form-item label="èµ·æ¢æ¶é´" prop="startTime">
			@@ -65,7 +65,7 @@
			<span v-if="row.type ==1">è®¿å®¢</span>
			<span v-else-if="row.type ==2">åé¨äººå</span>
			<span v-else-if="row.type ==4">ç¸å³æ¹äººå</span>
			<span v-else-if="row.type ==5">è´§è¿å¸æº</span>
			<!-- <span v-else-if="row.type ==5">è´§è¿å¸æº</span>-->
			<span v-else ></span>
			</template>
			</el-table-column>

			@@ -413,7 +413,9 @@
			arr.push({ name: 'è®¿å®¢', value: this.headerData.inParkVisitUserNum })
			arr.push({ name: 'åé¨åå·¥', value: this.headerData.todayInParkUserNum - this.headerData.inParkLwUserNum - this.headerData.inParkVisitUserNum - this.headerData.inParkDriverUserNum })
			arr.push({ name: 'é¿æç¸å³æ¹', value: this.headerData.inParkLwUserNum })
			/*
			arr.push({ name: 'è´§è¿å¸æº', value: this.headerData.inParkDriverUserNum })
			*/
			arr.sort((a, b) => b.value - a.value)
			this.manningRatio = arr
			this.initEchart1()

			@@ -1 +1 @@
			<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/whyc_admin/favicon.ico"><title>èæ¹çèæºæ§å®æ¶å®å¨é²èç³»ç»</title><link href="/whyc_admin/static/css/app.70e94cae.css" rel="preload" as="style"><link href="/whyc_admin/static/css/chunk-vendors.04c7bff3.css" rel="preload" as="style"><link href="/whyc_admin/static/js/app.fd7a4de0.js" rel="preload" as="script"><link href="/whyc_admin/static/js/chunk-vendors.6d4f879a.js" rel="preload" as="script"><link href="/whyc_admin/static/css/chunk-vendors.04c7bff3.css" rel="stylesheet"><link href="/whyc_admin/static/css/app.70e94cae.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but èæ¹çèæºæ§å®æ¶å®å¨é²èç³»ç» doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/whyc_admin/static/js/chunk-vendors.6d4f879a.js"></script><script src="/whyc_admin/static/js/app.fd7a4de0.js"></script></body></html>
			<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/whyc_admin/favicon.ico"><title>èæ¹çèæºæ§å®æ¶å®å¨é²èç³»ç»</title><link href="/whyc_admin/static/css/app.48cd5976.css" rel="preload" as="style"><link href="/whyc_admin/static/css/chunk-vendors.04c7bff3.css" rel="preload" as="style"><link href="/whyc_admin/static/js/app.ec8d6458.js" rel="preload" as="script"><link href="/whyc_admin/static/js/chunk-vendors.6d4f879a.js" rel="preload" as="script"><link href="/whyc_admin/static/css/chunk-vendors.04c7bff3.css" rel="stylesheet"><link href="/whyc_admin/static/css/app.48cd5976.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but èæ¹çèæºæ§å®æ¶å®å¨é²èç³»ç» doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/whyc_admin/static/js/chunk-vendors.6d4f879a.js"></script><script src="/whyc_admin/static/js/app.ec8d6458.js"></script></body></html>

			@@ -119,7 +119,7 @@
			HKService.cancelEventSub(param);//ååæ¶
			// HKService.eventSub(param);//æå°å·¥ä½ç¶æäºä»¶

			try{
			/* try{
			List<Warning> warningList = warningMapper.selectList(new QueryWrapper<Warning>().lambda()
			.eq(Warning::getIsdeleted,Constants.ZERO)
			.eq(Warning::getStatus,Constants.ONE)
			@@ -137,11 +137,7 @@
			}
			}catch (Exception e){

			}




			}*/
			}
			/**
			* åæ¶è®¢éé¨ç¦äºä»¶ãè®¿å®¢äºä»¶ãååè½¦åºäºä»¶

			@@ -1,6 +1,6 @@
			spring:
			profiles:
			active: dev
			active: pro
			application:
			name: visitsAdmin
			# å®å¨éç½®