修改大屏劳务管理

yanzhu-bigscreen/src/views/projectDetail.vue

@@ -577,6 +577,7 @@ export default {
             }
             this.$api.project.getProjectInfo(this.selProject.id).then((d) => {
                 this.prjInfo = d.data || {}
+                this.prjInfo.vendorsCode = 'uni'
                 let tmps = this.prjInfo.projectDeptsList || []
                 const func = (t) => {
                     let objs = tmps.filter((it) => it.deptType == t)
@@ -613,12 +614,11 @@ export default {
                     })
                     this.getWeatherNowInfo()
                 }
-            })
-
                 this.loadAttendanceData()
                 this.loadMilestoneData()
                 this.loadCostOutput()
                 this.initPhotographyList()
+            })
         },
         initPhotographyList() {
             this.$api.detail.photographyList(this.selProject.id).then((d) => {

yanzhu-bigscreen/src/views/projectLabor.vue

@@ -62,7 +62,7 @@
             <module-one-1-1 label="工种占比分布" class="chart-module4" :key="chartKey">
                 <project-overview-chart
                     :htmlShow="true"
-                    :key="'ai4' + overview+chartKey"
+                    :key="'ai4' +chartKey"
                     :sp="''"
                     :fn="changeChart4"
                     :maintitle="workerTotal"
@@ -233,12 +233,13 @@ export default {
             this.$api.labor.getWorkerCountGroupByType(this.selProject.vendorsCode, this.selProject.id).then((d) => {
                 let sum = 0
                 d.data.forEach((item) => {
+                    item.id = item.id || item.comId
                     sum += item.id ? item.id : 0
                 })
                 this.workerTotal = sum
                 this.workerGroupList = d.data.map((item) => {
                     return {
-                        name: item.workTypeName,
+                        name: item.workTypeName || item.craftPostName,
                         value: item.id ? item.id : 0,
                     }
                 })

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml

@@ -420,7 +420,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )
     </select>
 
-    <select id="groupWorkderNative" resultMap="ProProjectInfoSubdeptsUsersResult">
+    <select id="groupWorkderNative" resultType="com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers">
         select psu.card_code cardCode,nav.address comName
         from pro_project_info_subdepts_users psu
                  left join sys_native nav on left(psu.card_code,6)=nav.id
@@ -431,7 +431,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getWorkerCountGroupByType" resultMap="ProProjectInfoSubdeptsUsersResult">
         select dic2.dict_label as craft_post_name,
-               count(1)           comId
+               count(1)           id
         from pro_project_info_subdepts_users psu
                  join sys_dict_data dic2 on psu.`craft_post` = dic2.`dict_value` and dic2.`dict_type` = 'pro_craft_post'
         where psu.is_del!=2

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java

@@ -1707,6 +1707,9 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
         List<ProProjectInfoSubdeptsUsers> list=proProjectInfoSubdeptsUsersMapper.groupWorkderNative(prjId);
         list.stream().forEach(d->{
             String nav=d.getComName();
+            if(StringUtils.isEmpty(nav)){
+                nav="";
+            }
             if(nav.contains("省")){
                 nav=nav.substring(0,nav.indexOf("省"));
             }
@@ -1719,7 +1722,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
             d.setComName(nav);
             String code=d.getCardCode();
             if(StringUtils.isNotEmpty(code) && code.length()>=10){
-                String strY=code.substring(6-10);
+                String strY=code.substring(6,10);
                 if(NumberUtil.isNumber(strY)){
                     int y=DateUtils.calculatedAgeByBirthDay(strY+"-1-1");
                     // 1.18-30 2.30-40 3.40-55 4.55

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

@@ -288,7 +288,7 @@ export default {
             })
         },
         startImmersionRoaming(e) {
-            this.me.resetScene()
+            this.me && this.me.resetScene()
             e.preventDefault()
             if (!this.form.name) {
                 ElMessage.warning('请输入漫游名称!')
@@ -351,7 +351,7 @@ export default {
             }
             if (this.isRoaming) {
                 this.isRoaming = false
-                this.me.resetScene()
+                this.me && this.me.resetScene()
             } else {
                 ElMessage.warning('请先开启漫游')
             }
@@ -410,7 +410,7 @@ export default {
             }
             api.Camera.cancelPlayImmersiveRoam()
             this.isRoamingHistory = false
-            this.me.resetScene()
+            this.me && this.me.resetScene()
         },
         renamed(record) {
             this.visibleRenamed = true

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

@@ -34,7 +34,8 @@
             <el-icon @click="doToolsClose" style="color:#fff" class="tools-close">
                 <Close />
             </el-icon>
-            <person-roaming v-if="activeMenu===1" ref="personRoaming" :me="this"></person-roaming>
+            <person-roaming v-if="activeMenu==1" ref="personRoaming" :me="this"></person-roaming>
+            <custom-viewpoint v-if="activeMenu==2" ref="customViewpoint" :me="this"></custom-viewpoint>
         </div>
     </div>
 </template>
@@ -44,11 +45,13 @@ import useUserStore from '@/store/modules/user'
 import { listBimModel } from '@/api/bim/bimModel'
 import ModelFloorTree from './ModelFloorTree.vue'
 import PersonRoaming from './PersonRoaming.vue'
+import CustomViewpoint from './CustomViewpoint.vue'
 
 export default {
     components: {
         ModelFloorTree,
         PersonRoaming,
+        CustomViewpoint,
     },
     data() {
         return {
@@ -93,6 +96,7 @@ export default {
             api.Plugin.deleteMiniMap()
         },
         doMenu(n) {
+            debugger
             if (n == this.activeMenu) {
                 if (n == 0) {
                     this.resetScene()
@@ -106,6 +110,9 @@ export default {
             if (n == 1) {
                 this.param.title = '第一人称漫游'
             }
+            if (n == 2) {
+                this.param.title = '自定义视点漫游'
+            }
         },
         NotificationPopup(parameter) {
             this.param = parameter

yanzhu-ui-vue3/src/views/manage/videoMonitor/index.vue

@@ -29,9 +29,7 @@
                 <el-input v-model="queryParams.isDel" placeholder="请输入${comment}" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="${comment}" prop="upadteTime">
-        <el-date-picker clearable v-model="queryParams.upadteTime" type="date" value-format="YYYY-MM-DD"
+                <el-date-picker clearable v-model="queryParams.upadteTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择${comment}"></el-date-picker>
-          placeholder="请选择${comment}">
-        </el-date-picker>
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -41,8 +39,7 @@
 
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+                <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['manage:videoMonitor:add']">新增</el-button>
-          v-hasPermi="['manage:videoMonitor:add']">新增</el-button>
             </el-col>
             <!--
       <el-col :span="1.5">
@@ -73,16 +70,13 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px">
                 <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                    <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['manage:videoMonitor:edit']">修改</el-button>
-            v-hasPermi="['manage:videoMonitor:edit']">修改</el-button>
+                    <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:videoMonitor:remove']">删除</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['manage:videoMonitor:remove']">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
-      v-model:limit="queryParams.pageSize" @pagination="getList" />
 
         <!-- 添加或修改延迟摄影管理对话框 -->
         <el-dialog :title="title" v-model="open" width="500px" append-to-body>
@@ -121,9 +115,7 @@
                     <el-input v-model="form.isDel" placeholder="请输入${comment}" />
                 </el-form-item>
                 <el-form-item label="${comment}" prop="upadteTime">
-          <el-date-picker clearable v-model="form.upadteTime" type="date" value-format="YYYY-MM-DD"
+                    <el-date-picker clearable v-model="form.upadteTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择${comment}"></el-date-picker>
-            placeholder="请选择${comment}">
-          </el-date-picker>
                 </el-form-item>
             </el-form>
             <template #footer>
@@ -138,26 +130,21 @@
 </template>
 
 <script setup name="VideoMonitor">
-import {
+import { listVideoMonitor, getVideoMonitor, delVideoMonitor, addVideoMonitor, updateVideoMonitor } from '@/api/manage/videoMonitor'
-  listVideoMonitor,
+import useUserStore from '@/store/modules/user'
-  getVideoMonitor,
+import videoMonitorDrawer from './videoMonitorDrawer.vue'
-  delVideoMonitor,
+const { proxy } = getCurrentInstance()
-  addVideoMonitor,
+const userStore = useUserStore()
-  updateVideoMonitor,
+const videoMonitorList = ref([])
-} from "@/api/manage/videoMonitor";
+const open = ref(false)
-import videoMonitorDrawer from "./videoMonitorDrawer.vue";
+const loading = ref(true)
-const { proxy } = getCurrentInstance();
+const showSearch = ref(true)
-
+const ids = ref([])
-const videoMonitorList = ref([]);
+const single = ref(true)
-const open = ref(false);
+const multiple = ref(true)
-const loading = ref(true);
+const total = ref(0)
-const showSearch = ref(true);
+const title = ref('')
-const ids = ref([]);
+const videoDrawer = ref()
-const single = ref(true);
-const multiple = ref(true);
-const total = ref(0);
-const title = ref("");
-const videoDrawer = ref();
 
 const data = reactive({
     form: {},
@@ -178,24 +165,26 @@ const data = reactive({
         upadteTime: null,
     },
     rules: {},
-});
+})
 
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams, form, rules } = toRefs(data)
 
 /** 查询延迟摄影管理列表 */
 function getList() {
-  loading.value = true;
+    loading.value = true
+    queryParams.value.projectId = userStore.currentPrjId
+    queryParams.value.comId = userStore.currentComId
     listVideoMonitor(queryParams.value).then((response) => {
-    videoMonitorList.value = response.rows;
+        videoMonitorList.value = response.rows
-    total.value = response.total;
+        total.value = response.total
-    loading.value = false;
+        loading.value = false
-  });
+    })
 }
 
 // 取消按钮
 function cancel() {
-  open.value = false;
+    open.value = false
-  reset();
+    reset()
 }
 
 // 表单重置
@@ -218,30 +207,30 @@ function reset() {
         createTime: null,
         updateBy: null,
         upadteTime: null,
-  };
+    }
-  proxy.resetForm("videoMonitorRef");
+    proxy.resetForm('videoMonitorRef')
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1;
+    queryParams.value.pageNum = 1
-  getList();
+    getList()
 }
 
 /** 重置按钮操作 */
 function resetQuery() {
-  proxy.resetForm("queryRef");
+    proxy.resetForm('queryRef')
-  handleQuery();
+    handleQuery()
 }
 
 function doSuccess() {
-  handleQuery();
+    handleQuery()
 }
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  ids.value = selection.map((item) => item.id);
+    ids.value = selection.map((item) => item.id)
-  single.value = selection.length != 1;
+    single.value = selection.length != 1
-  multiple.value = !selection.length;
+    multiple.value = !selection.length
 }
 
 /** 新增按钮操作 */
@@ -250,71 +239,71 @@ function handleAdd() {
     //open.value = true;
     //title.value = "添加延迟摄影管理";
     videoDrawer.value.showDrawer({
-    type: "add",
+        type: 'add',
-  });
+    })
 }
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  reset();
+    reset()
-  const _id = row.id || ids.value;
+    const _id = row.id || ids.value
     getVideoMonitor(_id).then((response) => {
         //form.value = response.data;
         //open.value = true;
         //title.value = "修改延迟摄影管理";
         videoDrawer.value.showDrawer({
             row: response.data,
-      type: "edit",
+            type: 'edit',
-    });
+        })
-  });
+    })
 }
 
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["videoMonitorRef"].validate((valid) => {
+    proxy.$refs['videoMonitorRef'].validate((valid) => {
         if (valid) {
             if (form.value.id != null) {
                 updateVideoMonitor(form.value).then((response) => {
-          proxy.$modal.msgSuccess("修改成功");
+                    proxy.$modal.msgSuccess('修改成功')
-          open.value = false;
+                    open.value = false
-          getList();
+                    getList()
-        });
+                })
             } else {
                 addVideoMonitor(form.value).then((response) => {
-          proxy.$modal.msgSuccess("新增成功");
+                    proxy.$modal.msgSuccess('新增成功')
-          open.value = false;
+                    open.value = false
-          getList();
+                    getList()
-        });
+                })
             }
         }
-  });
+    })
 }
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const _ids = row.id || ids.value;
+    const _ids = row.id || ids.value
     proxy.$modal
         .confirm('是否确认删除延迟摄影名称为【' + row.monitorName + '】的数据项？')
         .then(function () {
-      return delVideoMonitor(_ids);
+            return delVideoMonitor(_ids)
         })
         .then(() => {
-      getList();
+            getList()
-      proxy.$modal.msgSuccess("删除成功");
+            proxy.$modal.msgSuccess('删除成功')
         })
-    .catch(() => { });
+        .catch(() => {})
 }
 
 /** 导出按钮操作 */
 function handleExport() {
     proxy.download(
-    "manage/videoMonitor/export",
+        'manage/videoMonitor/export',
         {
             ...queryParams.value,
         },
         `videoMonitor_${new Date().getTime()}.xlsx`
-  );
+    )
 }
 
-getList();
+getList()
 </script>