884a7051fe8cee485f95121d49e3383fcdbL3264">3264 3390
  background-color: #fff;
3265 3391
}
3266 3392
3267
.ipu-tab-title > li {
3393
.ipu-tab-title>li {
3268 3394
  width: 0%;
3269 3395
  -webkit-box-flex: 1;
3270 3396
  -webkit-flex-grow: 1;
@ -3273,15 +3399,15 @@ html.ipu-with-statusbar-overlay .ipu-popup-overlay {
3273 3399
  line-height: 0.45rem;
3274 3400
}
3275 3401
3276
.ipu-tab-title > li.active {
3402
.ipu-tab-title>li.active {
3277 3403
  position: relative;
3278 3404
}
3279 3405
3280
.ipu-tab-title-link > li {
3406
.ipu-tab-title-link>li {
3281 3407
  border-bottom: 1px solid #e0e0e0;
3282 3408
}
3283 3409
3284
.ipu-tab-title-link > li.ipu-current {
3410
.ipu-tab-title-link>li.ipu-current {
3285 3411
  border-bottom: 2px solid #0083D3;
3286 3412
  color: #0083D3;
3287 3413
}
@ -3293,31 +3419,31 @@ html.ipu-with-statusbar-overlay .ipu-popup-overlay {
3293 3419
  margin: .1rem;
3294 3420
}
3295 3421
3296
.ipu-tab-title-button > li {
3422
.ipu-tab-title-button>li {
3297 3423
  border-left: 1px solid #0083D3;
3298 3424
  font-size: 0.12rem;
3299 3425
  line-height: 2;
3300 3426
}
3301 3427
3302
.ipu-tab-title-button > li.ipu-current {
3428
.ipu-tab-title-button>li.ipu-current {
3303 3429
  background-color: #0083D3;
3304 3430
  color: #fff;
3305 3431
  border-bottom: none;
3306 3432
}
3307 3433
3308
.ipu-tab-title-button > li:first-child {
3434
.ipu-tab-title-button>li:first-child {
3309 3435
  border-left: none;
3310 3436
}
3311 3437
3312
.ipu-tab-title-button > li:last-child {
3438
.ipu-tab-title-button>li:last-child {
3313 3439
  border-right: none;
3314 3440
}
3315 3441
3316
.ipu-tab-body-wrapper > li {
3442
.ipu-tab-body-wrapper>li {
3317 3443
  display: none;
3318 3444
}
3319 3445
3320
.ipu-tab-body-wrapper > li.ipu-current {
3446
.ipu-tab-body-wrapper>li.ipu-current {
3321 3447
  display: block;
3322 3448
}
3323 3449
@ -3335,20 +3461,20 @@ html.ipu-with-statusbar-overlay .ipu-popup-overlay {
3335 3461
  flex-direction: column;
3336 3462
}
3337 3463
3338
.ipu-tab-fixed > .ipu-tab-title {
3464
.ipu-tab-fixed>.ipu-tab-title {
3339 3465
  -webkit-box-flex: 0;
3340 3466
  -webkit-flex-grow: 0;
3341 3467
  flex-grow: 0;
3342 3468
}
3343 3469
3344
.ipu-tab-fixed > .ipu-tab-body {
3470
.ipu-tab-fixed>.ipu-tab-body {
3345 3471
  -webkit-box-flex: 1;
3346 3472
  -webkit-flex-grow: 1;
3347 3473
  flex-grow: 1;
3348 3474
  position: relative;
3349 3475
}
3350 3476
3351
.ipu-tab-fixed > .ipu-tab-body > .ipu-tab-body-wrapper {
3477
.ipu-tab-fixed>.ipu-tab-body>.ipu-tab-body-wrapper {
3352 3478
  width: 100%;
3353 3479
  height: 100%;
3354 3480
  position: absolute;
@ -3357,7 +3483,7 @@ html.ipu-with-statusbar-overlay .ipu-popup-overlay {
3357 3483
  overflow-x: visible;
3358 3484
}
3359 3485
3360
.ipu-tab-fixed > .ipu-tab-body > .ipu-tab-body-wrapper > li {
3486
.ipu-tab-fixed>.ipu-tab-body>.ipu-tab-body-wrapper>li {
3361 3487
  position: relative;
3362 3488
  height: 100%;
3363 3489
  font-size: 0.15rem;
@ -3828,4 +3954,4 @@ html.ipu-with-statusbar-overlay .ipu-popup-overlay {
3828 3954
3829 3955
.ipu-visibility-visible {
3830 3956
  visibility: visible;
3831
}
3957
}

+ 2 - 2
show-server/src/main/webapp/template/webapp/more/invokeIPU/showParams.html

@ -71,8 +71,8 @@
71 71
</div>
72 72

73 73
<script type="text/javascript">
74
require(['wadeMobile', 'jquery'], function (WadeMobile, $) {
75
   WadeMobile.getMemoryCache(function(data){
74
require(['ipuMobile', 'jquery'], function (IpuMobile, $) {
75
   IpuMobile.getMemoryCache(function(data){
76 76
       $("#context_params").val(data);
77 77
	},"PAGE_CONTEXT");
78 78


+ 2 - 2
show-server/src/main/webapp/template/webapp/more/reactNative.html

@ -122,9 +122,9 @@
122 122
    		var callback = function (number) {
123 123
    			$("#number_text").html("手机号码:" + number);
124 124
    		};
125
    	    WadeMobile.openRN("PHONENUMBER", callback);
125
    	    IpuMobile.openRN("PHONENUMBER", callback);
126 126
    	} else {
127
    		WadeMobile.openRN(this.id);
127
    		IpuMobile.openRN(this.id);
128 128
    	}
129 129
    });
130 130
}); -->

+ 1 - 3
show-server/src/main/webapp/template/webapp/plugins/customCamera.html

@ -65,9 +65,7 @@
65 65
							<button class="ipu-btn" id="take_id_picture_back">测试</button>
66 66
						</div>
67 67
					</div>
68
					
69
					
70
					
68
71 69
				</div>
72 70
			</div>
73 71
		</div>

+ 15 - 0
show-server/src/main/webapp/template/webapp/plugins/photo.html

@ -48,6 +48,21 @@
48 48
							<button class="ipu-btn" id="search">测试</button>
49 49
						</div>
50 50
					</div>
51
					
52
					<div class="ipu-card ipu-card-block">
53
						<div class="ipu-card-header">加水印</div>
54
						<div class="ipu-card-content">
55
							<div class="ipu-card-content-inner">
56
								<div class="">先选择一张图片,然后选择水印图片,添加到原图片上</div>
57
								<div id="pic0">
58
									<button class="ipu-btn" id="get_pic">选择图片</button>
59
								</div>
60
							</div>
61
						</div>
62
						<div class="ipu-card-footer">
63
							<button class="ipu-btn" id="add_mark">测试</button>
64
						</div>
65
					</div>
51 66
52 67
					<!-- 	<div class="demo-item">
53 68
						<div class="demo-title">拍照</div>

+ 19 - 2
show-server/src/main/webapp/template/webapp/plugins/safe/screenCapture.html

@ -20,9 +20,26 @@
20 20
21 21
        <div class="ipu-flex-col-auto" id='content'>
22 22
            <div class="ipu-fn-p">
23
                <div class="ipu-btn" id="closeScreenCapture">止截屏</div>
24
                <div class="ipu-btn" id="openScreenCapture">能够截屏</div>
23
                <div class="ipu-btn" id="closeScreenCapture">止截屏</div>
24
                <div class="ipu-btn" id="openScreenCapture">允许截屏</div>
25
                <div class="ipu-btn" id="executeScreenCapture">截屏</div>
25 26
            </div>
27
            
28
            
29
            
30
            <div class="ipu-card ipu-card-block">
31
				<div class="ipu-card-content">
32
					<div class="ipu-card-content-inner">
33
						<div class="">截屏调用结果信息</div>
34
						<div id="screenCapture_pic"></div>
35
						<div id="screenCapture_path"></div>
36
					</div>
37
				</div>
38
			</div>
39
            
40
            
41
            
42
            
26 43
        </div>
27 44
28 45
    </div>

+ 2 - 0
show-server/src/main/webapp/template/webapp/plugins/share.html

@ -33,7 +33,9 @@
33 33
								</div>
34 34
								<div class=" ipu-fn-m-t">
35 35
									<button class="ipu-btn" id="qqFriendText">QQ好友</button>
36
									<button class="ipu-btn" id="qqZoneText">QQ空间</button>
36 37
									<button class="ipu-btn" id="wechatFriendText">微信好友</button>
38
									<button class="ipu-btn" id="wechatTimeLineText">微信朋友圈</button>
37 39
									<button class="ipu-btn" id="moreText">更多分享</button>
38 40
								</div>
39 41
							</div>

+ 20 - 0
show-server/src/main/webapp/template/webapp/plugins/video.html

@ -31,6 +31,26 @@
31 31
						</div>
32 32
					</div>
33 33
					
34
					<div class="demo-item">
35
						<div class="demo-title">IPU视频录制</div>
36
						<div class="demo-body">
37
							<div class="demo-content">打开视频录制界面,可通过参数控制分辨率、码率和选择前后置摄像头</div>
38
							<div class="demo-content">
39
								<button class="ipu-btn ipu-btn-highlight" id="ipu_record">IPU视频录制</button>
40
							</div>
41
						</div>
42
					</div>
43
					
44
					<div class="demo-item">
45
						<div class="demo-title">带水印视频录制</div>
46
						<div class="demo-body">
47
							<div class="demo-content">设置一个水印图片,可录制带水印的视频</div>
48
							<div class="demo-content">
49
								<button class="ipu-btn ipu-btn-highlight" id="water_record">水印视频录制</button>
50
							</div>
51
						</div>
52
					</div>
53
					
34 54
					<div class="demo-item ipu-fn-hide" id="hiddenContent" >
35 55
						<div class="demo-title">播放视频</div>
36 56
						<div class="demo-body">

feat:修改视频监控数据接口 · b4fce4e26f - Nuosi Git Service
Просмотр исходного кода

feat:修改视频监控数据接口

(cherry picked from commit f59f077db635d5529143b2030954f7e23c2084de)
xiayu3 лет назад: 4
Родитель
Сommit
b4fce4e26f

+ 0 - 2
security-protection-platform/src/modules/attendance/report/index.vue

@ -193,7 +193,6 @@ export default {
193 193
    getDailyTable() {
194 194
      this.loadDailyTable = true
195 195
      atdapi.getDayAttendance({params: this.dailyForm}).then(res => {
196
        console.log(res.data)
197 196
        let tableData = res.data.data
198 197
        this.dailyTableData = []
199 198
        tableData.forEach(element => {
@ -218,7 +217,6 @@ export default {
218 217
      atdapi.getAttendanceDetail({
219 218
        params: { userid, beginDay, endDay }
220 219
      }).then(res => {
221
        console.log(res)
222 220
        const { detail } = res.data
223 221
        this.modalData.detail = detail
224 222
      }).finally(() => {

+ 19 - 6
security-protection-platform/src/modules/videoSurveillance/index.vue

@ -7,7 +7,7 @@
7 7
    <div class="page-top">
8 8
      <span>风场:</span>
9 9
      <t-select v-model="gateFieldData" @change="getWindFieldData">
10
        <t-option v-for="(item,index) in organizationData" :key="index" :value="item.id">{{ item.org }}</t-option>
10
        <t-option v-for="(item,index) in organizationList" :key="index" :value="item.id">{{ item.org }}</t-option>
11 11
      </t-select>
12 12
    </div>
13 13
    <div v-if="tabType==='gate'" >
@ -46,6 +46,7 @@
46 46
</template>
47 47
<script>
48 48
import sysapi from '@/api/videoSurveillance'
49
import commonapi from '@/api/common'
49 50
export default {
50 51
  filters: {
51 52
    handleText(value) {
@ -65,17 +66,14 @@ export default {
65 66
      roomPageSize: 10, // 集控室分页数据
66 67
      roomTotal: 100, // 集控室分页总数
67 68
      tabType: 'gate',
68
      organizationData: [], // 风场数据
69
      organizationList: [], // 风场数据
69 70
      gateFieldData: 101101,
70 71
      gateList: [],
71 72
      roomList: []
72 73
    }
73 74
  },
74 75
  mounted() {
75
    // 获取风场列表
76
    sysapi.getOrganizationData().then(res => {
77
      this.organizationData = res.data.organizations
78
    })
76
    this.getWindFiledList() // 获取风场列表
79 77
    this.getWindFieldData()
80 78
    this.getCenterRoomData()
81 79
  },
@ -90,6 +88,21 @@ export default {
90 88
        this.tabType = 'room'
91 89
      }
92 90
    },
91
    getWindFiledList() {
92
      commonapi.getDepartments().then(resp => {
93
        this.organizationList = []
94
        console.log(resp)
95
        this.organizationList = resp.data.map(item => {
96
          return {
97
            org: item.name,
98
            id: item.id
99
          }
100
        })
101
      }, err => {
102
        this.$Message.danger('获取风场列表失败!')
103
        console.log(err)
104
      })
105
    },
93 106
    // 获得风场大门数据
94 107
    getWindFieldData() {
95 108
      let obj = {

android-share - Nuosi Git Service

ipu的trunk版的android工程和服务端工程。

README.md 83B

android-share

ipu的trunk版的android工程和服务端工程。