feat:角色权限弹窗配置页面，调整

shuishen

2026-01-27 98ff0df343bd4e5d2d5e138a02c6db2b7fa9696b

 applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue

@@ -21,9 +21,13 @@
         </div>

         <div class="right-container">
            <div class="header">{{ formTitle }}</div>
            <div class="header">
               <span>{{ formTitle }}</span>
				
               <el-icon class="close-btn" @click.stop="visible = false"><Close /></el-icon>
            </div>

            <div class="dialog-container" v-if="dialogReadonly">
            <div class="content" v-if="dialogReadonly">
               <el-row>
                  <el-col :span="24">
                     <div class="label">侦测设备</div>
@@ -31,7 +35,7 @@
                  </el-col>
                  <el-col :span="24">
                     <div class="label">设备类型</div>
                     <div class="val">{{ getDeviceTypeLabel(formData.deviceType) }}</div>
                     <div class="val">{{ getDictLabel(formData.deviceType, dictObj.deviceType) }}</div>
                  </el-col>
                  <el-col :span="24">
                     <div class="label">设备位置</div>
@@ -59,6 +63,7 @@
                     popper-class="command-select-popper"
                     v-model="formData.deviceId"
                     placeholder="请选择"
                     :disabled="dialogMode === 'edit'"
                     clearable
                     @change="handleDeviceChange"
                  >
@@ -70,6 +75,7 @@
                     class="command-select"
                     popper-class="command-select-popper"
                     v-model="formData.deviceType"
                     disabled
                     placeholder="请选择"
                     clearable
                  >
@@ -97,6 +103,7 @@
                  <el-input
                     class="command-input"
                     v-model="formData.deviceSn"
                     disabled
                     placeholder="请输入"
                     clearable
                  />
@@ -105,6 +112,7 @@
                  <el-input
                     class="command-input"
                     v-model="formData.deviceModel"
                     disabled
                     placeholder="请输入"
                     clearable
                  />
@@ -114,14 +122,15 @@
                     class="command-input"
                     v-model="formData.effectiveRangeKm"
                     :min="0"
                     :precision="2"
                     :precision="0"
                     :step="1"
                     :controls="false"
                     placeholder="请输入"
                  />
               </el-form-item>
            </el-form>
            <div class="footer">
               <el-button color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
               <el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
               <el-button
                  color="#284FE3"
                  v-if="!dialogReadonly"
@@ -139,6 +148,10 @@
</template>

<script setup>
import { getDictLabel } from '@ztzf/utils'

import { Close } from '@element-plus/icons-vue'

import { computed, inject, nextTick, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import {
@@ -148,8 +161,10 @@
} from '@/api/detectionCountermeasure/detectionRange'
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import * as Cesium from 'cesium'
import { saveOperationLog } from '@ztzf/apis'
import { useRoute } from 'vue-router'

import commandPost from '@/assets/images/dataCockpit/legend/command-post.png'
import equipment from '@/assets/images/dataCockpit/legend/equipment.png'

const initForm = () => ({
   deviceId: '', // 侦测设备ID
@@ -171,6 +186,7 @@
const deviceOptions = ref([])
const dialogReadonly = computed(() => dialogMode.value === 'view')
const mapRef = ref(null)
const route = useRoute()
let viewer
let redPointEntity
let rangeCircleEntity
@@ -212,7 +228,14 @@

function formatRange(value) {
   if (value == null || value === '') return '-'
   return `${value}`
   const normalized = normalizeRange(value)
   return normalized == null ? '-' : `${normalized}`
}

function normalizeRange(value) {
   const numeric = Number(value)
   if (!Number.isFinite(numeric)) return null
   return Math.trunc(numeric)
}

// 关闭弹框
@@ -226,13 +249,27 @@
   if (!isValid) return
   submitting.value = true
   try {
      const {longitude, latitude} = parseDeployLocation(formData.value.deployLocation)
      const normalizedRange = normalizeRange(formData.value.effectiveRangeKm)

      const payload = {
         ...formData.value,
         id: formData.value.id || formData.value.deviceId || undefined,
         effectiveRangeKmIsNotNull: formData.value.effectiveRangeKm ? 1 : 2,
         effectiveRangeKmIsNotNull: normalizedRange != null ? 1 : 2,
         effectiveRangeKm: normalizedRange,
         longitude,
         latitude
      }
      formData.value.effectiveRangeKm = normalizedRange
      delete payload.deviceId
      await detectionRangeSubmitApi(payload)

      const actionText = dialogMode.value === 'add' ? '新增' : '修改'
      saveOperationLog({
         requestUri: route.path,
         title: `${route.name || '侦测范围管理'}-${actionText}`,
         type: 1
      })

      ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
      visible.value = false
      emit('success')
@@ -253,6 +290,7 @@
      current: 1,
      size: 200,
      effectiveRangeKmIsNotNull: 2,
      isTrack: 1
   })
   const records = res?.data?.data?.records ?? []
   deviceOptions.value = records.map(item => ({
@@ -277,7 +315,7 @@
      redPointEntity = viewer.entities.add({
         position: Cesium.Cartesian3.fromDegrees(longitude, latitude),
         billboard: {
            image: commandPost, // 这里替换为你的图片路径或变量 deviceZcImg
            image: equipment, // 这里替换为你的图片路径或变量 deviceZcImg
            width: 40,
            height: 56,
            verticalOrigin: Cesium.VerticalOrigin.BOTTOM, // 设置图片底部对齐坐标点
@@ -286,7 +324,7 @@
            text: `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`,
            font: '16px',
            fillColor: Cesium.Color.WHITE,
            backgroundColor: Cesium.Color.BLACK.withAlpha(0.45),
            backgroundColor: Cesium.Color.BLACK.withAlpha(0.6),
            backgroundPadding: new Cesium.Cartesian2(5, 5),
            showBackground: true,
            style: Cesium.LabelStyle.FILL_AND_OUTLINE,
@@ -405,9 +443,18 @@
watch(
   () => formData.value.effectiveRangeKm,
   value => {
      const normalized = normalizeRange(value)
      if (value != null && normalized == null) {
         formData.value.effectiveRangeKm = null
         return
      }
      if (value != null && normalized !== value) {
         formData.value.effectiveRangeKm = normalized
         return
      }
      const parsed = parseDeployLocation(formData.value.deployLocation)
      if (!parsed) return
      updateRangeCircle(parsed.longitude, parsed.latitude, value)
      updateRangeCircle(parsed.longitude, parsed.latitude, normalized)
   }
)
</script>