wangmengwei 2 周之前
父节点
当前提交
66d34d1cc5

+ 2 - 6
ruoyi-ui/src/api/system/user.js

@@ -88,15 +88,11 @@ export function updateUserProfile(data) {
 }
 
 // 用户密码重置
-export function updateUserPwd(oldPassword, newPassword) {
-  const data = {
-    oldPassword,
-    newPassword
-  }
+export function updateUserPwd(data) {
   return request({
     url: '/system/user/profile/updatePwd',
     method: 'post',
-    params: data
+    data: data
   })
 }
 

+ 1 - 1
ruoyi-ui/src/api/wuguan/reservRecord.js

@@ -12,7 +12,7 @@ export function listReservRecord(query) {
 // 查询预约记录详细
 export function getReservRecord(reservRecordId) {
   return request({
-    url: '/wuYe/reservRecord/' + reservRecordId,
+    url: '/wuYe/reservRecord/detail/' + reservRecordId,
     method: 'get'
   })
 }

+ 10 - 0
ruoyi-ui/src/api/wuguan/staffManage.js

@@ -107,6 +107,16 @@ export function updateStaffManage(data) {
   })
 }
 
+export function updateStaffManageauthentication(data) {
+  return request({
+    url: '/wuYe/staffManage/put/authentication',
+    method: 'post',
+    data: data
+  })
+}
+
+
+
 // 删除员工管理
 export function delStaffManage(staffId) {
   return request({

+ 2 - 2
ruoyi-ui/src/components/ImageUploadshib/index.vue

@@ -207,7 +207,7 @@ export default {
              this.uploadedSuccessfully();
           });
         }else if(this.typeg == 2){
-          let nget={'image':res.urlOnline}
+          let nget={'image':res.data.urlOnline}
           // 车牌号
           licensePlate(nget).then(response => {
            this.uploadList.push({ name: res.data.fileName, url: res.data.fileName });
@@ -222,7 +222,7 @@ export default {
           });
         }else if(this.typeg == 4){
           // 房产证
-          let nget={'image':res.urlOnline}
+          let nget={'image':res.data.urlOnline}
           // 车牌号
           realEstateCertificate(nget).then(response => {
            this.uploadList.push({ name: res.data.fileName, url: res.data.fileName });

+ 4 - 4
ruoyi-ui/src/settings.js

@@ -1,9 +1,9 @@
 module.exports = {
-   urls:`https://zhsq.qs163.cn`,
+   urls:`https://zxyzhsq.qs163.cn`,
+   // http://192.168.101.245:8077
+   // urls:`http://192.168.101.86:8056`,
    // http://10.90.90.52:8065
-   // urls:`http://192.168.101.245:8077`,
-   // http://10.90.90.52:8065
-   // zhsq.qs163.cn
+   // http://10.90.90.40:5000
   /**
    * 侧边栏主题 深色主题theme-dark,浅色主题theme-light
    */

+ 3 - 3
ruoyi-ui/src/views/index.vue

@@ -683,9 +683,9 @@ color: #196CFF;margin-left: 20px;"><router-link class="link-type" :to="'/registe
           staffName: [
                             { required: true, message: "姓名不能为空", trigger: "blur" }
                           ],
-                          // staffCategory: [
-                          //   { required: true, message: "员工类别", trigger: "change" }
-                          // ],
+                          staffCategory: [
+                            { required: true, message: "员工类别", trigger: "change" }
+                          ],
 
                           phoneNumber: [
                             { required: true, message: "手机号码不能为空", trigger: "blur" }

+ 10 - 12
ruoyi-ui/src/views/registerxmerenz.vue

@@ -156,7 +156,7 @@
                         										<div style="position: relative;" @click="imge(itemg)">
                                               <!-- defaultSettings.urls+baseUrl +itemt.url -->
                                               <!-- +baseUrl -->
-                        											<img :src="defaultSettings.urls +itemg" alt="" style="width: 100%;height: 150px;">
+                        											<img :src="defaultSettings.urls+baseUrl +itemg" alt="" style="width: 100%;height: 150px;">
                         											<!-- <p style="position: absolute;bottom: 0;left: 0;font-weight: 500; height: 24px;background-color: rgba(0,0,0,.5);color: #fff;font-size: 14px;width: 100%;padding-left: 10px;line-height: 24px;margin: 0;">{{itemt.title}}</p> -->
                         										</div>
                             </el-carousel-item>
@@ -173,7 +173,7 @@
                         <p ><span  style="color:#28C529 ;"  @click="handleUpdate(item)" v-if="item.examine !=2">修改</span>  </p>
                         <p  style="border-left: 1px solid #DADADAd;" @click="handleUpdatef(item)" :class="item.examine !=2?'':'wide'">查看</p>
                         <!-- <span @click="handleUpdatef(item)">查看</span> -->
-                        <p  style="color:red" @click="handleDelete(item)">删除</p>
+                        <!-- <p  v-if="item.examine !=2"  style="color:red" @click="handleDelete(item)">删除</p> -->
                       </div>
                       <img v-if="item.isnum == true" src="../assets/images/icon_htgl_kp_gx.png" alt="" style="width: 35px;height: 35px;position: absolute;bottom: 0;right: 0;">
                     </div>
@@ -295,7 +295,7 @@
     <el-dialog title="查看图片" :visible.sync="openg" width="440px" append-to-body>
       <div>
         <!-- +baseUrl -->
-        <img :src="defaultSettings.urls+ imgurw" alt="" style="width: 100%;">
+        <img :src="defaultSettings.urls +baseUrl+ imgurw" alt="" style="width: 100%;">
       </div>
       </el-dialog>
   </div>
@@ -360,7 +360,7 @@ export default {
                   { required: true, message: "员工姓名不能为空", trigger: "blur" }
                 ],
                 staffCategory: [
-                  { required: true, message: "员工类别,1:保安 2:维修人员 3:物业管理不能为空", trigger: "change" }
+                  { required: true, message: "员工类别不能为空", trigger: "change" }
                 ],
 
                 phoneNumber: [
@@ -636,14 +636,12 @@ export default {
     },
     /** 删除按钮操作 */
         handleDelete(row) {
-          // const staffIds = row.staffId || this.ids;
-          let staffIds={'staffId':row.staffId,'userId':row.userId,'tenantId':row.tenantId,'examine':row.examine}
-          this.$modal.confirm('是否确认删除员工的数据项?').then(function() {
-            return deleteStaffManage(staffIds);
-          }).then(() => {
-            this.getList();
-            this.$modal.msgSuccess("删除成功");
-          }).catch(() => {});
+         const staffIds = row.staffId || this.ids;
+         // let staffIds={'staffId':row.staffId,'userId':row.userId,'tenantId':row.tenantId,'examine':row.examine}
+                   delStaffManage(staffIds).then(response => {
+                           this.$modal.msgSuccess("删除成功");
+                           this.getList();
+                         });
         },
     /** 导出按钮操作 */
     handleExport() {

+ 1 - 1
ruoyi-ui/src/views/system/user/index.vue

@@ -518,7 +518,7 @@ export default {
     this.getList();
     this.getDeptTree();
     this.getConfigKey("sys.user.initPassword").then(response => {
-      this.initPassword = response.msg;
+      this.initPassword = response.data;
     });
 	this.getdept()
   },

+ 2 - 1
ruoyi-ui/src/views/system/user/profile/resetPwd.vue

@@ -54,7 +54,8 @@ export default {
     submit() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
+          let sge={'oldPassword':this.user.oldPassword,'newPassword':this.user.newPassword}
+          updateUserPwd(sge).then(response => {
             this.$modal.msgSuccess("修改成功");
           });
         }

+ 4 - 1
ruoyi-ui/src/views/wuguan/baoxiuguanli/index.vue

@@ -184,7 +184,7 @@
                      </div>
                       <div class="bortt tongty" style="justify-content: space-between; margin-top: 0;">
                          <p v-hasPermi="['wuYe:repair:assign']"   style="cursor: pointer;color: #28C529;" @click="daifeng(item)" v-if="item.repairStatus == 1"><span  >指派</span></span>  </p>
-                        <p style="cursor: pointer;" @click="handleUpdatef(item)"><span  >查看</span></span>  </p>
+                        <p :class="item.repairStatus !=1?'wide':''"  style="cursor: pointer;" @click="handleUpdatef(item)"><span  >查看</span></span>  </p>
                         <!-- <span @click="handleUpdatef(item)">查看</span> -->
                         <p v-if="item.repairStatus == 1" v-hasPermi="['wuYe:repair:remove']" style="color:red;cursor: pointer;" @click="handleDelete(item)">删除  </p>
                       </div>
@@ -946,6 +946,9 @@ export default {
   .het{
     height: 450px;
   }
+  .wide{
+    width: 100% !important;
+  }
 
   </style>
 

+ 12 - 8
ruoyi-ui/src/views/wuguan/fagnwuguanli/index.vue

@@ -643,14 +643,18 @@ export default {
            const houseId = row.houseId || this.ids
            getHouseInfo(houseId).then(response => {
              this.form = response.data;
-              let sef=this.form.detailedAddress.split('栋')
-              this.$set(this.form,'loudong',sef[0])
-              // this.form.loudong = sef[0]
-              let sye=sef[1]
-              let syest=sye.split('单元')
-              // this.form.danyuan = syest[0]
-              this.$set(this.form,'danyuan',syest[0])
-              this.form.detailedAddress = syest[1]
+                 this.form.houseStatus = this.form.houseStatus - 0
+                 this.form.houseType = this.form.houseType - 0
+
+                  let sef=this.form.detailedAddress.split('栋')
+                  this.$set(this.form,'loudong',sef[0])
+                  // this.form.loudong = sef[0]
+                  let sye=sef[1]
+                  let syest=sye.split('单元')
+                  // this.form.danyuan = syest[0]
+                  this.$set(this.form,'danyuan',syest[0])
+                  this.form.detailedAddress = syest[1]
+
              this.open = true;
              this.ishoew = true
              this.title = "修改房屋信息(先上传房产证可识别信息,无房产证可只填标星信息.)";

+ 1 - 1
ruoyi-ui/src/views/wuguan/newxq/index.vue

@@ -37,7 +37,7 @@
                    <img src="../../../assets/images/shoucangx.png" alt="" style="width: 20px;height: 20px;" v-if="shouca">
                     <div style="margin-left: 5px;font-weight: 500;color: #666666;font-size: 16px;padding-top: 5px;">{{form.userStars == null? 0 : form.userStars }}</div>
                  </div>
-                 <div style="display: flex; align-items: center ;margin-right: 20px;" @click="shoucang">
+                 <div style="display: flex; align-items: center ;margin-right: 20px;" >
                    <!-- <img src="../../../assets/images/icon_dt_sc_normal.png" alt="" style="width: 20px;height: 20px;" v-if="!shouca"> -->
                    <img src="../../../assets/images/fenxiangtwo.png" alt="" style="width: 20px;height: 20px;" >
                     <div style="margin-left: 5px;font-weight: 500;color: #666666;font-size: 16px;padding-top: 5px;">{{form.userShare == null? 0 : form.userShare }}</div>

+ 6 - 4
ruoyi-ui/src/views/wuguan/renyuan/index.vue

@@ -113,7 +113,7 @@
                     plain
                     size="mini"
                     @click="handleAdd"
-                    v-hasPermi="['wuYe:residentInfo:add']"
+                    v-hasPermi="['wuYe:residentInfo:addResidentInfo']"
                   >添加</el-button>
                 </el-col>
                 <!-- <el-col :span="1.5">
@@ -179,7 +179,9 @@
                                               										<div style="position: relative;" @click="imge(itemg)">
                                                                     <!-- defaultSettings.urls+baseUrl +itemt.url -->
                                                                     <!-- +baseUrl -->
-                                              											<img :src="defaultSettings.urls +itemg" alt="" style="width: 100%;height: 150px;">
+                                                                    <img :src="defaultSettings.urls  +itemg" alt="" style="width: 100%;height: 150px;" v-if="baseUrl == '/dev-api'">
+                                                                    <img :src="defaultSettings.urls +baseUrl +itemg" alt="" style="width: 100%;height: 150px;" v-else>
+                                              											<!-- <img :src="defaultSettings.urls +itemg" alt="" style="width: 100%;height: 150px;"> -->
                                               											<!-- <p style="position: absolute;bottom: 0;left: 0;font-weight: 500; height: 24px;background-color: rgba(0,0,0,.5);color: #fff;font-size: 14px;width: 100%;padding-left: 10px;line-height: 24px;margin: 0;">{{itemt.title}}</p> -->
                                               										</div>
                                                   </el-carousel-item>
@@ -193,10 +195,10 @@
                                                 </el-carousel>
                                             </div>
                       <div class="bortt tongty" style="justify-content: space-between;">
-                        <p  :class="item.examine ==2?'wide':''" v-if="item.examine !=1" v-hasPermi="['wuYe:residentInfo:edit']" @click="handleUpdate(item)" style="cursor: pointer;color: #28C529;"><span  >修改</span>  </p>
+                        <p   v-hasPermi="['wuYe:residentInfo:editAuthentication']" @click="handleUpdate(item)" style="cursor: pointer;color: #28C529;"><span  >修改</span>  </p>
                          <!-- v-if="item.examine !=2" -->
                         <!-- <span @click="handleUpdatef(item)">查看</span> -->
-                        <p v-hasPermi="['wuYe:residentInfo:remove']" v-if="item.examine !=2" style="border-left: 1px solid #DADADA;color:red;cursor: pointer;" @click="handleDelete(item)">删除</p>
+                        <p v-hasPermi="['wuYe:residentInfo:deleteResident']"  style="border-left: 1px solid #DADADA;color:red;cursor: pointer;" @click="handleDelete(item)">删除</p>
                       </div>
 
                       <img v-if="item.isnum == true" src="../../../assets/images/icon_htgl_kp_gx.png" alt="" style="width: 35px;height: 35px;position: absolute;bottom: 0;right: 0;">

+ 4 - 3
ruoyi-ui/src/views/wuguan/renyuansh/index.vue

@@ -179,8 +179,9 @@
                                               										<div style="position: relative;" @click="imge(itemg)">
                                                                     <!-- defaultSettings.urls+baseUrl +itemt.url -->
                                                                     <!-- +baseUrl -->
-
-                                              											<img :src="defaultSettings.urls +itemg" alt="" style="width: 100%;height: 150px;">
+                                                                     <img :src="defaultSettings.urls  +itemg" alt="" style="width: 100%;height: 150px;" v-if="baseUrl == '/dev-api'">
+                                                                     <img :src="defaultSettings.urls +baseUrl +itemg" alt="" style="width: 100%;height: 150px;" v-else>
+                                              											<!-- <img :src="defaultSettings.urls  +itemg" alt="" style="width: 100%;height: 150px;"> -->
                                               											<!-- <p style="position: absolute;bottom: 0;left: 0;font-weight: 500; height: 24px;background-color: rgba(0,0,0,.5);color: #fff;font-size: 14px;width: 100%;padding-left: 10px;line-height: 24px;margin: 0;">{{itemt.title}}</p> -->
                                               										</div>
                                                   </el-carousel-item>
@@ -198,7 +199,7 @@
                        <p  v-hasPermi="['wuYe:residentInfo:examineStaff']" v-if="item.examine==1" style="color:#E6A23C;cursor: pointer;" @click="handleUpdateb(item)">驳回</p>
                        <!-- <span @click="handleUpdatef(item)">查看</span> -->
                        <p :class="item.examine ==2?'wide':''"  style="border-left: 1px solid #DADADAd;border-right: 1px solid #DADADAd ;cursor: pointer;" @click="handleUpdate(item)">查看</p>
-                       <p v-if="item.examine !=2" v-hasPermi="['wuYe:staffManage:remove']"   style="color:red;cursor: pointer;" @click="handleDelete(item)">删除</p>
+                       <p v-if="item.examine !=2" v-hasPermi="['wuYe:residentInfo:deleteResident']"   style="color:red;cursor: pointer;" @click="handleDelete(item)">删除</p>
 
                       </div>
                       <img v-if="item.isnum == true" src="../../../assets/images/icon_htgl_kp_gx.png" alt="" style="width: 35px;height: 35px;position: absolute;bottom: 0;right: 0;">

+ 27 - 23
ruoyi-ui/src/views/wuguan/weitingchel/index.vue

@@ -34,15 +34,17 @@
                       </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="手机号码" prop="mobileNumber">
-                        <el-input
-                          v-model="queryParams.mobileNumber"
-                          placeholder="请输入手机号码"
-                          clearable
-                          @keyup.enter.native="handleQuery"
-                        />
-                      </el-form-item>
+                <el-form-item label="违停时间" prop="createTime">
+                        <el-date-picker clearable
+
+                          v-model="queryParams.params.createTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择违停时间">
+                        </el-date-picker>
+                 </el-form-item>
               </el-col>
+
             </el-col>
             <el-col :span="24">
               <el-col :span="8">
@@ -79,24 +81,26 @@
                         </el-select>
                       </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="违停时间" prop="createTime">
-                        <el-date-picker clearable
 
-                          v-model="queryParams.params.createTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择违停时间">
-                        </el-date-picker>
-                 </el-form-item>
-              </el-col>
 
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="手机号码" prop="mobileNumber">
+                      <el-input
+                        v-model="queryParams.mobileNumber"
+                        placeholder="请输入手机号码"
+                        clearable
+                        @keyup.enter.native="handleQuery"
+                      />
+                    </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="butt bnjle">
+                <el-button size="mini" type="primary"   @click="handleQuery">搜索</el-button>
+                <el-button size="mini"  @click="resetQuery">重置</el-button>
+              </el-form-item>
+            </el-col>
           </el-row>
-          <el-form-item class="butt bnjle">
-            <el-button size="mini" type="primary"   @click="handleQuery">搜索</el-button>
-            <el-button size="mini"  @click="resetQuery">重置</el-button>
-          </el-form-item>
         </el-form>
       </div>
 
@@ -298,7 +302,7 @@
     </el-dialog>
     <el-dialog title="查看图片" :visible.sync="openi" width="640px" append-to-body>
       <!-- +baseUrl -->
-       <img :src="defaultSettings.urls +imgurl" alt="" style="width: 100%;height: 350px;">
+       <img :src="defaultSettings.urls+baseUrl +imgurl" alt="" style="width: 100%;height: 350px;">
       </el-dialog>
   </div>
 </template>

+ 7 - 4
ruoyi-ui/src/views/wuguan/weixiurenyuan/index.vue

@@ -157,7 +157,9 @@
                         										<div style="position: relative;" @click="imge(itemg)">
                                               <!-- defaultSettings.urls+baseUrl +itemt.url -->
                                               <!-- +baseUrl -->
-                        											<img :src="defaultSettings.urls +itemg" alt="" style="width: 100%;height: 150px;">
+                                              <img :src="defaultSettings.urls  +itemg" alt="" style="width: 100%;height: 150px;" v-if="baseUrl == '/dev-api'">
+                                              <img :src="defaultSettings.urls +baseUrl +itemg" alt="" style="width: 100%;height: 150px;" v-else>
+                        											<!-- <img :src="defaultSettings.urls+baseUrl +itemg" alt="" style="width: 100%;height: 150px;"> -->
                         											<!-- <p style="position: absolute;bottom: 0;left: 0;font-weight: 500; height: 24px;background-color: rgba(0,0,0,.5);color: #fff;font-size: 14px;width: 100%;padding-left: 10px;line-height: 24px;margin: 0;">{{itemt.title}}</p> -->
                         										</div>
                             </el-carousel-item>
@@ -298,14 +300,15 @@
     <el-dialog title="查看图片" :visible.sync="openg" width="440px" append-to-body>
       <div>
         <!-- +baseUrl -->
-        <img :src="defaultSettings.urls+ imgurw" alt="" style="width: 100%;">
+
+        <img :src="defaultSettings.urls+ baseUrl+ imgurw" alt="" style="width: 100%;">
       </div>
       </el-dialog>
   </div>
 </template>
 
 <script>
-import { listStaffManage, getStaffManage, delStaffManage, addStaffManage, updateStaffManage,authentication,deleteStaffManage } from "@/api/wuguan/staffManage";
+import { listStaffManage, getStaffManage, delStaffManage, addStaffManage, updateStaffManage,authentication,deleteStaffManage,updateStaffManageauthentication } from "@/api/wuguan/staffManage";
 import 'videojs-flash'
 import { getTenantList} from "@/api/login";
 import {userNamet} from "@/api/zhihuixy/tenant";
@@ -640,7 +643,7 @@ export default {
        if (valid) {
                  if (this.form.staffId != null) {
                    this.form.isFilter = false
-                   updateStaffManage(this.form).then(response => {
+                   updateStaffManageauthentication(this.form).then(response => {
                      this.$modal.msgSuccess("修改成功");
                      this.open = false;
                      this.getList();

+ 10 - 8
ruoyi-ui/src/views/wuguan/weixiurenyuansh/index.vue

@@ -20,14 +20,16 @@
                       </el-form-item>
               </el-col>
               <el-col :span="8">
-                              <el-form-item label="员工类别" prop="staffCategory">
-                                      <el-option
-                                                                 v-for="dict in dict.type.yaungong"
-                                                                 :key="dict.value"
-                                                                 :label="dict.label"
-                                                                 :value="dict.value"
-                                                                 ></el-option>
-                                    </el-form-item>
+                             <el-form-item label="员工类别" prop="staffCategory">
+                                     <el-select v-model="queryParams.staffCategory" placeholder="请选择员工类别" clearable>
+                                       <el-option
+                                                                  v-for="dict in dict.type.yaungong"
+                                                                  :key="dict.value"
+                                                                  :label="dict.label"
+                                                                  :value="dict.value"
+                                                                  ></el-option>
+                                     </el-select>
+                                   </el-form-item>
                             </el-col>
               <el-col :span="8">
                 <el-form-item label="维修分类" prop="maintenanceCategory">

+ 16 - 14
ruoyi-ui/src/views/wuguan/weixiurenyuanshme/index.vue

@@ -156,7 +156,9 @@
                         										<div style="position: relative;" @click="imge(itemg)">
                                               <!-- defaultSettings.urls+baseUrl +itemt.url -->
                                               <!-- +baseUrl -->
-                        											<img :src="defaultSettings.urls +itemg" alt="" style="width: 100%;height: 150px;">
+                                              <img :src="defaultSettings.urls  +itemg" alt="" style="width: 100%;height: 150px;" v-if="baseUrl == '/dev-api'">
+                                              <img :src="defaultSettings.urls +baseUrl +itemg" alt="" style="width: 100%;height: 150px;" v-else>
+                        											<!-- <img :src="defaultSettings.urls +itemg" alt="" style="width: 100%;height: 150px;"> -->
                         											<!-- <p style="position: absolute;bottom: 0;left: 0;font-weight: 500; height: 24px;background-color: rgba(0,0,0,.5);color: #fff;font-size: 14px;width: 100%;padding-left: 10px;line-height: 24px;margin: 0;">{{itemt.title}}</p> -->
                         										</div>
                             </el-carousel-item>
@@ -236,15 +238,15 @@
           </el-col>
           <el-col :span="12">
            <el-form-item label="员工类别" prop="staffCategory">
-                                 <el-select v-model="form.staffCategory" placeholder="请选择员工类别">
-                                    <el-option
-                                      v-for="dict in dict.type.yaungong"
-                                      :key="dict.value"
-                                      :label="dict.label"
-                                      :value="dict.value"
-                                      ></el-option>
-                                </el-select>
-            </el-form-item>
+                   <el-select v-model="queryParams.staffCategory" placeholder="请选择员工类别" clearable>
+                     <el-option
+                                                v-for="dict in dict.type.yaungong"
+                                                :key="dict.value"
+                                                :label="dict.label"
+                                                :value="dict.value"
+                                                ></el-option>
+                   </el-select>
+                 </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="维修分类" prop="maintenanceCategory">
@@ -295,7 +297,7 @@
     <el-dialog title="查看图片" :visible.sync="openg" width="440px" append-to-body>
       <div>
         <!-- +baseUrl -->
-        <img :src="defaultSettings.urls+ imgurw" alt="" style="width: 100%;">
+        <img :src="defaultSettings.urls +baseUrl+ imgurw" alt="" style="width: 100%;">
       </div>
       </el-dialog>
   </div>
@@ -627,9 +629,9 @@ export default {
     },
     /** 删除按钮操作 */
         handleDelete(row) {
-          // const staffIds = row.staffId || this.ids;
-          let staffIds={'staffId':row.staffId,'userId':row.userId,'tenantId':row.tenantId,'examine':row.examine}
-                    deleteStaffManage(staffIds).then(response => {
+          const staffIds = row.staffId || this.ids;
+          // let staffIds={'staffId':row.staffId,'userId':row.userId,'tenantId':row.tenantId,'examine':row.examine}
+                    delStaffManage(staffIds).then(response => {
                             this.$modal.msgSuccess("删除成功");
                             this.getList();
                           });

+ 1 - 3
ruoyi-ui/src/views/wuguan/yuangongpx/index.vue

@@ -247,7 +247,7 @@
                                  style="width: 100%;height: 150px;"
                                >
                                <!-- + baseUrl -->
-                                 <source  :src="defaultSettings.urls+ item.videoUrl " />
+                                 <source  :src="defaultSettings.urls + baseUrl+ item.videoUrl " />
                                </video>
                       </div>
                       <div class="goe">
@@ -912,9 +912,7 @@ export default {
        },
        videoPlay(val){
           getManual(val.manualId).then(response => {
-
           });
-
        },
     // 获取屏幕高度
     showFilterForm () {