dedsudiyu 9 月之前
父节点
当前提交
c0f5104b19

+ 7 - 7
src/api/integratedManagement/index.js

@@ -669,7 +669,7 @@ export function laboratoryHazardDetail(query) {
 //查询值班列表
 export function laboratoryXxpDutyListYmd(query) {
   return request({
-    url: '/laboratory/xxpDuty/listYmd',
+    url: '/laboratory/boardDuty/listYmd',
     method: 'get',
     params: query
   })
@@ -677,7 +677,7 @@ export function laboratoryXxpDutyListYmd(query) {
 //添加值班人员
 export function laboratoryXxpDutyAdd(data) {
   return request({
-    url: '/laboratory/xxpDuty/add',
+    url: '/laboratory/boardDuty/add',
     method: 'post',
     data: data
   })
@@ -701,7 +701,7 @@ export function laboratoryWhiteGetUserDutyList(data) {
 //巡查列表查询
 export function laboratoryXxpInspectionListYmd(query) {
   return request({
-    url: '/laboratory/xxpInspection/listYmd',
+    url: '/laboratory/boardPatrol/listYmd',
     method: 'get',
     params: query
   })
@@ -710,14 +710,14 @@ export function laboratoryXxpInspectionListYmd(query) {
 //值班人员详情接口
 export function laboratoryXxpDutyGetInfoByDate(query) {
   return request({
-    url: '/laboratory/xxpDuty/getInfoByDate',
+    url: '/laboratory/boardDuty/getInfoByDate',
     method: 'get',
     params: query
   })
 }
 export function delXxpDuty(id) {
   return request({
-    url: '/laboratory/xxpDuty/'+id,
+    url: '/laboratory/boardDuty/'+id,
     method: 'post',
   })
 }
@@ -725,7 +725,7 @@ export function delXxpDuty(id) {
 //获取异常记录
 export function listAbnormal(query) {
   return request({
-    url: '/laboratory/xxpInspection/listAbnormal',
+    url: '/laboratory/boardPatrol/listAbnormal',
     method: 'get',
     params: query
   })
@@ -734,7 +734,7 @@ export function listAbnormal(query) {
 //获取正常记录
 export function listStandard(query) {
   return request({
-    url: 'laboratory/xxpInspection/listStandard',
+    url: 'laboratory/boardPatrol/listStandard',
     method: 'get',
     params: query
   })

+ 1 - 1
src/components/xgPlayerVideo/xgPlayerVideo.vue

@@ -80,7 +80,7 @@
           closeVideoStopPropagation: true,//关闭点击播放器video元素的阻止冒泡行为
           width: this.videoData.width,
           height: this.videoData.height,
-          poster: localStorage.getItem('fileBrowseEnvironment') + localStorage.getItem('videoCover'),
+          poster: this.videoCover,//封面图片
           hls: {
             retryCount: 999, // 重试 3 次,默认值
             retryDelay: 1000, // 每次重试间隔 1 秒,默认值

+ 1 - 1
src/views/demo.vue

@@ -28,7 +28,7 @@
           {
             width:600,    //(宽度:非必传-默认600)
             height:338,   //(高度:非必传-默认338)
-            url: '//sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/hls/xgplayer-demo.m3u8',
+            url: 'https://sf1-cdn-tos.huoshanstatic.com/obj/media-fe/xgplayer_doc_video/hls/xgplayer-demo.m3u8',
           },
           {
             width:600,    //(宽度:非必传-默认600)

+ 3 - 3
src/views/integratedManagement/personnelManage/onDutyConfiguration/index.vue

@@ -143,7 +143,7 @@
                   <span>{{scope.row.userType ==1?'教职工':(scope.row.userType ==2?'学生':'未定义')}}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="电话" align="left" prop="userTelephone" width="227" show-overflow-tooltip/>
+              <el-table-column label="电话" align="left" prop="mobile" width="227" show-overflow-tooltip/>
               <el-table-column label="部门" align="left" prop="deptName" width="200" show-overflow-tooltip/>
               <el-table-column label="" align="left" prop="createTime" width="130" show-overflow-tooltip>
                 <template slot-scope="scope">
@@ -434,8 +434,8 @@
             subList.forEach(item=>{
               if(!item.children[0]){
                 obj.subList.push({
-                  subId:item.data.subOrDeptId,
-                  subName:item.label,
+                  subjectId:item.data.subOrDeptId,
+                  subjectName:item.label,
                   deptId:item.data.deptId,
                   deptName:item.data.otherDeptName,
                 })