Merge remote-tracking branch 'origin/master'

src/views/pqs/supervise/plan/components/addForm.vue

@@ -448,17 +448,13 @@
     </el-dialog>
 </template>
 <script lang="ts" setup>
-import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
+import { ref, onMounted, defineExpose, defineEmits, watch } from 'vue'
-// import { upload, insertTerminal, updateTerminal } from '@/api/process-boot/terminal'
 import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
 import { genFileId, ElMessage } from 'element-plus'
 import { useDictData } from '@/stores/dictData'
-import type { ComponentSize, FormInstance, FormRules } from 'element-plus'
-import { queryByAllCode } from '@/api/system-boot/dictTree'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { uploadFile } from '@/api/system-boot/file'
 import { addPlanFormData, getUserByDeptId } from '@/api/supervision-boot/plan/index'
-import { getAreaList } from '@/api/common'
 import Area from '@/components/form/area/index.vue'
 const emits = defineEmits(['onSubmit'])
 const dictData = useDictData()
@@ -479,7 +475,7 @@ const effectStatusList = dictData.getBasicData('effect_status')
 const planStatusList = dictData.getBasicData('plan_status')
 //字典获取电压等级
 const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
-//
+//监督对象属性
 const objTypeList = [
     {
         id: '1',

src/views/pqs/supervise/plan/components/detail.vue

@@ -11,17 +11,29 @@
                 {{ detailData.planOrgName }}
             </el-descriptions-item>
             <el-descriptions-item label="监督类型">
-                {{ detailData.supvType }}
+                {{
+                    supvTypeList.find(item => {
+                        return item.id == detailData.supvType
+                    })?.name
+                }}
             </el-descriptions-item>
             <el-descriptions-item label="监督阶段">
-                {{ detailData.supvStage }}
+                {{
+                    supvStageList.find(item => {
+                        return item.id == detailData.supvStage
+                    })?.name
+                }}
             </el-descriptions-item>
             <el-descriptions-item label="计划监督时间">
                 {{ formatDate(detailData.planSupvDate, 'YYYY-MM-DD') }}
             </el-descriptions-item>
             <!--文件地址-->
             <el-descriptions-item label="监督对象类型" v-if="detailData.lineFilePath">
-                {{ detailData.supvObjType }}
+                {{
+                    supvTypeList.find(item => {
+                        return item.id == detailData.supvObjType
+                    })?.name
+                }}
             </el-descriptions-item>
             <el-descriptions-item label="监督对象名称">
                 {{ detailData.supvObjName }}
@@ -34,7 +46,11 @@
                 }}
             </el-descriptions-item>
             <el-descriptions-item label="监督对象属性">
-                {{ detailData.objType }}
+                {{
+                    objTypeList.find(item => {
+                        return item.id == detailData.objType
+                    })?.name
+                }}
             </el-descriptions-item>
             <el-descriptions-item label="监督对象属性名称">
                 {{ detailData.objTypeName }}
@@ -43,9 +59,7 @@
                 {{ detailData.objCapacity }}
             </el-descriptions-item>
             <el-descriptions-item label="监督对象关联电站">
-                {{
+                {{ detailData.substationName }}
-                   detailData.substationName
-                }}
             </el-descriptions-item>
             <el-descriptions-item label="监督对象关联电站电压等级">
                 {{
@@ -56,13 +70,13 @@
             </el-descriptions-item>
             <el-descriptions-item label="实施状态">
                 {{
-                  detailData.effectStatus
+                    effectStatusList.find(item => {
+                        return item.id == detailData.effectStatus
+                    })?.name
                 }}
             </el-descriptions-item>
             <el-descriptions-item label="开始实施时间">
-                {{
+                {{ detailData.effectStartTime }}
-                    detailData.effectStartTime
-                }}
             </el-descriptions-item>
             <el-descriptions-item label="结束实施时间">
                 {{ detailData.effectEndTime }}
@@ -74,11 +88,19 @@
                 {{ detailData.problemOcTime }}
             </el-descriptions-item>
             <el-descriptions-item label="实施人员">
-                {{ detailData.effectUserId }}
+                {{
+                    effectUserIdList.find(item => {
+                        return item.id == detailData.effectUserId
+                    })?.name
+                }}
             </el-descriptions-item>
             <el-descriptions-item label="计划状态">
-                {{ detailData.planStatus }}
+                {{
-                </el-descriptions-item>
+                    planStatusList.find(item => {
+                        return item.id == detailData.planStatus
+                    })?.name
+                }}
+            </el-descriptions-item>
             <el-descriptions-item label="其他要求">
                 {{ detailData.otherRemark }}
             </el-descriptions-item>
@@ -130,12 +152,11 @@ import { onMounted, ref, reactive } from 'vue'
 import { useRoute } from 'vue-router'
 import { formatDate } from '@/utils/formatTime'
 import { propTypes } from '@/utils/propTypes'
-import { getTerminalDetailsById } from '@/api/supervision-boot/terminal/index'
-import { getDictTreeById } from '@/api/system-boot/dictTree'
 import { useDictData } from '@/stores/dictData'
 import { getFileNameAndFilePath } from '@/api/system-boot/file'
-import { addPlanFormData, getUserByDeptId,getPlanDetailsById} from '@/api/supervision-boot/plan/index'
+import { getUserByDeptId, getPlanDetailsById } from '@/api/supervision-boot/plan/index'
 import { Link } from '@element-plus/icons-vue'
+import { useAdminInfo } from '@/stores/adminInfo'
 
 defineOptions({ name: 'BpmUserReportDetail' })
 
@@ -148,92 +169,39 @@ const detailLoading = ref(false) // 表单的加载中
 const detailData = ref<any>({}) // 详情数据
 const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
 
-//用户状态数组
-const userStateList = reactive([
-    {
-        label: '可研',
-        value: '0'
-    },
-    {
-        label: '建设',
-        value: '1'
-    },
-    {
-        label: '运行',
-        value: '2'
-    },
-    {
-        label: '退运',
-        value: '3'
-    }
-])
 const dictData = useDictData()
-//字典获取所属地市
+//字典获取监督类型
-const areaOptionList = dictData.getBasicData('jibei_area')
+const supvTypeList = dictData.getBasicData('supv_type')
-//定义监测装置安装位置下拉框数据
+//字典获取监督阶段
-const monitoringDeviceInstallationPositionList = [
+const supvStageList = dictData.getBasicData('supv_stage')
-    {
+//字典获取实施状态
-        id: '0',
+const effectStatusList = dictData.getBasicData('effect_status')
-        name: '电网侧'
+//字典获取计划状态
-    },
+const planStatusList = dictData.getBasicData('plan_status')
+//监督对象类型
+const objTypeList = [
     {
         id: '1',
-        name: '用户侧'
+        name: '在运站'
-    }
-]
-//定义召唤标志下拉框数据
-const summonFlagList = [
-    {
-        id: '0',
-        name: '周期触发'
-    },
-    {
-        id: '1',
-        name: '变为触发'
-    }
-]
-//定义终端模型下拉框数据
-const terminalModelList = [
-    {
-        id: '0',
-        name: '虚拟设备'
-    },
-    {
-        id: '1',
-        name: '虚拟设备'
     },
     {
         id: '2',
-        name: '虚拟设备'
+        name: '新（改、扩）建站'
-    }
-]
-//定义通讯状态下拉框数据
-const communicationStatusList = [
-    {
-        id: '0',
-        name: '中断'
-    },
-    {
-        id: '1',
-        name: '正常'
     }
 ]
 //字典获取监测点电压等级
 const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
-//字典获取数据类型
+//获取登陆用户姓名和部门
-const dataTypeList = dictData.getBasicData('System_Type')
+const adminInfo = useAdminInfo()
-//字典获取终端型号
+//根据当前登陆用户的部门id查询实施人员
-const terminalTypeList = dictData.getBasicData('Dev_Type')
+const effectUserIdList= ref([])
-//字典获取电压互感器类型
+const getEffectUserList = () => {
-const voltageTransformerTypeList = dictData.getBasicData('Voltage_Transformer')
+    getUserByDeptId({ deptId: adminInfo.$state.deptId }).then(res => {
-//字典获取中性点接线方式
+        effectUserIdList.value = res.data
-const neutralPointWiringMethodList = dictData.getBasicData('Neutral_Point')
+        console.log(effectUserIdList.value, '+++++++')
-//字典获取所属前置机
+    })
-const frontEndMachineList = dictData.getBasicData('Front_Type')
+}
-//字典获取终端接线方式类型
+getEffectUserList()
-const terminalWiringMethodTypeList = dictData.getBasicData('Dev_Connect')
-//字典获取厂家
-const manufacturerList = dictData.getBasicData('Dev_Manufacturers')
 /** 获得数据 */
 const getInfo = async () => {
     detailLoading.value = true
@@ -274,7 +242,6 @@ const getFileName = async () => {
     if (detailData.value.otherAttachments) {
         await getFileNamePath(detailData.value.otherAttachments, 'otherAttachments')
     }
-
 }
 //根据文件名请求
 const getFileNamePath = async (val: any, pathName: any) => {