Merge branch 'master' of http://8.141.155.183:3000/bjquanjiang/pinganxiaoyuan

SafeCampus.WEB/src/api/modules/attendance/roolcall.ts

@@ -35,7 +35,7 @@ const attendanceRoolcallApi = {
   },
   /** 删除点名任务（删除关联点名数据） */
   delete(params: any) {
-    return http.delete("delete", params);
+    return http.post("delete", params);
   },
   /** 删除点名任务（只可删除待处理的任务） */
   remove(params: any) {

SafeCampus.WEB/src/views/attendance/roolcall/index.vue

@@ -23,7 +23,7 @@
         <template #operation="scope">
           <el-space>
             <s-button link :opt="FormOptEnum.VIEW" @click="onView(scope.row)" />
-            <s-button link :opt="FormOptEnum.DELETE" @click="onDelete([scope.row.personId], `删除点名任务`)" />
+            <s-button link :opt="FormOptEnum.DELETE" @click="onDelete([scope.row.id], `删除点名任务`)" />
           </el-space>
         </template>
       </ProTable>
@@ -125,6 +125,18 @@ const columns: ColumnProps[] = [
     prop: "cameraName",
     label: "摄像头名称"
   },
+  {
+    prop: "depName",
+    label: "院系"
+  },
+  {
+    prop: "majorName",
+    label: "专业"
+  },
+  {
+    prop: "personSetName",
+    label: "班级"
+  },
   {
     prop: "continueTime",
     label: "持续时间"
@@ -171,7 +183,7 @@ const formRef = ref<InstanceType<typeof Form> | null>(null);
     return
   }
   // 二次确认 => 请求api => 刷新表格
-  await useHandleData(attendanceRoolcallApi.delete, {id: ids.join(",") }, msg);
+  await useHandleData(attendanceRoolcallApi.delete, {ids: ids }, msg);
   RefreshTable(); //刷新表格
 }
 

SafeCampus.WEB/src/views/screen/component/index/video.vue

@@ -31,36 +31,40 @@
           <CaretBottom v-if="cate == 2" color="#fff" width="11px" />
         </div>
       </div>
-      <ul v-if="cate == 1">
-        <li
-          v-for="(item, index) in areaList"
-          :class="{ active: item.id == areaId }"
-          :key="index"
-          class="wrap1"
-          @click="areaItemClick(item)"
-          :title="item.name"
-        >
-          {{ item.name }}
-        </li>
-        <template v-if="!areaList.length">
-          <li class="wrap1" style="border: none">暂无区域</li>
-        </template>
-      </ul>
-      <ul v-if="cate == 2">
-        <li
-          v-for="(item, index) in deviceList"
-          :class="{ active: item.sensorId == sensorId }"
-          :key="index"
-          class="wrap1"
-          @click="itemClick(item)"
-          :title="item.sensorName"
-        >
-          {{ item.sensorName }}
-        </li>
-        <template v-if="!deviceList.length">
-          <li class="wrap1" style="border: none">暂无设备</li>
-        </template>
-      </ul>
+      <div v-if="cate == 1" style="height: calc(100% - 46px); overflow-y: auto">
+        <ul>
+          <li
+            v-for="(item, index) in areaList"
+            :class="{ active: item.id == areaId }"
+            :key="index"
+            class="wrap1"
+            @click="areaItemClick(item)"
+            :title="item.name + ' ( ' + item.cameraInfos.length + ' ) '"
+          >
+            {{ item.name }} ( {{ item.cameraInfos.length }} )
+          </li>
+          <template v-if="!areaList.length">
+            <li class="wrap1" style="border: none">暂无区域</li>
+          </template>
+        </ul>
+      </div>
+      <div v-if="cate == 2" style="height: calc(100% - 46px); overflow-y: auto">
+        <ul>
+          <li
+            v-for="(item, index) in deviceList"
+            :class="{ active: item.sensorId == sensorId }"
+            :key="index"
+            class="wrap1"
+            @click="itemClick(item)"
+            :title="item.sensorName"
+          >
+            {{ item.sensorName }}
+          </li>
+          <template v-if="!deviceList.length">
+            <li class="wrap1" style="border: none">暂无设备</li>
+          </template>
+        </ul>
+      </div>
     </div>
   </div>
 </template>