修改举牌验收的BUG

yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js

@@ -115,20 +115,16 @@ Page({
   },
   async submitSave(e) {
     let approveStatus = e.target.dataset.set;
-    if (!this.data.checkResult) {
-      app.toast("请选择审批结果!");
-      return false;
-    }
     if (this.data.imageInfoData.length == 0) {
       app.toast("请上传图片!");
       return;
     }
     let fileUrls = await uploadFiles(this.data.imageInfoData);
-    debugger
+
     let postData = {
       id: this.data.rowData.id,
       approveStatus: approveStatus,
-      checkResult: this.data.checkResult,
+      checkResult: approveStatus == 3 ? 2 : 1,
       checkingFiles: fileUrls.join(","),
     };
     try {

yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.wxml

@@ -87,6 +87,7 @@
     </view>
 
     <view wx:if="{{isApprove}}">
+      <!--
       <view class="inspect_info_content">
         <view class="markers inspect_info_title">审批结果</view>
         <van-radio-group class="radio-group add_textarea h80" model:value="{{ checkResult }}"
@@ -96,6 +97,7 @@
           <van-radio class="radio-item" name="2" shape="square" icon-size="50rpx">不合格</van-radio>
         </van-radio-group>
       </view>
+      -->
 
       <view class="inspect_info_content">
         <view class=" markers inspect_info_title">三方验收照片</view>

yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js

@@ -125,7 +125,7 @@ Page({
           it.workingPositionFull = task.full;
           it.taskId = task.id;
           it.canEdit = (it.approveStatus == 1 || it.approveStatus == 3) && it.groupDeptUser == this.data.projectUserInfo.userPhone;
-          it.canApprove = (it.approveStatus == 1 || it.approveStatus == 3) && it.technicianUser == this.data.projectUserInfo.userPhone;
+          it.canApprove = (it.approveStatus == 1) && it.technicianUser == this.data.projectUserInfo.userPhone;
           return it;
         });
         this.setData({

yanzhu-ui-app/miniprogram/pageage/project_more/index.js

@@ -71,7 +71,7 @@ Page({
    * @param {*} proId 
    */
   getUserMenuList: function (proId) {
-    findUserMenuList(proId, 'gdgn').then(res => {
+    findUserMenuList(proId, this.data.active == 1 ? "" : 'gdgn').then(res => {
       if (res.code == 200) {
         this.setData({
           menuList: res.data

yanzhu-ui-vue3/src/views/bim/bimSetting/PersonRoaming.vue

@@ -14,10 +14,12 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="移动速度" prop="moveRate">
-                        <el-input-number v-model="form.moveRate" :precision="2" :step="0.01" :min="0" placeholder="0.00" style="width: 100%"></el-input-number>
+                        <el-input-number v-model="form.moveRate" :precision="2" :step="0.01" :min="0" placeholder="0.00"
+                            style="width: 100%"></el-input-number>
                     </el-form-item>
                     <el-form-item label="旋转速度" prop="lookFactor">
-                        <el-input-number v-model="form.turnRate" :precision="2" :step="0.01" :min="0" placeholder="0.00" style="width: 100%"></el-input-number>
+                        <el-input-number v-model="form.turnRate" :precision="2" :step="0.01" :min="0" placeholder="0.00"
+                            style="width: 100%"></el-input-number>
                     </el-form-item>
                     <el-form-item>
                         <el-button @click="startImmersionRoaming" ghost>开始漫游</el-button>
@@ -95,15 +97,9 @@
                     </el-table-column>
                 </el-table>
                 <div class="pagination-container">
-                    <el-pagination
+                    <el-pagination v-model:current-page="pagination.current" v-model:page-size="pagination.pageSize"
-                        v-model:current-page="pagination.current"
+                        :page-sizes="[10, 20, 30, 50]" :total="pagination.total" layout="total, prev, pager, next"
-                        v-model:page-size="pagination.pageSize"
+                        @size-change="handleSizeChange" @current-change="handleCurrentChange" />
-                        :page-sizes="[10, 20, 30, 50]"
-                        :total="pagination.total"
-                        layout="total, prev, pager, next"
-                        @size-change="handleSizeChange"
-                        @current-change="handleCurrentChange"
-                    />
                 </div>
             </el-tab-pane>
         </el-tabs>
@@ -239,14 +235,15 @@ export default {
     },
     mounted() {
         window.xapp = this
-        api.Plugin.addMiniMap()
+        if (!this.me.bimCfg.clientApi) {
-        let options = {
+            api.Plugin.addMiniMap()
-            Anchor: 3,
+            let options = {
-            Offset: [70, -380],
+                Anchor: 3,
-            Size: 300,
+                Offset: [70, -380],
+                Size: 300,
+            }
+            api.Plugin.updateMiniMap(options)
         }
-        api.Plugin.updateMiniMap(options)
-
         const userStore = useUserStore()
         this.currentPrjId = userStore.currentPrjId
         this.currentComId = userStore.currentComId
@@ -487,22 +484,27 @@ export default {
 .roaming-settings {
     width: 340px;
     padding: 0px 10px 10px;
+
     .op-table {
         .cell {
             font-size: 12px;
         }
     }
+
     .his-tool {
         font-size: 12px;
         margin-bottom: 8px;
     }
+
     .pagination-container {
         margin-top: 10px;
         height: 32px;
         display: flex;
         justify-content: flex-end;
+
         .el-pagination {
             font-size: 12px;
+
             .el-pagination__total,
             .el-pagination__sizes {
                 margin-right: 16px;