调整告警设置页面配置及设备新增油服编码

src/views/pms/device/IotDeviceFormAdd.vue

@@ -28,8 +28,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="t('iotDevice.yfCode')" prop="yfCode">
-              <el-input v-model="formData.yfCode" :disabled="formType==='update'" placeholder="请输入油服设备编码" />
+            <el-form-item :label="t('iotDevice.yfCode')" prop="yfDeviceCode">
+              <el-input v-model="formData.yfDeviceCode" :disabled="formType==='update'" placeholder="请输入油服设备编码" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -423,7 +423,7 @@ const formData = ref({
   deviceCode: undefined,
   deviceName: undefined,
   yfClass: undefined,
-  yfCode: undefined,
+  yfDeviceCode: undefined,
   brand: undefined,
   brandName: undefined,
   model: undefined,

src/views/pms/device/monitor/RangeSet.vue

@@ -13,8 +13,8 @@
           <ContentWrap v-if="selectedNode">
             <div style="display: flex;flex-direction: row; justify-content: space-between; vertical-align: center">
               <div style="display: flex;flex-direction: row; ">
-                <el-radio style="background-color: #f4dcaf" v-model="ifDevice" label="1" size="large" @input="handleClassifyRadio" border>分类区间</el-radio>
-                <el-radio style="background-color: #f4f3f3" v-model="ifDevice" label="2" size="large" @input="handleDeviceRadio" border>设备区间</el-radio>
+                <el-radio v-model="ifDevice" label="1" size="large" @input="handleClassifyRadio" border>分类告警区间设置</el-radio>
+                <el-radio v-model="ifDevice" label="2" size="large" @input="handleDeviceRadio" border>设备告警区间设置</el-radio>
               </div>
 <!--              <el-select-->
 <!--                style="width: 200px;"-->
@@ -115,36 +115,46 @@
                   <!-- 信息区域 -->
                   <div class="flex items-center text-[14px]">
                     <div class="flex-1">
+<!--                      <div class="mb-2.5 last:mb-0">-->
+<!--                        <span class="text-[#717c8e] mr-2.5">属性标识</span>-->
+<!--&lt;!&ndash;                        <div style="width: 300px;  padding: 0px;">&ndash;&gt;-->
+<!--                          &lt;!&ndash; 为span添加换行样式类 &ndash;&gt;-->
+<!--                          <span class="auto-wrap" style="color: dodgerblue; width: 200px">{{ item.propertyCode }}</span>-->
+<!--&lt;!&ndash;                        </div>&ndash;&gt;-->
+<!--                      </div>-->
                       <div class="mb-2.5 last:mb-0">
-                        <span class="text-[#717c8e] mr-2.5">属性标识</span>
-                        <el-tag><span class="text-[#0070ff]" style="font-size: 15px">{{ item.propertyCode }}</span></el-tag>
+                        <span class="text-[#717c8e] mr-2.5">设备名称</span>
+                          <el-tag><span class="auto-wrap" style="color: dodgerblue">{{ item.deviceName }}</span></el-tag>
                       </div>
                       <div class="mb-2.5 last:mb-0">
-                        <span class="text-[#717c8e] mr-2.5">上限数值</span>
+                        <span class="text-[#717c8e] mr-2">上限数值</span>
                         <el-input
                           v-model.number="item.maxValue"
                           type="number"
                           class="text-[#0070ff] inline-input"
+                          style="width: 80px"
                           size="small"
                           step="any"
                         :min="item.minValue !== null ? item.minValue : -Infinity"
                         />
-                      </div>
-                      <div class="mb-2.5 last:mb-0">
-                        <span class="text-[#717c8e] mr-2.5">下限数值</span>
+                        <span class="text-[#717c8e] mr-2 ml-2">下限数值</span>
                         <el-input
                           v-model.number="item.minValue"
                           type="number"
                           class="text-[#0070ff] inline-input"
+                          style="width: 80px"
                           size="small"
                           step="any"
-                        :max="item.maxValue !== null ? item.maxValue : Infinity"
+                          :max="item.maxValue !== null ? item.maxValue : Infinity"
                         />
                       </div>
+                      <div class="mb-2.5 last:mb-0">
+
+                      </div>
                     </div>
-                    <div class="w-[100px] h-[80px]">
-                      <el-image :src="defaultPicUrl" class="w-full h-full" />
-                    </div>
+<!--                    <div class="w-[100px] h-[80px]">-->
+<!--                      <el-image :src="defaultPicUrl" class="w-full h-full" />-->
+<!--                    </div>-->
                   </div>
 
                   <!-- 分隔线 -->
@@ -156,7 +166,7 @@
                       class="flex-1 !px-2 !h-[32px] text-[13px]"
                       plain
                       type="primary"
-                      @click="openForm('update', item.id)"
+                      @click="openUpdateForm('update', item)"
                     >
                       <Icon class="mr-1" icon="ep:edit-pen" />
                       编辑
@@ -284,6 +294,7 @@ const handleClear = () =>{
   selectedDeviceName.value = ''
 }
 const handleDeviceRadio = async () =>{
+  selectedDeviceName.value = ''
   //置空分类名称
   // selectedName.value = ''
   const deviceParams = {
@@ -351,7 +362,6 @@ const handleDeviceCategoryTreeNodeClick = async (row) => {
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = (type: string, id?: number) => {
-  debugger
   if (ifDevice.value === '2'&&(selectedDeviceId.value === ''||selectedDeviceId.value === null||selectedDeviceId.value === undefined)) {
     message.error('请先选择设备');
     // 触发抖动效果
@@ -365,6 +375,12 @@ const openForm = (type: string, id?: number) => {
   formRef.value.open(type, id, selectedId.value, selectedName.value, selectedDeviceId.value, selectedDeviceName.value)
 }
 
+const openUpdateForm = (type: string, item?: any) => {
+  debugger
+  selectedDeviceId.value = item.deviceId
+  selectedDeviceName.value = item.deviceName
+  formRef.value.open(type, item.id, selectedId.value, selectedName.value, selectedDeviceId.value, selectedDeviceName.value)
+}
 /** 打开详情 */
 const openDetail = (row) => {
   push({
@@ -536,4 +552,11 @@ onMounted(() => {
 :deep(.el-select__placeholder.is-transparent){
   color: #409EFF;
 }
+.auto-wrap {
+  /* 关键样式：确保文本能在容器内自动换行 */
+  white-space: normal;
+  word-break: break-all; /* 处理长单词或连续字符的换行 */
+  display: inline-block; /* 确保span能正确应用宽度约束 */
+  width: 100%; /* 让span占满父容器宽度 */
+}
 </style>

src/views/system/tree/PmsTree.vue

@@ -33,7 +33,7 @@
           <Icon
             style="vertical-align: middle;fill: currentColor;color:orange"
             v-if="node.data.type === 'device'"
-            icon="fa:folder-open"
+            icon="fa:tasks"
           />
           <Icon icon="fa:folder-open" v-if="node.data.type === 'file'" style="vertical-align: middle;color: orange;fill: currentColor;"/>
           <span style="vertical-align: middle; margin-left: 3px">{{ node.data.name }}</span>