wwp 3 weeks ago
parent
commit
3539f950fa
6 changed files with 10 additions and 8 deletions
  1. +1
    -0
      SafeCampus.WEB/src/views/screen/component/index/peopeleNum.vue
  2. +1
    -0
      SafeCampus.WEB/src/views/screen/component/index/todayNotice.vue
  3. +2
    -2
      SafeCampus.WEB/src/views/screen/stureturn.vue
  4. +2
    -2
      SafeCampus.WEB/src/views/userManage/classManage/index.vue
  5. +1
    -1
      monitorMobile/pages/earlyWarning/detail.vue
  6. +3
    -3
      monitorMobile/pages/earlyWarning/index.vue

+ 1
- 0
SafeCampus.WEB/src/views/screen/component/index/peopeleNum.vue View File

@@ -239,6 +239,7 @@ const getCharts2 = data => {
// 设备统计
const count = ref(0);
const getCharts3 = () => {
count.value = 0;
const chart = echarts.init(chart3.value);
let data = props.screenData.camera || [];
let xArr = data.map(e => e.cameraInfos.length);


+ 1
- 0
SafeCampus.WEB/src/views/screen/component/index/todayNotice.vue View File

@@ -82,6 +82,7 @@ const getData = () => {
typeStatisti.value = props.screenData.alarmStatisti.typeStatisti.sort((a, b) => {
return b.value - a.value;
});
typeStatistiCount.value = 0;
typeStatisti.value.forEach(e => {
typeStatistiCount.value += e.value;
});


+ 2
- 2
SafeCampus.WEB/src/views/screen/stureturn.vue View File

@@ -66,7 +66,7 @@
<el-table-column prop="personName" label="姓名" align="center"> </el-table-column>
<el-table-column prop="dormitName" label="所在宿舍" align="center"> </el-table-column>
<el-table-column prop="gender" label="宿舍性别" align="center" :formatter="genderFormatter"> </el-table-column>
<el-table-column prop="$status" label="归寝状态" align="center"> </el-table-column>
<el-table-column prop="$status" label="出入状态" align="center"> </el-table-column>
</el-table>
</div>
</div>
@@ -88,7 +88,7 @@ const getStuReturnInfo = async obj => {
screenApi.getStudentReturnBed({ buildId: buildInfo.value.value }).then(res => {
if (res.code == 200) {
res.data.attendList = res.data.attendList.map(e => {
e.$status = e.cameraId == buildInfo.value.outCameraId ? "未归寝" : e.cameraId == buildInfo.value.insCameraId ? "归寝" : "";
e.$status = e.cameraId == buildInfo.value.outCameraId ? "外出" : e.cameraId == buildInfo.value.insCameraId ? "进入" : "";
return e;
});
screenData.value = res.data;


+ 2
- 2
SafeCampus.WEB/src/views/userManage/classManage/index.vue View File

@@ -99,8 +99,8 @@ const columns: ColumnProps<SysUserPersonnel.ClassPage>[] = [
prop: "personSetName",
label: "班级名称",
search: { el: "input",span:1,props: {
clearable: true,
}, },
clearable: true
},key:'SetName' },
},
{


+ 1
- 1
monitorMobile/pages/earlyWarning/detail.vue View File

@@ -23,7 +23,7 @@
班级:
</view>
<view class="valueBox">
--
{{ detailData.personSetName || "--" }}
</view>
</view>
<view class="cli">


+ 3
- 3
monitorMobile/pages/earlyWarning/index.vue View File

@@ -131,19 +131,19 @@
<u-row>
<u-col span="6">
<view class="midContent">
姓名:--
姓名:{{item.sceneName || '--'}}
</view>
</u-col>
<u-col span="6">
<view class="midContent">
系部:--
系部:{{item.majorName || '--'}}
</view>
</u-col>
</u-row>
<u-row style="margin-top: 20rpx;">
<u-col span="6">
<view class="midContent">
专业:--
专业:{{item.depName || '--'}}
</view>
</u-col>
<u-col span="6">


Loading…
Cancel
Save