applications/drone-command/src/views/areaManage/partition/FormDiaLog.vue
@@ -129,7 +129,7 @@ </div> <el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules" :disabled="readonly" label-width="96px"> label-width="116px"> <el-form-item label="区域名称" prop="areaName"> <el-input class="command-input" v-model="formData.areaName" maxlength="50" placeholder="请输入" clearable /> applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue
@@ -10,7 +10,7 @@ </el-col> <el-col :span="12"> <div class="label">设备类型</div> <div class="val">{{ formData.deviceType }}</div> <div class="val">{{ getDictLabel(formData.deviceType, dictObj.deviceType) }}</div> </el-col> <el-col :span="12"> <div class="label">设备编码</div> @@ -18,7 +18,7 @@ </el-col> <el-col :span="12"> <div class="label">设备属性</div> <div class="val">{{ formData.deviceAtt }}</div> <div class="val">{{ getDictLabel(formData.deviceAtt, dictObj.deviceAtt) }}</div> </el-col> <el-col :span="12"> <div class="label">型号</div> applications/drone-command/src/views/basicManage/deviceStock/index.vue
@@ -63,15 +63,15 @@ <div class="command-table-content command-table-content-bg"> <el-table class="command-table" :data="list" @selection-change="handleSelectionChange"> <el-table-column type="index" show-overflow-tooltip width="64" label="序号" /> <el-table-column prop="deviceName" show-overflow-tooltip width="130" label="设备名称" /> <el-table-column prop="deviceType" show-overflow-tooltip width="80" label="设备类型"> <el-table-column prop="deviceName" show-overflow-tooltip label="设备名称" /> <el-table-column prop="deviceType" show-overflow-tooltip width="100" label="设备类型"> <template v-slot="{ row }"> {{ getDictLabel(row.deviceType, dictObj.deviceType) }} </template> </el-table-column> <el-table-column prop="deviceModel" show-overflow-tooltip width="98" label="型号" /> <el-table-column prop="deviceSpecification" show-overflow-tooltip width="112" label="规格" /> <el-table-column prop="manufacturer" show-overflow-tooltip width="130" label="生产厂商" /> <el-table-column prop="deviceModel" show-overflow-tooltip width="110" label="型号" /> <el-table-column prop="deviceSpecification" show-overflow-tooltip width="142" label="规格" /> <el-table-column prop="manufacturer" show-overflow-tooltip width="140" label="生产厂商" /> <el-table-column prop="createTime" show-overflow-tooltip width="96" label="入库时间"> <template v-slot="{ row }"> {{ dayjs(row.createTime).format('YYYY-MM-DD') }} @@ -79,8 +79,8 @@ </el-table-column> <el-table-column prop="source" show-overflow-tooltip width="120" label="来源" /> <el-table-column prop="purpose" show-overflow-tooltip width="130" label="用途" /> <el-table-column prop="belongDeptName" show-overflow-tooltip label="所属部门" /> <el-table-column prop="charger" show-overflow-tooltip width="120" label="负责人" /> <el-table-column prop="belongDeptName" show-overflow-tooltip width="130" label="所属部门" /> <el-table-column prop="charger" show-overflow-tooltip width="130" label="负责人" /> <el-table-column prop="yxzt" show-overflow-tooltip width="96" label="运行状态"> <template v-slot="{ row }"> {{ getDictLabel(row.status, dictObj.deviceStatus) }} applications/drone-command/src/views/detectionCountermeasure/countermeasureEvaluation/index.vue
@@ -58,7 +58,11 @@ <el-table class="command-table" :data="list"> <el-table-column type="index" width="64" show-overflow-tooltip label="序号" /> <el-table-column prop="droneName" show-overflow-tooltip width="130" label="无人机名称" /> <el-table-column prop="droneType" show-overflow-tooltip width="130" label="无人机类型" /> <el-table-column prop="droneType" show-overflow-tooltip width="130" label="无人机类型"> <template v-slot="{ row }"> {{ getDictLabel(row.droneType, dictObj.droneType) }} </template> </el-table-column> <el-table-column prop="droneDeviceCode" show-overflow-tooltip width="140" label="设备编码" /> <el-table-column prop="findTime" show-overflow-tooltip width="156" label="发现时间" /> <el-table-column prop="counterEffect" show-overflow-tooltip width="120" label="反制效果"> @@ -181,7 +185,7 @@ // 获取字典 function getDictList() { getDictionaryByCode('deviceType,counterEffect').then(res => { getDictionaryByCode('deviceType, counterEffect, droneType').then(res => { dictObj.value = res.data.data }) }
