diff --git a/.vscode/settings.json b/.vscode/settings.json
index c8ff8fc..4a23960 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -9,6 +9,7 @@
         "logdata",
         "Pids",
         "plandata",
+        "PQDIF",
         "resourcedata",
         "resourcename",
         "rmark",
diff --git a/frontend/src/views/authority/role/components/rolePopup.vue b/frontend/src/views/authority/role/components/rolePopup.vue
index 9927259..daca52d 100644
--- a/frontend/src/views/authority/role/components/rolePopup.vue
+++ b/frontend/src/views/authority/role/components/rolePopup.vue
@@ -7,22 +7,29 @@
                   ref='dialogFormRef'
                   :rules='rules'
                   >
-        <el-form-item label="名称" prop='name' :label-width="100">
-          <el-input v-model="formContent.name" placeholder="请输入名称" autocomplete="off" />
+        <el-form-item label="名称" prop='name' :label-width="100" >
+          <el-input v-model="formContent.name" placeholder="请输入名称" autocomplete="off" :disabled="rootIsEdit"/>
         </el-form-item>
 
         <el-form-item label="编码" prop='code' :label-width="100">
-          <el-input v-model="formContent.code" placeholder="请输入编码" autocomplete="off" />
+          <el-input v-model="formContent.code" placeholder="请输入编码" autocomplete="off" :disabled="rootIsEdit"/>
         </el-form-item>
+        <el-form-item label='类型'  prop='type' :label-width="100">
+          <el-select v-model="formContent.type"  clearable placeholder="请选择类型" :disabled="rootIsEdit">
+            <el-option label="普通角色" :value="2"></el-option>
+            <el-option label="管理员角色" :value="1"></el-option>     
+            <el-option label="超级管理员" :value="0" v-if="rootIsShow"></el-option>                              
+          </el-select>                           
+        </el-form-item>     
         <el-form-item label="描述" prop='remark' :label-width="100">
-          <el-input v-model="formContent.remark" :rows="2" type="textarea" placeholder="请输入备注" autocomplete="off" />
+          <el-input v-model="formContent.remark" :rows="2" type="textarea" placeholder="请输入备注" autocomplete="off" :disabled="rootIsEdit"/>
         </el-form-item>
       </el-form>
       </div>
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="close()">取消</el-button>
-        <el-button type="primary" @click="save()">
+        <el-button type="primary" @click="save()" :disabled="rootIsEdit">
           保存
         </el-button>
       </div>
@@ -43,7 +50,10 @@
   const dictStore = useDictStore()
  // 定义弹出组件元信息
  const dialogFormRef = ref()
-
+ //超级管理员有3个下拉框，其他两个
+  const rootIsShow = ref(false)
+  //超级管理员下拉框不可编辑
+  const rootIsEdit = ref(false)
  function useMetaInfo() {
     const dialogVisible = ref(false)
     const titleType = ref('add')
@@ -87,6 +97,7 @@ const resetFormContent = () => {
     name: [{ required: true, message: '名称必填！', trigger: 'blur' },
     { pattern: /^[\u4e00-\u9fa5]{1,20}$/, message: '名称为长度1-20的中文', trigger: 'blur' }],
     code: [{ required: true, message: '编码必填！', trigger: 'blur' }],
+    type: { required: true, message: '类型必选！', trigger: 'change' },
   })
 
   
@@ -124,6 +135,15 @@ const close = () => {
   const open = async (sign: string, data: Role.RoleBO) => {
     titleType.value = sign
     dialogVisible.value = true
+
+    if(data.type == 0){
+      rootIsShow.value = true
+      rootIsEdit.value = true
+    }else{
+      rootIsShow.value = false
+      rootIsEdit.value = false
+    }
+    
     if (data.id) {
       formContent.value = { ...data }
     } else {
diff --git a/frontend/src/views/authority/role/index.vue b/frontend/src/views/authority/role/index.vue
index a464fb6..face985 100644
--- a/frontend/src/views/authority/role/index.vue
+++ b/frontend/src/views/authority/role/index.vue
@@ -17,7 +17,7 @@
       <!-- 表格操作 -->
       <template #operation='scope'>
         <el-button type='primary' link :icon='EditPen' @click="openDrawer('编辑角色', scope.row)">编辑</el-button>
-        <el-button type='primary' link :icon='Delete' @click='deleteAccount(scope.row)'>删除</el-button>
+        <el-button v-if="scope.row.type !== 0 && scope.row.type !== 1" type='primary' link :icon='Delete' @click='deleteAccount(scope.row)'>删除</el-button>
         <el-button type='primary' link :icon='Share' @click="openDrawer('设置权限', scope.row)">设置权限</el-button>
       </template>
 
@@ -39,6 +39,7 @@ import RolePopup from './components/rolePopup.vue'
 import RoleResourcePopup from './components/roleResourcePopup.vue'
 import { onMounted, reactive, ref } from 'vue'
 import {useDictStore} from '@/stores/modules/dict'
+import { fa } from 'element-plus/es/locale/index.mjs'
 const rolePopup = ref()
 const roleResourcePopup = ref()
 const dictStore = useDictStore()
@@ -65,8 +66,20 @@ const getTableList = (params: any) => {
 
 // 表格配置项
 const columns = reactive<ColumnProps<Role.RoleBO>[]>([
-  { type: 'selection', fixed: 'left', width: 70 },
-  { type: 'index', fixed: 'left', width: 70, label: '序号' },
+  { 
+    type: 'selection', 
+    fixed: 'left', 
+    width: 70, 
+    selectable(row, index) {
+      return ![0, 1].includes(row.type);//类型是0-超级管理员，1-管理员，不可选择
+    },
+  },
+  { 
+    type: 'index', 
+    fixed: 'left', 
+    width: 70, 
+    label: '序号' 
+  },
   {
     prop: 'name',
     label: '名称',
@@ -94,7 +107,12 @@ const columns = reactive<ColumnProps<Role.RoleBO>[]>([
         )
       },
   },
-  { prop: 'operation', label: '操作', fixed: 'right', width: 250 },
+  { prop: 'operation', 
+    label: '操作', 
+    fixed: 'right', 
+    width: 250,
+    
+  }
 ])
 
 // 删除角色信息
diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue
index 8f5a43f..96dd8ff 100644
--- a/frontend/src/views/machine/device/components/devicePopup.vue
+++ b/frontend/src/views/machine/device/components/devicePopup.vue
@@ -1,10 +1,10 @@
 <template>
-<<<<<<< HEAD
     <el-dialog  :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig">
         <el-tabs type="border-card">
             <el-tab-pane label="设备台账信息">
                 <div class="form-grid">
                     <el-form :model='formContent' ref='dialogFormRef' :rules='rules' :disabled="false">
+                        <el-divider >设备信息</el-divider>
                         <el-row  :gutter="24" >
                             <el-col :span="8">
                                 <el-form-item label="设备名称" prop="name" :label-width="100">
@@ -18,25 +18,62 @@
                                     v-for="item in dictStore.getDictData('Dev_Type')"
                                     :key="item.id"
                                     :label="item.name"
-                                    :value="item.code"
+                                    :value="item.id"
                                     />
                                 </el-select>
                                 </el-form-item>           
                             </el-col>
                             <el-col :span="8">
-                                <el-form-item label='通讯协议'  prop='protocol' :label-width="100">
-                                    <el-select v-model="formContent.protocol"  clearable placeholder="请选择通讯协议">
-                                    <el-option
-                                    v-for="item in dictStore.getDictData('Event_Type')"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.code"
-                                    />
-                                </el-select>
-                                </el-form-item>         
+                                <el-form-item label='设备模式'  prop='pattern' :label-width="100">
+                                    <el-input v-model='formContent.pattern' disabled/>
+                                </el-form-item>           
                             </el-col>
                             
                         </el-row>     
+                          
+                        <el-row  :gutter="24" >
+                            <el-col :span="8">
+                                <el-form-item label='生产厂商'  prop='manufacturer' :label-width="100">
+                                    <el-select v-model="formContent.manufacturer"  clearable placeholder="请选择生产厂商">
+                                    <el-option
+                                    v-for="item in dictStore.getDictData('Dev_Manufacturers')"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id"
+                                    />
+                                </el-select>
+                                </el-form-item>           
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="生产日期" prop="createDate" :label-width="100">
+                                    <el-date-picker 
+                                        v-model="formContent.createDate" 
+                                        placeholder="请选择生产日期"
+                                        :disabled-date="disabledDate"
+                                        />
+                                
+                                </el-form-item>           
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="出厂编号" prop="createId" placeholder="请输入出厂编号" :label-width="100">
+                                    <el-input v-model="formContent.createId" />
+                                </el-form-item>            
+                            </el-col>
+                        </el-row>
+                        <el-row  :gutter="24" >
+                            <el-col :span="8">
+                                <el-form-item label="固件版本" prop="hardwareVersion" :label-width="100">
+                                    <el-input v-model="formContent.hardwareVersion" placeholder="请输入固件版本"/>
+                                </el-form-item>            
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="软件版本" prop="softwareVersion" :label-width="100">
+                                    <el-input v-model="formContent.softwareVersion" placeholder="请输入软件版本"/>
+                                </el-form-item>            
+                            </el-col>
+                            
+                        </el-row>   
+                        <el-divider >参数信息</el-divider>
                         <el-row  :gutter="24" >
                             <el-col :span="8">
                                 <el-form-item label="设备通道数" prop="devChns" :label-width="100">
@@ -74,55 +111,20 @@
                                 </el-select>
                                 </el-form-item>            
                             </el-col>
-                            
-                        </el-row>     
-                        <el-row  :gutter="24" >
-                            <el-col :span="8">
-                                <el-form-item label='生产厂商'  prop='manufacturer' :label-width="100">
-                                    <el-select v-model="formContent.manufacturer"  clearable placeholder="请选择生产厂商">
-                                    <el-option
-                                    v-for="item in dictStore.getDictData('Dev_Manufacturers')"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.code"
-                                    />
-                                </el-select>
-                                </el-form-item>           
-                            </el-col>
-                            <el-col :span="8">
-                                <el-form-item label="生产日期" prop="createDate" :label-width="100">
-                                    <el-date-picker 
-                                        v-model="formContent.createDate" 
-                                        placeholder="请选择生产日期"
-                                        :disabled-date="disabledDate"
-                                        />
-                                
-                                </el-form-item>           
-                            </el-col>
-                            <el-col :span="8">
-                                <el-form-item label="出厂编号" prop="createId" placeholder="请输入出厂编号" :label-width="100">
-                                    <el-input v-model="formContent.createId" />
-                                </el-form-item>            
-                            </el-col>
-                        </el-row>
-                        <el-row  :gutter="24" >
-                            <el-col :span="8">
-                                <el-form-item label="固件版本" prop="hardwareVersion" :label-width="100">
-                                    <el-input v-model="formContent.hardwareVersion" placeholder="请输入固件版本"/>
-                                </el-form-item>            
-                            </el-col>
-                            <el-col :span="8">
-                                <el-form-item label="软件版本" prop="softwareVersion" :label-width="100">
-                                    <el-input v-model="formContent.softwareVersion" placeholder="请输入软件版本"/>
-                                </el-form-item>            
-                            </el-col>
-                            <el-col :span="8">
-                                <el-form-item label='设备模式'  prop='pattern' :label-width="100">
-                                    <el-input v-model='formContent.pattern' disabled/>
-                                </el-form-item>           
-                            </el-col>
                         </el-row> 
                         <el-row  :gutter="24" >
+                            <el-col :span="8">
+                                <el-form-item label='通讯协议'  prop='protocol' :label-width="100">
+                                    <el-select v-model="formContent.protocol"  clearable placeholder="请选择通讯协议" @change="handleEncryptionChange">
+                                        <el-option
+                                            v-for="item in dictStore.getDictData('Protocol')"
+                                            :key="item.id"
+                                            :label="item.name"
+                                            :value="item.id"
+                                            />
+                                    </el-select>
+                                </el-form-item>         
+                            </el-col>
                             <el-col :span="8">
                                 <el-form-item label="IP地址" prop="ip" :label-width="100">
                                     <IPAddress v-model:value="formContent.ip"/>
@@ -133,8 +135,9 @@
                                     <el-input v-model="formContent.port" />
                                 </el-form-item>            
                             </el-col>
+                            
                         </el-row>       
-                      
+                       
                         <el-row  :gutter="24" >
                         <el-col :span="8">
                                 <el-form-item label='是否加密'  prop='encryptionFlag' :label-width="100">
@@ -265,7 +268,7 @@ const disabledDate = (time: Date) => {
       createId: '', 
       hardwareVersion: '',
       softwareVersion: '',
-      protocol: '',
+      protocol: 'MMS',
       ip: '',
       port: 102,
       encryptionFlag: 1,
@@ -291,7 +294,7 @@ const disabledDate = (time: Date) => {
         createId: '', 
         hardwareVersion: '',
         softwareVersion: '',
-        protocol: '',
+        protocol: 'MMS',
         ip: '',
         port: 102,
         encryptionFlag: 1,
@@ -340,6 +343,7 @@ const disabledDate = (time: Date) => {
     resetFormContent()
     // 重置表单
     dialogFormRef.value?.resetFields()
+    
   }
   
   // 保存数据
@@ -405,6 +409,7 @@ const open = (sign: string, data: Device.ResPqDev) => {
 }
   const handleEncryptionChange = (value: number) => {
     // 根据是否加密来显示或隐藏识别码和密钥
+
     if(value === 1){
         IsPasswordShow.value = true
         rules.value.series = [
diff --git a/frontend/src/views/machine/device/index.vue b/frontend/src/views/machine/device/index.vue
index 2fba865..f2c29e3 100644
--- a/frontend/src/views/machine/device/index.vue
+++ b/frontend/src/views/machine/device/index.vue
@@ -18,7 +18,7 @@
       </template>
       <!-- 表格操作 -->
       <template #operation='scope'>
-        <el-button type='primary' link :icon='EditPen' @click="openDialog('edit', scope.row)">编辑</el-button>
+        <el-button type='primary' link :icon='EditPen' :model-value="false" @click="openDialog('edit', scope.row)">编辑</el-button>
         <el-button type='primary' link :icon='Delete' @click='handleDelete(scope.row)'>删除</el-button>
       </template>
 
@@ -63,16 +63,16 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
   { type: 'index', fixed: 'left', width: 70, label: '序号' },
   {
     prop: 'name',
-    label: '名称',
+    label: '设备名称',
     search: { el: 'input' },
     minWidth: 200,
   },
   {
     prop: 'devType',
-    label: '类型',
-    enum: dictStore.getDictData('Dev_Type'),
-    fieldNames: { label: 'name', value: 'code' },
+    label: '设备类型',
     minWidth: 200,
+    enum: dictStore.getDictData('Dev_Type'),
+    fieldNames: { label: 'name', value: 'id' },
   },
   {
     prop: 'createDate',
@@ -115,7 +115,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
     label: '生产厂商',
     enum: dictStore.getDictData('Dev_Manufacturers'),
     search: { el: 'select', props: { filterable: true }, order: 1 },
-    fieldNames: { label: 'name', value: 'code' },
+    fieldNames: { label: 'name', value: 'id' },
     minWidth: 200,
   },
   { prop: 'operation', label: '操作', fixed: 'right', width: 200 },
diff --git a/frontend/src/views/system/dictionary/dictTree/index.vue b/frontend/src/views/system/dictionary/dictTree/index.vue
index 66a795a..0f44db7 100644
--- a/frontend/src/views/system/dictionary/dictTree/index.vue
+++ b/frontend/src/views/system/dictionary/dictTree/index.vue
@@ -5,6 +5,7 @@
           :columns='columns'
           :request-api='getDictTreeList'
           :pagination="false"
+          
       >
         <template #tableHeader>
           <el-button type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
@@ -43,6 +44,8 @@
     {
       prop: 'name',
       label: '字典名称',
+      align:'left',
+      headerAlign: 'center',
     },
     {
       prop: 'code',
@@ -93,6 +96,7 @@
     proTable.value?.getTableList()
   }
   
+
   
   </script>
   
\ No newline at end of file