From 49db92864c08bbc6289c6ff33cec08a4aa187acc Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Thu, 30 Nov 2023 11:40:33 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BD=8D=E7=BD=AEbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/model/device/index.vue      | 2 +-
 src/views/model/heatapiconf/index.vue | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/model/device/index.vue b/src/views/model/device/index.vue
index 9ddef8e..67e0678 100644
--- a/src/views/model/device/index.vue
+++ b/src/views/model/device/index.vue
@@ -90,7 +90,7 @@
               </el-form-item>
             </el-col> -->
             <el-col :span="4" v-show="collapseVisible">
-              <el-form-item label="是否告警" prop="alertEnabled"> label-width="auto"
+              <el-form-item label="是否告警" prop="alertEnabled" label-width="auto">
                 <el-select v-model="queryParams.alertEnabled" placeholder="请选择设备类型" clearable>
                   <el-option v-for="dict in alertEnabled" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
diff --git a/src/views/model/heatapiconf/index.vue b/src/views/model/heatapiconf/index.vue
index 2dcf79f..f127bd5 100644
--- a/src/views/model/heatapiconf/index.vue
+++ b/src/views/model/heatapiconf/index.vue
@@ -410,7 +410,6 @@ function handleNodeClick(data) {
   disabled.value = data.isLeaf
   treeSelected.value = data.id;
   handleQuery();
-  handleQuery();
 }
 
 // /** 节点单击事件 */

From 5b5fb4409ab2981342575d13e6bfcfa901cf2402 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Wed, 6 Dec 2023 09:18:29 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=B8=BB=E9=94=AE=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/model/device/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/model/device/index.vue b/src/views/model/device/index.vue
index 67e0678..44fdde1 100644
--- a/src/views/model/device/index.vue
+++ b/src/views/model/device/index.vue
@@ -228,13 +228,13 @@
       <el-form ref="deviceRef" :model="form" :rules="rules" label-width="125px">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="中台设备编码" prop="centerDeviceCode">
-              <el-input :disabled="disabledDeviceCode" v-model="form.centerDeviceCode" placeholder="请输入中台设备编码" />
+            <el-form-item label="设备编码" prop="centerDeviceCode">
+              <el-input :disabled="disabledDeviceCode" v-model="form.centerDeviceCode" placeholder="请输入设备编码" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="主键" prop="uuid">
-              <el-input v-model="form.uuid" placeholder="请输入主键" />
+            <el-form-item label="设备uuid" prop="uuid">
+              <el-input v-model="form.uuid" placeholder="请输入设备uuid" />
             </el-form-item>
           </el-col>
           <el-col :span="12">

From b138efcab3bb359464de02ac366e1ad23a4d9ddd Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Thu, 7 Dec 2023 11:56:50 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=87=8C=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=8D=95=E4=BD=8D=E6=8D=A2=E6=88=90=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/model/params/index.vue | 39 ++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/views/model/params/index.vue b/src/views/model/params/index.vue
index d136e83..6948e41 100644
--- a/src/views/model/params/index.vue
+++ b/src/views/model/params/index.vue
@@ -57,10 +57,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="4" v-show="collapseVisible">
-          <el-form-item label="参数单位" prop="contrlType" label-width="auto">
-            <el-select v-model="queryParams.contrlType" placeholder="请选择参数单位" clearable>
+          <el-form-item label="控制类型" prop="contrlType" label-width="auto">
+            <el-select v-model="queryParams.contrlType" placeholder="请选择控制类型" clearable>
               <el-option
-                v-for="dict in dc_param_uint_type"
+                v-for="dict in dc_param_control_type"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value"
@@ -197,11 +197,11 @@
           <dict-tag :options="enabledTable" :value="scope.row.enabled"/>
         </template>
       </el-table-column>
-      <el-table-column label="参数单位" align="center" prop="contrlType" column-key="contrlType" filter-placement="bottom-end"
+      <el-table-column label="控制类型" align="center" prop="contrlType" column-key="contrlType" filter-placement="bottom-end"
         :filters="getfilterNameItem('contrlType')" :filter-method="filterMethod" :width="120" sortable
         >
         <template #default="scope">
-          <dict-tag :options="dc_param_uint_type" :value="scope.row.contrlType" :default-value="'Unknown'"/>
+          <dict-tag :options="dc_param_control_type" :value="scope.row.contrlType" :default-value="'Unknown'"/>
         </template>
       </el-table-column>
       <el-table-column label="设置值" align="center" prop="setDefautvalue" :width="120" sortable/>
@@ -294,10 +294,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="参数单位" prop="contrlType">
-            <el-select v-model="form.contrlType" placeholder="请选择参数单位">
+          <el-form-item label="控制类型" prop="contrlType">
+            <el-select v-model="form.contrlType" placeholder="请选择控制类型">
               <el-option
-                v-for="dict in dc_param_uint_type"
+                v-for="dict in dc_param_control_type"
                 :key="dict.value"
                 :label="dict.label"
                 :value="dict.value">
@@ -392,7 +392,7 @@ import lock from "@/assets/icons/svg/lock.svg";
 import { ElMessageBox } from 'element-plus';
 const { proxy } = getCurrentInstance();
 const router = useRouter();
-const { dc_param_uint_type, dc_param_value_type, dc_device_partion } = proxy.useDict('dc_param_uint_type', 'dc_param_value_type', 'dc_device_partion');
+const { dc_param_control_type, dc_param_value_type, dc_device_partion } = proxy.useDict('dc_param_control_type', 'dc_param_value_type', 'dc_device_partion');
 const paramsList = ref([]);
 const open = ref(false);
 const loading = ref(true);
@@ -834,7 +834,7 @@ function getfilterNameItem(value){
       });
     }
   }else if(value==='contrlFlag'){
-    if(sortItemMap.value[value]?.length>0 && sortItemMap.value[value].value != undefined && sortItemMap.value[value].value != null){
+    if(sortItemMap.value[value]?.length>0){
       result = sortItemMap.value[value].map(element=>{
         contrlFlag.value.forEach(item=>{
           if(item.value===element.text){
@@ -862,10 +862,11 @@ function getfilterNameItem(value){
       });
     }
   }else if(value==='paramModelId'){
-    if(sortItemMap.value[value]?.length>0 && sortItemMap.value[value].value != undefined && sortItemMap.value[value].value != null){
+    if(sortItemMap.value[value]?.length>0){
       result = sortItemMap.value[value].map(element=>{
+        let textValue = getParamModelName(element.value);
         return {
-          text: getParamModelName(element.value),
+          text: textValue,
           value: element.value,
         };
       });
@@ -883,6 +884,20 @@ function getfilterNameItem(value){
           value: element.value,
         };
       });
+    } 
+  }else if(value==='contrlType'){
+    if(sortItemMap.value[value]?.length>0){
+      result = sortItemMap.value[value].map(element=>{
+        dc_param_control_type.value.forEach(item=>{
+          if(item.value===String(element.text)){
+            resultItem = item.label;
+          }
+        });
+        return {
+          text: resultItem,
+          value: element.value,
+        };
+      });
     }
   }else{
     result = sortItemMap.value[value];

From b049227c0573780d8f598959b18ae3d9843dc305 Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Fri, 8 Dec 2023 17:59:13 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E6=A1=86=E5=8F=AF=E6=8B=96=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImageUpload/index.vue                | 1 +
 src/components/Process/panel/executionListener.vue  | 2 +-
 src/components/Process/panel/multiInstance.vue      | 2 +-
 src/components/Process/panel/taskListener.vue       | 2 +-
 src/components/Process/panel/taskPanel.vue          | 3 +++
 src/components/RightToolbar/index.vue               | 2 +-
 src/views/bi/index.vue                              | 2 +-
 src/views/flowable/definition/index.vue             | 6 +++---
 src/views/flowable/expression/index.vue             | 2 +-
 src/views/flowable/listener/index.vue               | 2 +-
 src/views/flowable/params/index.vue                 | 2 +-
 src/views/flowable/task/flowForm/index.vue          | 2 +-
 src/views/flowable/task/form/index.vue              | 4 ++--
 src/views/flowable/task/myProcess/index.vue         | 2 +-
 src/views/flowable/task/myProcess/send/index.vue    | 2 +-
 src/views/flowable/task/todo/detail/index.vue       | 6 +++---
 src/views/index1.vue                                | 2 +-
 src/views/model/alert/addalertconfig.vue            | 2 +-
 src/views/model/alert/deviceparamalert.vue          | 4 ++--
 src/views/model/alert/index.vue                     | 2 +-
 src/views/model/alert/logicconfig.vue               | 2 +-
 src/views/model/alert/method.vue                    | 2 +-
 src/views/model/alert/model.vue                     | 2 +-
 src/views/model/alert/noalertparams.vue             | 2 +-
 src/views/model/alert/policy.vue                    | 2 +-
 src/views/model/device/index.vue                    | 2 +-
 src/views/model/devicemodel/addmodel.vue            | 2 +-
 src/views/model/devicemodel/editModel.vue           | 2 +-
 src/views/model/devicemodel/index.vue               | 2 +-
 src/views/model/devicemodel/modelparams.vue         | 2 +-
 src/views/model/heatapiconf/heatMainOperatorLog.vue | 2 +-
 src/views/model/heatapiconf/heatSendLog.vue         | 2 +-
 src/views/model/heatapiconf/heatSubOperatorLog.vue  | 2 +-
 src/views/model/heatapiconf/index.vue               | 2 +-
 src/views/model/heatapiconf/paramModel.vue          | 2 +-
 src/views/model/modelType/index.vue                 | 2 +-
 src/views/model/modelparamrela/index.vue            | 2 +-
 src/views/model/paramclass/index.vue                | 2 +-
 src/views/model/params/index.vue                    | 2 +-
 src/views/monitor/job/index.vue                     | 6 +++---
 src/views/system/dept/index.vue                     | 2 +-
 src/views/system/dict/index.vue                     | 2 +-
 src/views/system/menu/index.vue                     | 2 +-
 src/views/system/notice/index.vue                   | 2 +-
 src/views/system/post/index.vue                     | 2 +-
 src/views/system/role/index.vue                     | 4 ++--
 src/views/system/role/selectUser.vue                | 2 +-
 src/views/system/user/index.vue                     | 4 ++--
 src/views/system/user/profile/userAvatar.vue        | 2 +-
 src/views/tool/gen/importTable.vue                  | 2 +-
 src/views/tool/gen/index.vue                        | 2 +-
 src/views/transerver/kingcodetransform/index.vue    | 2 +-
 src/views/transerver/viewConfig/index.vue           | 2 +-
 53 files changed, 65 insertions(+), 61 deletions(-)

diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 55dafb8..0ba59e1 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -36,6 +36,7 @@
       title="预览"
       width="800px"
       append-to-body
+      :draggable="true"
     >
       <img
         :src="dialogImageUrl"
diff --git a/src/components/Process/panel/executionListener.vue b/src/components/Process/panel/executionListener.vue
index 3761609..749cc39 100644
--- a/src/components/Process/panel/executionListener.vue
+++ b/src/components/Process/panel/executionListener.vue
@@ -124,7 +124,7 @@
     </el-drawer>
 
     <!-- 注入西段 编辑/创建 部分 -->
-    <el-dialog title="字段配置" v-model="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close>
+    <el-dialog title="字段配置" v-model="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close :draggable="true">
       <el-form :model="listenerFieldForm" label-width="96px" ref="listenerFieldFormRef" style="height: 136px" @submit.native.prevent>
         <el-form-item label="字段名称：" prop="name" :rules="{ required: true, trigger: ['blur', 'change'] }">
           <el-input v-model="listenerFieldForm.name" clearable />
diff --git a/src/components/Process/panel/multiInstance.vue b/src/components/Process/panel/multiInstance.vue
index 8b81351..28ff0c0 100644
--- a/src/components/Process/panel/multiInstance.vue
+++ b/src/components/Process/panel/multiInstance.vue
@@ -45,7 +45,7 @@
   </div>
 
   <!-- 参数说明 -->
-  <el-dialog  title="多实例参数" v-model="dialogVisible" width="680px" @closed="$emit('close')">
+  <el-dialog  title="多实例参数" v-model="dialogVisible" width="680px" @closed="$emit('close')" :draggable="true">
     <el-descriptions :column="1" border>
       <el-descriptions-item label="使用说明">按照BPMN2.0规范的要求，用于为每个实例创建执行的父执行，会提供下列变量:</el-descriptions-item>
       <el-descriptions-item label="collection(集合变量)">传入List参数, 一般为用户ID集合</el-descriptions-item>
diff --git a/src/components/Process/panel/taskListener.vue b/src/components/Process/panel/taskListener.vue
index 549c0b3..f123d21 100644
--- a/src/components/Process/panel/taskListener.vue
+++ b/src/components/Process/panel/taskListener.vue
@@ -184,7 +184,7 @@
     </el-drawer>
 
     <!-- 注入西段 编辑/创建 部分 -->
-    <el-dialog title="字段配置" v-model="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close>
+    <el-dialog title="字段配置" v-model="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close :draggable="true">
       <el-form :model="listenerFieldForm"  label-width="96px" ref="listenerFieldFormRef" style="height: 136px" @submit.native.prevent>
         <el-form-item label="字段名称：" prop="name" :rules="{ required: true, trigger: ['blur', 'change'] }">
           <el-input v-model="listenerFieldForm.name" clearable />
diff --git a/src/components/Process/panel/taskPanel.vue b/src/components/Process/panel/taskPanel.vue
index e49e169..68244d4 100644
--- a/src/components/Process/panel/taskPanel.vue
+++ b/src/components/Process/panel/taskPanel.vue
@@ -71,6 +71,7 @@
       width="60%"
       :close-on-press-escape="false"
       :show-close="false"
+      :draggable="true"
   >
     <flow-user v-if="userVisible" :checkType="checkType" :selectValues="selectData.assignee || selectData.candidateUsers" @handleUserSelect="userSelect"></flow-user>
     <template #footer>
@@ -88,6 +89,7 @@
       width="60%"
       :close-on-press-escape="false"
       :show-close="false"
+      :draggable="true"
   >
     <flow-role v-if="roleVisible" :selectValues="selectData.candidateGroups" @handleRoleSelect="roleSelect"></flow-role>
     <template #footer>
@@ -105,6 +107,7 @@
       width="60%"
       :close-on-press-escape="false"
       :show-close="false"
+      :draggable="true"
   >
     <flow-exp v-if="expVisible" :selectValues="selectData.exp" @handleSingleExpSelect="expSelect"></flow-exp>
     <template #footer>
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index becb12c..280e7ce 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -11,7 +11,7 @@
         <el-button circle icon="Menu" @click="showColumn()" />
       </el-tooltip>
     </el-row>
-    <el-dialog :title="title" v-model="open" append-to-body>
+    <el-dialog :title="title" v-model="open" append-to-body :draggable="true">
       <el-transfer
         :titles="['显示', '隐藏']"
         v-model="value"
diff --git a/src/views/bi/index.vue b/src/views/bi/index.vue
index 83929aa..3096387 100644
--- a/src/views/bi/index.vue
+++ b/src/views/bi/index.vue
@@ -130,7 +130,7 @@
           </div>
         </div>
       </div>
-      <el-dialog v-model="show" title="显示项" draggable width="600">
+      <el-dialog v-model="show" title="显示项" draggable width="600" draggable>
         <div class="dialog-box">
           <el-tree :data="headerListDialog" ref="tree" show-checkbox node-key="id" draggable :props="defaultProps"
             @node-drop="nodeDrop"  :allow-drag="allowDrag" :allow-drop="allowDrop" @check="check" :default-checked-keys="defaultCheckedKeys">
diff --git a/src/views/flowable/definition/index.vue b/src/views/flowable/definition/index.vue
index b5f4f38..69a06e9 100644
--- a/src/views/flowable/definition/index.vue
+++ b/src/views/flowable/definition/index.vue
@@ -94,19 +94,19 @@
       @pagination="getList"
     />
     <!-- 流程图 -->
-    <el-dialog :title="readImage.title" v-model="readImage.open" width="70%" append-to-body>
+    <el-dialog :title="readImage.title" v-model="readImage.open" width="70%" append-to-body draggable>
       <bpmn-viewer :flowData="flowData"/>
     </el-dialog>
 
     <!--表单配置详情-->
-    <el-dialog :title="formTitle" v-model="formConfOpen" width="50%" append-to-body>
+    <el-dialog :title="formTitle" v-model="formConfOpen" width="50%" append-to-body draggable>
       <div class="test-form">
         <v-form-render :form-data="formData" ref="vFormRef"/>
       </div>
     </el-dialog>
 
     <!--挂载表单-->
-    <el-dialog :title="formDeployTitle" v-model="formDeployOpen" width="60%" append-to-body>
+    <el-dialog :title="formDeployTitle" v-model="formDeployOpen" width="60%" append-to-body draggable>
       <el-row :gutter="24">
         <el-col :span="10" :xs="24">
           <el-table
diff --git a/src/views/flowable/expression/index.vue b/src/views/flowable/expression/index.vue
index 2ce2948..89f3a1d 100644
--- a/src/views/flowable/expression/index.vue
+++ b/src/views/flowable/expression/index.vue
@@ -76,7 +76,7 @@
     />
 
     <!-- 添加或修改流程达式对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
       <el-form ref="expressionRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入表达式名称" />
diff --git a/src/views/flowable/listener/index.vue b/src/views/flowable/listener/index.vue
index 4f5ac58..3313fda 100644
--- a/src/views/flowable/listener/index.vue
+++ b/src/views/flowable/listener/index.vue
@@ -85,7 +85,7 @@
     />
 
     <!-- 添加或修改流程监听对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
       <el-form ref="listenerRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入名称" />
diff --git a/src/views/flowable/params/index.vue b/src/views/flowable/params/index.vue
index b166d04..0550d70 100644
--- a/src/views/flowable/params/index.vue
+++ b/src/views/flowable/params/index.vue
@@ -199,7 +199,7 @@
     />
 
     <!-- 添加或修改设备参数明细对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
       <el-form ref="paramsRef" :model="form" :rules="rules" label-width="80px">
     
 <el-row>  
diff --git a/src/views/flowable/task/flowForm/index.vue b/src/views/flowable/task/flowForm/index.vue
index b507fe7..7a8a02f 100644
--- a/src/views/flowable/task/flowForm/index.vue
+++ b/src/views/flowable/task/flowForm/index.vue
@@ -8,7 +8,7 @@
   </v-form-designer>
 
   <!--系统表单信息-->
-  <el-dialog :title="formTitle" v-model="formOpen" width="500px" append-to-body>
+  <el-dialog :title="formTitle" v-model="formOpen" width="500px" append-to-body draggable>
     <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
       <el-form-item label="表单名称" prop="formName">
         <el-input v-model="form.formName" placeholder="请输入表单名称" />
diff --git a/src/views/flowable/task/form/index.vue b/src/views/flowable/task/form/index.vue
index e75741d..ab48796 100644
--- a/src/views/flowable/task/form/index.vue
+++ b/src/views/flowable/task/form/index.vue
@@ -76,7 +76,7 @@
     />
 
     <!-- 添加或修改流程单对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
       <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="表单名称" prop="formName">
           <el-input v-model="form.formName" placeholder="请输入表单名称" />
@@ -97,7 +97,7 @@
     </el-dialog>
 
     <!-- 表单详情 -->
-    <el-dialog :title="formTitle" v-model="formRenderOpen" width="60%" append-to-body>
+    <el-dialog :title="formTitle" v-model="formRenderOpen" width="60%" append-to-body draggable>
       <v-form-render :form-data="formData" ref="vFormRef"/>
     </el-dialog>
 
diff --git a/src/views/flowable/task/myProcess/index.vue b/src/views/flowable/task/myProcess/index.vue
index a30b1d4..2ab5333 100644
--- a/src/views/flowable/task/myProcess/index.vue
+++ b/src/views/flowable/task/myProcess/index.vue
@@ -79,7 +79,7 @@
     />
 
     <!-- 发起流程 -->
-    <el-dialog :title="title" v-model="open" width="60%" append-to-body>
+    <el-dialog :title="title" v-model="open" width="60%" append-to-body draggable>
       <el-form :model="queryProcessParams" ref="queryProcessForm" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="名称" prop="name">
           <el-input
diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue
index 028e9c1..1517fda 100644
--- a/src/views/flowable/task/myProcess/send/index.vue
+++ b/src/views/flowable/task/myProcess/send/index.vue
@@ -25,7 +25,7 @@
         </el-tab-pane>
       </el-tabs>
       <!--选择流程接收人-->
-      <el-dialog :title="taskTitle" v-model="taskOpen" width="65%" append-to-body>
+      <el-dialog :title="taskTitle" v-model="taskOpen" width="65%" append-to-body draggable>
         <flow-user v-if="checkSendUser" :checkType="checkType"  @handleUserSelect="userSelect"/>
         <flow-role v-if="checkSendRole" @handleRoleSelect="roleSelect"/>
         <template #footer>
diff --git a/src/views/flowable/task/todo/detail/index.vue b/src/views/flowable/task/todo/detail/index.vue
index 33f58a2..de07c2f 100644
--- a/src/views/flowable/task/todo/detail/index.vue
+++ b/src/views/flowable/task/todo/detail/index.vue
@@ -110,7 +110,7 @@
       </el-tabs>
 
       <!--审批任务-->
-      <el-dialog :title="completeTitle" v-model="completeOpen" width="60%" append-to-body>
+      <el-dialog :title="completeTitle" v-model="completeOpen" width="60%" append-to-body draggable>
         <el-form ref="taskFormRef" :model="taskForm">
           <el-form-item prop="targetKey">
             <flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="userSelect"></flow-user>
@@ -130,7 +130,7 @@
       </el-dialog>
 
       <!--退回流程-->
-      <el-dialog :title="returnTitle" v-model="returnOpen" width="40%" append-to-body>
+      <el-dialog :title="returnTitle" v-model="returnOpen" width="40%" append-to-body draggable>
         <el-form ref="taskFormRef" :model="taskForm" label-width="80px">
           <el-form-item label="退回节点" prop="targetKey">
             <el-radio-group v-model="taskForm.targetKey">
@@ -156,7 +156,7 @@
       </el-dialog>
 
       <!--驳回流程-->
-      <el-dialog :title="rejectTitle" v-model="rejectOpen" width="40%" append-to-body>
+      <el-dialog :title="rejectTitle" v-model="rejectOpen" width="40%" append-to-body draggable>
         <el-form ref="taskFormRef" :model="taskForm" label-width="80px">
           <el-form-item label="驳回意见" prop="comment"
                         :rules="[{ required: true, message: '请输入意见', trigger: 'blur' }]">
diff --git a/src/views/index1.vue b/src/views/index1.vue
index 52bbe83..c11f592 100644
--- a/src/views/index1.vue
+++ b/src/views/index1.vue
@@ -130,7 +130,7 @@
         </div>
       </div>
     </div>
-    <el-dialog v-model="show" title="显示项" draggable width="600">
+    <el-dialog v-model="show" title="显示项" draggable width="600" draggable>
       <div class="dialog-box">
         <el-tree :data="headerListDialog" ref="tree" show-checkbox node-key="id" draggable :props="defaultProps"
           @node-drop="nodeDrop"  :allow-drag="allowDrag" :allow-drop="allowDrop" @check="check" :default-checked-keys="defaultCheckedKeys">
diff --git a/src/views/model/alert/addalertconfig.vue b/src/views/model/alert/addalertconfig.vue
index 2c0ac23..9015fd2 100644
--- a/src/views/model/alert/addalertconfig.vue
+++ b/src/views/model/alert/addalertconfig.vue
@@ -39,7 +39,7 @@
           <el-button type="primary" v-if="nextStepButtonShow" @click="nextStep" style="display: inline-block !important">下一步</el-button>
         </el-form-item>
       </el-form>
-      <el-dialog :title="title" v-model="addParamModelShow" width="800px" append-to-body :dc_device_partion="dc_device_partion" :dc_class_type="dc_class_type">
+      <el-dialog :title="title" v-model="addParamModelShow" width="800px" append-to-body :dc_device_partion="dc_device_partion" :dc_class_type="dc_class_type" draggable>
         
       </el-dialog> 
     </div>
diff --git a/src/views/model/alert/deviceparamalert.vue b/src/views/model/alert/deviceparamalert.vue
index baec9bf..c5e5812 100644
--- a/src/views/model/alert/deviceparamalert.vue
+++ b/src/views/model/alert/deviceparamalert.vue
@@ -150,7 +150,7 @@
     </el-form>
 
     <!-- 添加或修改设备告警对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
       <el-form ref="alertRef" :model="form" :rules="rules" label-width="80px">
         <el-row>  
           <el-col :span="12">
@@ -204,7 +204,7 @@
       </template>
     </el-dialog>
     <!-- 添加或修改参数值状态策略对话框 -->
-    <el-dialog :title="titlePolicy" v-model="openPolicy" :width="dialogWidth" append-to-body>
+    <el-dialog :title="titlePolicy" v-model="openPolicy" :width="dialogWidth" append-to-body :draggable="true">
       <el-form ref="policyRef" :model="formPolicy" :rules="rulesPolicy" label-width="120px">
         <el-row>  
           <el-col :span="12" v-show="boolValueVisiable">
diff --git a/src/views/model/alert/index.vue b/src/views/model/alert/index.vue
index c409ff9..c404013 100644
--- a/src/views/model/alert/index.vue
+++ b/src/views/model/alert/index.vue
@@ -130,7 +130,7 @@
     />
 
     <!-- 添加或修改设备信息对话框 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body draggable>
       <el-form :model="queryParamsIn" ref="queryRefForm" :inline="true" v-show="showAddSearch" label-width="120px">
         <el-form-item label="中台设备编码" prop="centerDeviceCode">
           <el-input
diff --git a/src/views/model/alert/logicconfig.vue b/src/views/model/alert/logicconfig.vue
index d1e6bbb..0b4036b 100644
--- a/src/views/model/alert/logicconfig.vue
+++ b/src/views/model/alert/logicconfig.vue
@@ -120,7 +120,7 @@
     />
 
     <!-- 添加或修改告警逻辑对话框 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body draggable>
       <el-form ref="logicconfigRef" :model="form" :rules="rules" label-width="120px">
         <el-row>  
           <el-col :span="12">
diff --git a/src/views/model/alert/method.vue b/src/views/model/alert/method.vue
index c4e43bc..d121460 100644
--- a/src/views/model/alert/method.vue
+++ b/src/views/model/alert/method.vue
@@ -104,7 +104,7 @@
     />
 
     <!-- 添加或修改告警方式对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
       <el-form ref="methodRef" :model="form" :rules="rules" label-width="80px">
     
 <el-row>  
diff --git a/src/views/model/alert/model.vue b/src/views/model/alert/model.vue
index 5e69fcd..b8aa57f 100644
--- a/src/views/model/alert/model.vue
+++ b/src/views/model/alert/model.vue
@@ -180,7 +180,7 @@
     />
 
     <!-- 添加或修改告警模版对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
       <el-form ref="modelRef" :model="form" :rules="getRule" label-width="120px">
         <el-row>  
           <el-col :span="12">
diff --git a/src/views/model/alert/noalertparams.vue b/src/views/model/alert/noalertparams.vue
index 1fa6d9c..66364eb 100644
--- a/src/views/model/alert/noalertparams.vue
+++ b/src/views/model/alert/noalertparams.vue
@@ -90,7 +90,7 @@
     />
 
     <!-- 添加或修改设备参数明细对话框 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body draggable>
       
     </el-dialog>
 
diff --git a/src/views/model/alert/policy.vue b/src/views/model/alert/policy.vue
index b542325..fbb15ee 100644
--- a/src/views/model/alert/policy.vue
+++ b/src/views/model/alert/policy.vue
@@ -240,7 +240,7 @@
     />
 
     <!-- 添加或修改参数值状态策略对话框 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body draggable>
       <el-form ref="policyRef" :model="form" :rules="rules" label-width="120px">
         <el-row>  
           <el-col :span="12">
diff --git a/src/views/model/device/index.vue b/src/views/model/device/index.vue
index 44fdde1..6d35126 100644
--- a/src/views/model/device/index.vue
+++ b/src/views/model/device/index.vue
@@ -224,7 +224,7 @@
       </el-col>
     </el-row>
     <!-- 添加或修改设备信息对话框 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body draggable>
       <el-form ref="deviceRef" :model="form" :rules="rules" label-width="125px">
         <el-row>
           <el-col :span="12">
diff --git a/src/views/model/devicemodel/addmodel.vue b/src/views/model/devicemodel/addmodel.vue
index 5451c37..2352359 100644
--- a/src/views/model/devicemodel/addmodel.vue
+++ b/src/views/model/devicemodel/addmodel.vue
@@ -122,7 +122,7 @@
         </el-carousel>  
         
       </el-form>
-      <el-dialog :title="title" v-model="addParamModelShow" width="800px" append-to-body :dc_device_partion="dc_device_partion" :dc_class_type="dc_class_type">
+      <el-dialog :title="title" v-model="addParamModelShow" width="800px" append-to-body :dc_device_partion="dc_device_partion" :dc_class_type="dc_class_type" draggable>
         <el-table ref="dialogTable" :data="paramModelList" key="newTable" style="width: 100%" max-height="600">
           <el-table-column type="selection" width="55" :selectable="ifselectable"/>
           <el-table-column label="参数名称" align="center" prop="paramClassName" />
diff --git a/src/views/model/devicemodel/editModel.vue b/src/views/model/devicemodel/editModel.vue
index 4026e7f..e1eeb5b 100644
--- a/src/views/model/devicemodel/editModel.vue
+++ b/src/views/model/devicemodel/editModel.vue
@@ -115,7 +115,7 @@
 
       </el-form>
       <el-dialog :title="title" v-model="addParamModelShow" width="800px" append-to-body
-        :dc_device_partion="dc_device_partion" :dc_class_type="dc_class_type">
+        :dc_device_partion="dc_device_partion" :dc_class_type="dc_class_type" draggable>
         <el-table ref="dialogTable" :data="paramModelList" key="newTable" style="width: 100%" max-height="600">
           <el-table-column type="selection" width="55" :selectable="ifselectable" />
           <el-table-column label="参数名称" align="center" prop="paramClassName" />
diff --git a/src/views/model/devicemodel/index.vue b/src/views/model/devicemodel/index.vue
index eecd9e2..24568ca 100644
--- a/src/views/model/devicemodel/index.vue
+++ b/src/views/model/devicemodel/index.vue
@@ -120,7 +120,7 @@
     </el-table>
 
     <!-- 添加或修改设备模型信息对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
       <el-form ref="devicemodelRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="模型名称" prop="modelName">
           <el-input v-model="form.modelName" placeholder="请输入模型名称" />
diff --git a/src/views/model/devicemodel/modelparams.vue b/src/views/model/devicemodel/modelparams.vue
index 0a6133d..839b498 100644
--- a/src/views/model/devicemodel/modelparams.vue
+++ b/src/views/model/devicemodel/modelparams.vue
@@ -128,7 +128,7 @@
     />
 
     <!-- 添加或修改设备模型参数明细对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
       <el-form ref="modelparamRef" :model="form" :rules="rules" label-width="80px">
     
 <el-row>  
diff --git a/src/views/model/heatapiconf/heatMainOperatorLog.vue b/src/views/model/heatapiconf/heatMainOperatorLog.vue
index e7df1b5..1dc4cc0 100644
--- a/src/views/model/heatapiconf/heatMainOperatorLog.vue
+++ b/src/views/model/heatapiconf/heatMainOperatorLog.vue
@@ -143,7 +143,7 @@
     />
 
     <!-- 添加或修改供热办推送主配置操作日志对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
       <el-form ref="heatapiRef" :model="form" :rules="rules" label-width="80px">
     
 <el-row>  
diff --git a/src/views/model/heatapiconf/heatSendLog.vue b/src/views/model/heatapiconf/heatSendLog.vue
index 7192226..2cf6125 100644
--- a/src/views/model/heatapiconf/heatSendLog.vue
+++ b/src/views/model/heatapiconf/heatSendLog.vue
@@ -121,7 +121,7 @@
     />
 
     <!-- 添加或修改供暖办推送信息日志对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable> 
       <el-form ref="heatapiRef" :model="form" :rules="rules" label-width="80px">
     
 <el-row>  
diff --git a/src/views/model/heatapiconf/heatSubOperatorLog.vue b/src/views/model/heatapiconf/heatSubOperatorLog.vue
index f3f7eab..42e4f28 100644
--- a/src/views/model/heatapiconf/heatSubOperatorLog.vue
+++ b/src/views/model/heatapiconf/heatSubOperatorLog.vue
@@ -128,7 +128,7 @@
     />
 
     <!-- 添加或修改供暖办推送副配置操作日志对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
       <el-form ref="logRef" :model="form" :rules="rules" label-width="80px">
     
 <el-row>  
diff --git a/src/views/model/heatapiconf/index.vue b/src/views/model/heatapiconf/index.vue
index f127bd5..71f907c 100644
--- a/src/views/model/heatapiconf/index.vue
+++ b/src/views/model/heatapiconf/index.vue
@@ -107,7 +107,7 @@
     </el-row>
 
     <!-- 添加或修改供热办推送接口配置对话框 -->
-    <el-dialog :title="title" v-model="open" width="700px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="700px" append-to-body draggable>
       <el-form ref="heatapiconfRef" :model="form" :rules="rules" label-width="80px">
 
         <el-row>
diff --git a/src/views/model/heatapiconf/paramModel.vue b/src/views/model/heatapiconf/paramModel.vue
index 4370e4e..eb8b355 100644
--- a/src/views/model/heatapiconf/paramModel.vue
+++ b/src/views/model/heatapiconf/paramModel.vue
@@ -59,7 +59,7 @@
       @pagination="getList" />
 
     <!-- 添加或修改热源推送参数配置对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
       <el-form ref="heatParamModelRef" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="24">
diff --git a/src/views/model/modelType/index.vue b/src/views/model/modelType/index.vue
index 7948c43..4111f44 100644
--- a/src/views/model/modelType/index.vue
+++ b/src/views/model/modelType/index.vue
@@ -86,7 +86,7 @@
     />
 
     <!-- 添加或修改设备模型类别对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
       <el-form ref="modelTypeRef" :model="form" :rules="rules" label-width="80px">
     
 <el-row>  
diff --git a/src/views/model/modelparamrela/index.vue b/src/views/model/modelparamrela/index.vue
index 36277d9..2588ab2 100644
--- a/src/views/model/modelparamrela/index.vue
+++ b/src/views/model/modelparamrela/index.vue
@@ -80,7 +80,7 @@
     />
 
     <!-- 添加或修改设备模型参数明细对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
       <el-form ref="modelparamrelaRef" :model="form" :rules="rules" label-width="80px">
     
 <el-row>  
diff --git a/src/views/model/paramclass/index.vue b/src/views/model/paramclass/index.vue
index 8c4f89a..b700f65 100644
--- a/src/views/model/paramclass/index.vue
+++ b/src/views/model/paramclass/index.vue
@@ -127,7 +127,7 @@
     />
 
     <!-- 添加或修改参数模型信息对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
       <el-form ref="paramclassRef" :model="form" :rules="rules" label-width="80px">
     
 <el-row>  
diff --git a/src/views/model/params/index.vue b/src/views/model/params/index.vue
index 6948e41..a99d1af 100644
--- a/src/views/model/params/index.vue
+++ b/src/views/model/params/index.vue
@@ -252,7 +252,7 @@
     />
 
     <!-- 添加或修改设备参数明细对话框 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body draggable>
       <el-form ref="paramsRef" :model="form" :rules="rules" label-width="120px">
       <el-row>  
         <el-col :span="12">
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index d75431d..dc78cbc 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -133,7 +133,7 @@
       />
 
       <!-- 添加或修改定时任务对话框 -->
-      <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+      <el-dialog :title="title" v-model="open" width="800px" append-to-body draggable>
          <el-form ref="jobRef" :model="form" :rules="rules" label-width="120px">
             <el-row>
                <el-col :span="12">
@@ -223,12 +223,12 @@
          </template>
       </el-dialog>
 
-     <el-dialog title="Cron表达式生成器" v-model="openCron" append-to-body destroy-on-close>
+     <el-dialog title="Cron表达式生成器" v-model="openCron" append-to-body destroy-on-close draggable>
        <crontab ref="crontabRef" @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
      </el-dialog>
 
       <!-- 任务日志详细 -->
-      <el-dialog title="任务详细" v-model="openView" width="700px" append-to-body>
+      <el-dialog title="任务详细" v-model="openView" width="700px" append-to-body draggable>
          <el-form :model="form" label-width="120px">
             <el-row>
                <el-col :span="12">
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 915ae29..7dbff1c 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -102,7 +102,7 @@
       </el-table>
 
       <!-- 添加或修改部门对话框 -->
-      <el-dialog :title="title" v-model="open" width="600px" append-to-body>
+      <el-dialog :title="title" v-model="open" width="600px" append-to-body draggable>
          <el-form ref="deptRef" :model="form" :rules="rules" label-width="80px">
             <el-row>
                <el-col :span="24" v-if="form.parentId !== 0">
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index d5b3389..e2e7e78 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -135,7 +135,7 @@
       />
 
       <!-- 添加或修改参数配置对话框 -->
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
          <el-form ref="dictRef" :model="form" :rules="rules" label-width="80px">
             <el-form-item label="字典名称" prop="dictName">
                <el-input v-model="form.dictName" placeholder="请输入字典名称" />
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 0df0a7b..a07e5b7 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -83,7 +83,7 @@
       </el-table>
 
       <!-- 添加或修改菜单对话框 -->
-      <el-dialog :title="title" v-model="open" width="680px" append-to-body>
+      <el-dialog :title="title" v-model="open" width="680px" append-to-body draggable>
          <el-form ref="menuRef" :model="form" :rules="rules" label-width="100px">
             <el-row>
                <el-col :span="24">
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 214bf76..e2b711f 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -107,7 +107,7 @@
       />
 
       <!-- 添加或修改公告对话框 -->
-      <el-dialog :title="title" v-model="open" width="780px" append-to-body>
+      <el-dialog :title="title" v-model="open" width="780px" append-to-body draggable>
          <el-form ref="noticeRef" :model="form" :rules="rules" label-width="80px">
             <el-row>
                <el-col :span="12">
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index c935ed6..130afdf 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -106,7 +106,7 @@
       />
 
       <!-- 添加或修改岗位对话框 -->
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
          <el-form ref="postRef" :model="form" :rules="rules" label-width="80px">
             <el-form-item label="岗位名称" prop="postName">
                <el-input v-model="form.postName" placeholder="请输入岗位名称" />
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 7de0fdc..1aa4ef0 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -128,7 +128,7 @@
       />
 
       <!-- 添加或修改角色配置对话框 -->
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
          <el-form ref="roleRef" :model="form" :rules="rules" label-width="100px">
             <el-form-item label="角色名称" prop="roleName">
                <el-input v-model="form.roleName" placeholder="请输入角色名称" />
@@ -184,7 +184,7 @@
       </el-dialog>
 
       <!-- 分配角色数据权限对话框 -->
-      <el-dialog :title="title" v-model="openDataScope" width="500px" append-to-body>
+      <el-dialog :title="title" v-model="openDataScope" width="500px" append-to-body draggable>
          <el-form :model="form" label-width="80px">
             <el-form-item label="角色名称">
                <el-input v-model="form.roleName" :disabled="true" />
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 9be1ec9..2de7d3a 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -1,6 +1,6 @@
 <template>
    <!-- 授权用户 -->
-   <el-dialog title="选择用户" v-model="visible" width="800px" top="5vh" append-to-body>
+   <el-dialog title="选择用户" v-model="visible" width="800px" top="5vh" append-to-body draggable>
       <el-form :model="queryParams" ref="queryRef" :inline="true">
          <el-form-item label="用户名称" prop="userName">
             <el-input
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index de5998f..a5d8370 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -166,7 +166,7 @@
       </el-row>
 
       <!-- 添加或修改用户配置对话框 -->
-      <el-dialog :title="title" v-model="open" width="600px" append-to-body>
+      <el-dialog :title="title" v-model="open" width="600px" append-to-body draggable>
          <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
             <el-row>
                <el-col :span="12">
@@ -281,7 +281,7 @@
       </el-dialog>
 
       <!-- 用户导入对话框 -->
-      <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+      <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body draggable>
          <el-upload
             ref="uploadRef"
             :limit="1"
diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue
index 2cae2ac..88a76c3 100644
--- a/src/views/system/user/profile/userAvatar.vue
+++ b/src/views/system/user/profile/userAvatar.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="user-info-head" @click="editCropper()">
     <img :src="options.img" title="点击上传头像" class="img-circle img-lg" />
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog" draggable>
       <el-row>
         <el-col :xs="24" :md="12" :style="{ height: '350px' }">
           <vue-cropper
diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index 33b5633..868ec03 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 导入表 -->
-  <el-dialog title="导入表" v-model="visible" width="800px" top="5vh" append-to-body>
+  <el-dialog title="导入表" v-model="visible" width="800px" top="5vh" append-to-body draggable>
     <el-form :model="queryParams" ref="queryRef" :inline="true">
       <el-form-item label="表名称" prop="tableName">
         <el-input
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index bba48a8..63b1373 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -119,7 +119,7 @@
       @pagination="getList"
     />
     <!-- 预览界面 -->
-    <el-dialog :title="preview.title" v-model="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
+    <el-dialog :title="preview.title" v-model="preview.open" width="80%" top="5vh" append-to-body class="scrollbar" draggable>
       <el-tabs v-model="preview.activeName">
         <el-tab-pane
           v-for="(value, key) in preview.data"
diff --git a/src/views/transerver/kingcodetransform/index.vue b/src/views/transerver/kingcodetransform/index.vue
index 1746cda..12dd135 100644
--- a/src/views/transerver/kingcodetransform/index.vue
+++ b/src/views/transerver/kingcodetransform/index.vue
@@ -134,7 +134,7 @@
     />
 
     <!-- 添加或修改IOServer变量转换对话框 -->
-    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body draggable>
       <el-form ref="kingcodetransformRef" :model="form" :rules="rules" label-width="140px">
     
     <el-row>  
diff --git a/src/views/transerver/viewConfig/index.vue b/src/views/transerver/viewConfig/index.vue
index 2391bc8..3e92f12 100644
--- a/src/views/transerver/viewConfig/index.vue
+++ b/src/views/transerver/viewConfig/index.vue
@@ -253,7 +253,7 @@
     />
 
     <!-- 添加或修改运维监视视图配置对话框 -->
-    <el-dialog :title="title" v-model="open" width="1200px" append-to-body>
+    <el-dialog :title="title" v-model="open" width="1200px" append-to-body draggable>
       <el-form ref="viewConfigRef" :model="form" :rules="rules" label-width="140px">
     
     <el-row>  

From 1d4599ecd733440d2915a894735a3f2fd147e9ac Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Mon, 8 Jan 2024 09:58:16 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=AF=B9=E7=85=A7=E8=A1=A8=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   2 +-
 index.html                                    |   4 +-
 src/api/model/tbcodetransform.js              |  53 +++
 src/api/model/tbserverinfo.js                 |  53 +++
 src/assets/styles/self-defined.scss           |  17 +-
 src/views/bi/index.vue                        |   2 +-
 src/views/index1.vue                          |   4 +-
 src/views/model/tbcodetransform/index.vue     | 303 ++++++++++++++++
 src/views/model/tbserverinfo/index.vue        | 332 ++++++++++++++++++
 src/views/model/viewdesgin/index.vue          |   0
 src/views/monitor/job/log.vue                 |   2 +-
 src/views/monitor/operlog/index.vue           |   2 +-
 src/views/system/config/index.vue             |   2 +-
 src/views/system/dict/data.vue                |   2 +-
 .../transerver/kingcodetransform/index.vue    | 278 ++++++++-------
 15 files changed, 907 insertions(+), 149 deletions(-)
 create mode 100644 src/api/model/tbcodetransform.js
 create mode 100644 src/api/model/tbserverinfo.js
 create mode 100644 src/views/model/tbcodetransform/index.vue
 create mode 100644 src/views/model/tbserverinfo/index.vue
 delete mode 100644 src/views/model/viewdesgin/index.vue

diff --git a/.gitignore b/.gitignore
index fcc1017..aeadeef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,4 @@ node_modules/
 package-lock.json
 dist/
 dist.tar.gz
-.vscode/
\ No newline at end of file
+.vscode/
diff --git a/index.html b/index.html
index 41e1832..f3772e8 100644
--- a/index.html
+++ b/index.html
@@ -11,9 +11,9 @@
 	<link rel='stylesheet' href='./public/plugins/plugins.css' />
 	<link rel='stylesheet' href='./public/css/luckysheet.css' />
 	<link rel='stylesheet' href='./public/assets/iconfont/iconfont.css' />
-	<script src="./public/plugins/js/plugin.js"></script>
+	<script src="./public/plugins/js/plugin.js" ></script>
 	<!-- rollup luckysheet.js -->
-	<script src="./public/luckysheet.umd.js"></script>
+	<script src="./public/luckysheet.umd.js" ></script>
   <title>联美运营系统</title>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
diff --git a/src/api/model/tbcodetransform.js b/src/api/model/tbcodetransform.js
new file mode 100644
index 0000000..493494e
--- /dev/null
+++ b/src/api/model/tbcodetransform.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询TB变量转换列表
+export function listTbcodetransform(query) {
+  return request({
+    url: '/model/dcBusiTbcodetransform/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询TB变量转换详细
+export function getTbcodetransform(id) {
+  return request({
+    url: '/model/dcBusiTbcodetransform/' + id,
+    method: 'get'
+  })
+}
+
+// 新增TB变量转换
+export function addTbcodetransform(data) {
+  return request({
+    url: '/model/dcBusiTbcodetransform',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改TB变量转换
+export function updateTbcodetransform(data) {
+  return request({
+    url: '/model/dcBusiTbcodetransform',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除TB变量转换
+export function delTbcodetransform(id) {
+  return request({
+    url: '/model/dcBusiTbcodetransform/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出TB变量转换
+export function exportTbcodetransform(query) {
+  return request({
+    url: '/${baseUrl}/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/api/model/tbserverinfo.js b/src/api/model/tbserverinfo.js
new file mode 100644
index 0000000..2c8cb1d
--- /dev/null
+++ b/src/api/model/tbserverinfo.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询TB服务信息列表
+export function listTbserverinfo(query) {
+  return request({
+    url: '/model/dcBusiServerinfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询TB服务信息详细
+export function getTbserverinfo(id) {
+  return request({
+    url: '/model/dcBusiServerinfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增TB服务信息
+export function addTbserverinfo(data) {
+  return request({
+    url: '/model/dcBusiServerinfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改TB服务信息
+export function updateTbserverinfo(data) {
+  return request({
+    url: '/model/dcBusiServerinfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除TB服务信息
+export function delTbserverinfo(id) {
+  return request({
+    url: '/model/dcBusiServerinfo/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出TB服务信息
+export function exportTbserverinfo(query) {
+  return request({
+    url: '/${baseUrl}/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/assets/styles/self-defined.scss b/src/assets/styles/self-defined.scss
index be08790..3c41780 100644
--- a/src/assets/styles/self-defined.scss
+++ b/src/assets/styles/self-defined.scss
@@ -219,18 +219,19 @@
       margin-right: 5px;
     }
   }
-  .my-custom-form .el-form-item {
-      .el-select{
-        width:100%;
-      }
-      margin-right: 0 !important;
-      width: 96%;
-  }
-
   .paddingBothLeftRight{
     >div{
         padding: 0 20px;
     }
   }
+
+  .my-custom-form .el-form-item {
+    .el-select {
+      width: 100%;
+    }
+ 
+    margin-right: 0 !important;
+    width: 96%;
+  }
    
 
diff --git a/src/views/bi/index.vue b/src/views/bi/index.vue
index 3096387..83929aa 100644
--- a/src/views/bi/index.vue
+++ b/src/views/bi/index.vue
@@ -130,7 +130,7 @@
           </div>
         </div>
       </div>
-      <el-dialog v-model="show" title="显示项" draggable width="600" draggable>
+      <el-dialog v-model="show" title="显示项" draggable width="600">
         <div class="dialog-box">
           <el-tree :data="headerListDialog" ref="tree" show-checkbox node-key="id" draggable :props="defaultProps"
             @node-drop="nodeDrop"  :allow-drag="allowDrag" :allow-drop="allowDrop" @check="check" :default-checked-keys="defaultCheckedKeys">
diff --git a/src/views/index1.vue b/src/views/index1.vue
index c11f592..dec01f2 100644
--- a/src/views/index1.vue
+++ b/src/views/index1.vue
@@ -130,13 +130,13 @@
         </div>
       </div>
     </div>
-    <el-dialog v-model="show" title="显示项" draggable width="600" draggable>
+    <el-dialog v-model="show" title="显示项" draggable width="600">
       <div class="dialog-box">
         <el-tree :data="headerListDialog" ref="tree" show-checkbox node-key="id" draggable :props="defaultProps"
           @node-drop="nodeDrop"  :allow-drag="allowDrag" :allow-drop="allowDrop" @check="check" :default-checked-keys="defaultCheckedKeys">
           <template #default="{ node, data }">
             <span class="custom-tree-node">
-              <span style="width: 240px;">{{ data.name }}</span>
+              <span style="width: 240px">{{ data.name }}</span>
             </span>
             <div class="weight" v-if="!data.children">
               <span>宽度(px):</span>
diff --git a/src/views/model/tbcodetransform/index.vue b/src/views/model/tbcodetransform/index.vue
new file mode 100644
index 0000000..287e11a
--- /dev/null
+++ b/src/views/model/tbcodetransform/index.vue
@@ -0,0 +1,303 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"
+      class="my-custom-form">
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="TB设备UUID" prop="tbDeviceUuid" label-width="auto">
+            <el-input v-model="queryParams.tbDeviceUuid" placeholder="请输入TB设备UUID" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="TB变量名称" prop="tbVarName" label-width="auto">
+            <el-input v-model="queryParams.tbVarName" placeholder="请输入TB变量名称" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="TB服务id" prop="tbServiceId" label-width="auto">
+            <el-input v-model="queryParams.tbServiceId" placeholder="请输入TB服务id" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="中台设备UUID" prop="centerDeviceuuid" label-width="auto">
+            <el-input v-model="queryParams.centerDeviceuuid" placeholder="请输入中台设备UUID" clearable
+              @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="中台参数编码" prop="centerParamcode" label-width="auto">
+            <el-input v-model="queryParams.centerParamcode" placeholder="请输入中台参数编码" clearable
+              @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="中台参数模版编码" prop="centerParamclass" label-width="auto">
+            <el-input v-model="queryParams.centerParamclass" placeholder="请输入中台参数模版编码" clearable
+              @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="分区" prop="partion" label-width="auto">
+            <el-select v-model="queryParams.partion" placeholder="请选择分区" clearable>
+              <el-option v-for="dict in dc_device_partion" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item class="childTextAlignLeft">
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button type="info" plain icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+
+
+
+
+
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="success" icon="Plus" @click="handleAdd">新增</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="success" icon="Edit" @click="handleUpdate">修改</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="success" icon="Delete" @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" icon="Download" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="tbcodetransformList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="TB设备UUID" align="center" prop="tbDeviceUuid" />
+      <el-table-column label="TB变量名称" align="center" prop="tbVarName" />
+      <el-table-column label="TB服务id" align="center" prop="tbServiceId" />
+      <el-table-column label="中台设备UUID" align="center" prop="centerDeviceuuid" />
+      <el-table-column label="中台参数编码" align="center" prop="centerParamcode" />
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="中台参数模版编码" align="center" prop="centerParamclass" />
+      <el-table-column label="分区" align="center" prop="partion">
+        <template #default="scope">
+          <dict-tag :options="dc_device_partion" :value="scope.row.partion" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button type="text" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改TB变量转换对话框 -->
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+      <el-form ref="tbcodetransformRef" :model="form" :rules="rules" class="my-custom-form">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="TB设备UUID" prop="tbDeviceUuid" label-width="auto">
+              <el-input v-model="form.tbDeviceUuid" placeholder="请输入TB设备UUID" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="TB变量名称" prop="tbVarName" label-width="auto">
+              <el-input v-model="form.tbVarName" placeholder="请输入TB变量名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="TB服务id" prop="tbServiceId" label-width="auto">
+              <el-input v-model="form.tbServiceId" placeholder="请输入TB服务id" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="中台设备UUID" prop="centerDeviceuuid" label-width="auto">
+              <el-input v-model="form.centerDeviceuuid" placeholder="请输入中台设备UUID" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="中台参数编码" prop="centerParamcode" label-width="auto">
+              <el-input v-model="form.centerParamcode" placeholder="请输入中台参数编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="中台参数模版编码" prop="centerParamclass" label-width="auto">
+              <el-input v-model="form.centerParamclass" placeholder="请输入中台参数模版编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="分区" prop="partion">
+              <el-select v-model="form.partion" placeholder="请选择分区" label-width="auto">
+                <el-option v-for="dict in dc_device_partion" :key="dict.value" :label="dict.label"
+                  :value="dict.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<style lang="scss" > 
+  @import "@/assets/styles/self-defined.scss";
+</style>
+<script setup name="Tbcodetransform">
+import { listTbcodetransform, getTbcodetransform, delTbcodetransform, addTbcodetransform, updateTbcodetransform } from "@/api/model/tbcodetransform";
+
+const { proxy } = getCurrentInstance();
+const { dc_device_partion } = proxy.useDict('dc_device_partion');
+
+const tbcodetransformList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    tbDeviceUuid: null,
+    tbVarName: null,
+    tbServiceId: null,
+    centerDeviceuuid: null,
+    centerParamcode: null,
+    centerParamclass: null,
+    partion: null
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询TB变量转换列表 */
+function getList() {
+  loading.value = true;
+  listTbcodetransform(queryParams.value).then(response => {
+    tbcodetransformList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    tbDeviceUuid: null,
+    tbVarName: null,
+    tbServiceId: null,
+    centerDeviceuuid: null,
+    centerParamcode: null,
+    id: null,
+    centerParamclass: null,
+    partion: null
+  };
+  proxy.resetForm("tbcodetransformRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加TB变量转换";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _id = row.id || ids.value
+  getTbcodetransform(_id).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改TB变量转换";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["tbcodetransformRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateTbcodetransform(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addTbcodetransform(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value;
+  proxy.$modal.confirm('是否确认删除TB变量转换编号为"' + _ids + '"的数据项？').then(function () {
+    return delTbcodetransform(_ids);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => { });
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('model/dcBusiTbcodetransform/export', {
+    ...queryParams.value
+  }, `tbcodetransform_${new Date().getTime()}.xlsx`)
+}
+
+getList();
+</script>
diff --git a/src/views/model/tbserverinfo/index.vue b/src/views/model/tbserverinfo/index.vue
new file mode 100644
index 0000000..21a5e26
--- /dev/null
+++ b/src/views/model/tbserverinfo/index.vue
@@ -0,0 +1,332 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" class="my-custom-form">
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="用户名" prop="userName" label-width="auto">
+            <el-input v-model="queryParams.userName" placeholder="请输入用户名" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="密码" prop="passWord" label-width="auto">
+            <el-input v-model="queryParams.passWord" placeholder="请输入密码" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="IP地址" prop="restUrl" label-width="auto">
+            <el-input v-model="queryParams.restUrl" placeholder="请输入IP地址" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="端口号" prop="restPort" label-width="auto">
+            <el-input v-model="queryParams.restPort" placeholder="请输入端口号" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="是否可用" prop="enabled" label-width="auto">
+            <el-select v-model="queryParams.enabled" placeholder="请选择是否可用" clearable>
+              <el-option v-for="dict in enabled" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="服务名" prop="seviceName" label-width="auto">
+            <el-input v-model="queryParams.seviceName" placeholder="请输入服务名" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="备注" prop="note" label-width="auto">
+            <el-input v-model="queryParams.note" placeholder="请输入备注" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="服务类型" prop="seviceType" label-width="auto">
+            <el-select v-model="queryParams.seviceType" placeholder="请选择服务类型" clearable>
+              <el-option v-for="dict in dc_collectserver_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item class="childTextAlignLeft">
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button type="info" plain icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="success" icon="Plus" @click="handleAdd">新增</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="success" icon="Edit" @click="handleUpdate">修改</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="success" icon="Delete" @click="handleDelete">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" icon="Download" @click="handleExport">导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="tbserverinfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="用户名" align="center" prop="userName" />
+      <el-table-column label="密码" align="center" prop="passWord" />
+      <el-table-column label="IP地址" align="center" prop="restUrl" />
+      <el-table-column label="端口号" align="center" prop="restPort" />
+      <el-table-column label="是否可用" align="center" prop="enabled" >
+        <template #default="scope">
+          <dict-tag :options="enabledTable" :value="scope.row.enabled" />
+        </template>
+      </el-table-column>
+      <el-table-column label="服务名" align="center" prop="seviceName" />
+      <el-table-column label="备注" align="center" prop="note" />
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="服务类型" align="center" prop="seviceType" >
+        <template #default="scope">
+          <dict-tag :options="dc_collectserver_type" :value="scope.row.seviceType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button type="text" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改TB服务信息对话框 -->
+    <el-dialog :title="title" v-model="open" width="800px" append-to-body>
+      <el-form ref="tbserverinfoRef" :model="form" :rules="rules" class="my-custom-form">
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户名" prop="userName" label-width="auto">
+              <el-input v-model="form.userName" placeholder="请输入用户名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="密码" prop="passWord" label-width="auto">
+              <el-input v-model="form.passWord" placeholder="请输入密码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="IP地址" prop="restUrl" label-width="auto">
+              <el-input v-model="form.restUrl" placeholder="请输入IP地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="端口号" prop="restPort" label-width="auto">
+              <el-input v-model="form.restPort" placeholder="请输入端口号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否可用" prop="enabled" label-width="auto">
+              <el-select v-model="form.enabled" placeholder="请选择是否可用">
+                <el-option v-for="dict in enabled" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="服务名" prop="seviceName" label-width="auto">
+              <el-input v-model="form.seviceName" placeholder="请输入服务名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="note" label-width="auto">
+              <el-input v-model="form.note" placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="服务类型" prop="seviceType" label-width="auto">
+              <el-select v-model="form.seviceType" placeholder="请选择服务类型">
+                <el-option v-for="dict in dc_collectserver_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<style lang="scss" > 
+  @import "@/assets/styles/self-defined.scss";
+</style>
+<script setup name="Tbserverinfo">
+import { listTbserverinfo, getTbserverinfo, delTbserverinfo, addTbserverinfo, updateTbserverinfo } from "@/api/model/tbserverinfo";
+
+const { proxy } = getCurrentInstance();
+const { dc_collectserver_type } = proxy.useDict('dc_collectserver_type');
+const tbserverinfoList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const enabled = [
+  {
+    value: true,
+    label: '是'
+  },
+  {
+    value: false,
+    label: '否'
+  }
+];
+const enabledTable = [
+  {
+    value: 'true',
+    label: '是'
+  },
+  {
+    value: 'false',
+    label: '否'
+  }
+];
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    userName: null,
+    passWord: null,
+    restUrl: null,
+    restPort: null,
+    enabled: true,
+    seviceName: null,
+    note: null,
+    seviceType: null
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询TB服务信息列表 */
+function getList() {
+  loading.value = true;
+  listTbserverinfo(queryParams.value).then(response => {
+    tbserverinfoList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    userName: null,
+    passWord: null,
+    restUrl: null,
+    restPort: null,
+    enabled: null,
+    seviceName: null,
+    note: null,
+    id: null,
+    seviceType: null
+  };
+  proxy.resetForm("tbserverinfoRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加TB服务信息";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _id = row.id || ids.value
+  getTbserverinfo(_id).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改TB服务信息";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["tbserverinfoRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateTbserverinfo(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addTbserverinfo(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  debugger
+  const _ids = row.id || ids.value;
+  proxy.$modal.confirm('是否确认删除TB服务信息编号为"' + _ids + '"的数据项？').then(function () {
+    return delTbserverinfo(_ids);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => { });
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('model/dcBusiServerinfo/export', {
+    ...queryParams.value
+  }, `tbserverinfo_${new Date().getTime()}.xlsx`)
+}
+
+getList();
+</script>
diff --git a/src/views/model/viewdesgin/index.vue b/src/views/model/viewdesgin/index.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/monitor/job/log.vue b/src/views/monitor/job/log.vue
index 887c4ae..0b88057 100644
--- a/src/views/monitor/job/log.vue
+++ b/src/views/monitor/job/log.vue
@@ -130,7 +130,7 @@
       />
 
       <!-- 调度日志详细 -->
-      <el-dialog title="调度日志详细" v-model="open" width="700px" append-to-body>
+      <el-dialog title="调度日志详细" v-model="open" width="700px" append-to-body draggable>
          <el-form :model="form" label-width="100px">
             <el-row>
                <el-col :span="12">
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index bb482f0..37caf78 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -137,7 +137,7 @@
       />
 
       <!-- 操作日志详细 -->
-      <el-dialog title="操作日志详细" v-model="open" width="700px" append-to-body>
+      <el-dialog title="操作日志详细" v-model="open" width="700px" append-to-body draggable>
          <el-form :model="form" label-width="100px">
             <el-row>
                <el-col :span="12">
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index ed6f8df..9a393aa 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -125,7 +125,7 @@
       />
 
       <!-- 添加或修改参数配置对话框 -->
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
          <el-form ref="configRef" :model="form" :rules="rules" label-width="80px">
             <el-form-item label="参数名称" prop="configName">
                <el-input v-model="form.configName" placeholder="请输入参数名称" />
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index daa61a5..09e1e1b 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -121,7 +121,7 @@
       />
 
       <!-- 添加或修改参数配置对话框 -->
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-dialog :title="title" v-model="open" width="500px" append-to-body draggable>
          <el-form ref="dataRef" :model="form" :rules="rules" label-width="80px">
             <el-form-item label="字典类型">
                <el-input v-model="form.dictType" :disabled="true" />
diff --git a/src/views/transerver/kingcodetransform/index.vue b/src/views/transerver/kingcodetransform/index.vue
index 12dd135..84a9041 100644
--- a/src/views/transerver/kingcodetransform/index.vue
+++ b/src/views/transerver/kingcodetransform/index.vue
@@ -4,187 +4,204 @@
       <el-row>
         <el-col :span="4">
           <el-form-item label="变量名称" prop="issVarName" label-width="auto">
-            <el-input
-              v-model="queryParams.issVarName"
-              placeholder="请输入变量名称"
-              clearable
-              @keyup.enter="handleQuery"
-            />
+            <el-input v-model="queryParams.issVarName" placeholder="请输入变量名称" clearable @keyup.enter="handleQuery" />
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label="工程名称" prop="issPrjName" label-width="auto">
-            <el-input
-              v-model="queryParams.issPrjName"
-              placeholder="请输入工程名称"
-              clearable
-              @keyup.enter="handleQuery"
-            />
+            <el-input v-model="queryParams.issPrjName" placeholder="请输入工程名称" clearable @keyup.enter="handleQuery" />
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label="中台设备号" prop="centerDeviceuuid" label-width="auto">
-            <el-input
-              v-model="queryParams.centerDeviceuuid"
-              placeholder="请输入中台设备号"
-              clearable
-              @keyup.enter="handleQuery"
-            />
+            <el-input v-model="queryParams.centerDeviceuuid" placeholder="请输入中台设备号" clearable
+              @keyup.enter="handleQuery" />
           </el-form-item>
         </el-col>
         <el-col :span="4">
           <el-form-item label="中台参数码" prop="centerParamcode" label-width="auto">
-            <el-input
-              v-model="queryParams.centerParamcode"
-              placeholder="请输入中台参数码"
-              clearable
-              @keyup.enter="handleQuery"
-            />
+            <el-input v-model="queryParams.centerParamcode" placeholder="请输入中台参数码" clearable @keyup.enter="handleQuery" />
           </el-form-item>
         </el-col>
         <el-col :span="4">
+          <el-form-item label="ISSRest地址" prop="issResturl" label-width="auto">
+            <el-input v-model="queryParams.issResturl" placeholder="请输入ISSRest地址" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="ISSRest端口号" prop="issRestport" label-width="auto">
+            <el-input v-model="queryParams.issRestport" placeholder="请输入ISSRest端口号" clearable
+              @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="分区" prop="partion" label-width="auto">
+            <el-input v-model="queryParams.partion" placeholder="请输入分区" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="temp" prop="temp">
+            <el-input v-model="queryParams.temp" placeholder="请输入temp" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="参数模版编码" prop="centerParamclass" label-width="auto">
+            <el-input v-model="queryParams.centerParamclass" placeholder="请输入参数模版编码" clearable
+              @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="服务配置ID" prop="issServerconfid" label-width="auto">
+            <el-input v-model="queryParams.issServerconfid" placeholder="请输入服务配置ID" clearable
+              @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item class="childTextAlignLeft">
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button type="info" plain icon="Refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-col>
       </el-row>
-      
-     
-      
-      
-      
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="Plus"
-          @click="handleAdd"
-        >新增</el-button>
+        <el-button type="success" icon="Plus" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="Edit"
-          @click="handleUpdate"
-        >修改</el-button>
+        <el-button type="success" icon="Edit" @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="Delete"
-          @click="handleDelete"
-        >删除</el-button>
+        <el-button type="success" icon="Delete" @click="handleDelete">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="Download"
-          @click="handleExport"
-        >导出</el-button>
+        <el-button type="warning" icon="Download" @click="handleExport">导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="kingcodetransformList" @selection-change="handleSelectionChange" :max-height="tableHeight" :border="true" :column-width-draggable="true">
-      <el-table-column type="selection" width="55" align="center"  fixed="left"/>
+    <el-table v-loading="loading" :data="kingcodetransformList" @selection-change="handleSelectionChange"
+      :max-height="tableHeight" :border="true" :column-width-draggable="true">
+      <el-table-column type="selection" width="55" align="center" fixed="left" />
       <el-table-column label="主键" align="center" prop="id" />
       <el-table-column label="工程名称" align="center" prop="issPrjName" />
       <el-table-column label="服务地址" align="center" prop="issResturl" />
       <el-table-column label="端口号" align="center" prop="issRestport" />
       <el-table-column label="组名称" align="center" prop="issGroupName" />
       <el-table-column label="变量名称" align="center" prop="issVarName" />
-      <el-table-column label="变量类型" align="center" prop="issVarType" >
+      <el-table-column label="变量类型" align="center" prop="issVarType">
         <template #default="scope">
-          <dict-tag :options="dc_param_value_type" :value="scope.row.issVarType"/>
+          <dict-tag :options="dc_param_value_type" :value="scope.row.issVarType" />
         </template>
       </el-table-column>
       <el-table-column label="中台设备" align="center" prop="centerDeviceuuid" />
       <el-table-column label="中台参数" align="center" prop="centerParamcode" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :width="300" :fixed="fixedColumns?'right':false">
+      <el-table-column label="ISSRest地址" align="center" prop="issResturl" />
+      <el-table-column label="主键" align="center" prop="id" />
+      <el-table-column label="ISSRest端口号" align="center" prop="issRestport" />
+      <el-table-column label="分区" align="center" prop="partion" />
+      <el-table-column label="temp" align="center" prop="temp" />
+      <el-table-column label="参数模版编码" align="center" prop="centerParamclass" />
+      <el-table-column label="服务配置ID" align="center" prop="issServerconfid" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" :width="300"
+        :fixed="fixedColumns ? 'right' : false">
         <template #header>
-          <div class="fixed-column-header"  style="text-align: center;display: block;" @dblclick="toggleFixedColumns">
-            <span style="text-align: center;display: block;">操作<img style="width:10px;margin-left:5px" v-show="fixedColumns" :src="lock" alt="Image"/></span>
+          <div class="fixed-column-header" style="text-align: center;display: block;" @dblclick="toggleFixedColumns">
+            <span style="text-align: center;display: block;">操作<img style="width:10px;margin-left:5px"
+                v-show="fixedColumns" :src="lock" alt="Image" /></span>
           </div>
         </template>
         <template #default="scope">
-          <el-button
-            type="text"
-            icon="Edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            type="text"
-            icon="Delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
+          <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+          <el-button type="text" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-      class="paddingBothLeftRight"
-    />
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+      @pagination="getList" class="paddingBothLeftRight" />
 
     <!-- 添加或修改IOServer变量转换对话框 -->
     <el-dialog :title="title" v-model="open" width="800px" append-to-body draggable>
       <el-form ref="kingcodetransformRef" :model="form" :rules="rules" label-width="140px">
-    
-    <el-row>  
-      <el-col :span="24">
-        <el-form-item label="工程名称" width="150" prop="issPrjName">
-          <el-input v-model="form.issPrjName" placeholder="请输入工程名称"  required="true"/>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="服务地址" prop="issResturl">
-          <el-input v-model="form.issResturl" placeholder="请输入服务地址" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="服务端口号" prop="issRestport">
-          <el-input v-model="form.issRestport" placeholder="请输入服务端口号" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="变量名称"  prop="issVarName">
-          <el-input v-model="form.issVarName" placeholder="请输入变量名称" required="true" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="变量类型" prop="issVarType">
-          <el-select v-model="form.issVarType" placeholder="请选择变量类型">
-            <el-option  v-for="dict in dc_param_value_type"
-                        :key="dict.value"
-                        :label="dict.label" 
-                        :value="dict.value"/>
-          
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="组名称" prop="issGroupName">
-          <el-input v-model="form.issGroupName" placeholder="请输入组名称" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="中台设备号" prop="centerDeviceuuid">
-          <el-input v-model="form.centerDeviceuuid" placeholder="请输入中台设备号" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="24">
-        <el-form-item label="中台参数码" prop="centerParamcode">
-          <el-input v-model="form.centerParamcode" placeholder="请输入中台参数码" />
-        </el-form-item>
-      </el-col>
-      </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="工程名称" width="150" prop="issPrjName">
+              <el-input v-model="form.issPrjName" placeholder="请输入工程名称" required="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="服务地址" prop="issResturl">
+              <el-input v-model="form.issResturl" placeholder="请输入服务地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="服务端口号" prop="issRestport">
+              <el-input v-model="form.issRestport" placeholder="请输入服务端口号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="变量名称" prop="issVarName">
+              <el-input v-model="form.issVarName" placeholder="请输入变量名称" required="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="变量类型" prop="issVarType">
+              <el-select v-model="form.issVarType" placeholder="请选择变量类型">
+                <el-option v-for="dict in dc_param_value_type" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="组名称" prop="issGroupName">
+              <el-input v-model="form.issGroupName" placeholder="请输入组名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="中台设备号" prop="centerDeviceuuid">
+              <el-input v-model="form.centerDeviceuuid" placeholder="请输入中台设备号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="中台参数码" prop="centerParamcode">
+              <el-input v-model="form.centerParamcode" placeholder="请输入中台参数码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="ISSRest地址" prop="issResturl">
+              <el-input v-model="form.issResturl" placeholder="请输入ISSRest地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="ISSRest端口号" prop="issRestport">
+              <el-input v-model="form.issRestport" placeholder="请输入ISSRest端口号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="分区" prop="partion">
+              <el-input v-model="form.partion" placeholder="请输入分区" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="temp" prop="temp">
+              <el-input v-model="form.temp" placeholder="请输入temp" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="参数模版编码" prop="centerParamclass">
+              <el-input v-model="form.centerParamclass" placeholder="请输入参数模版编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="服务配置ID" prop="issServerconfid">
+              <el-input v-model="form.issServerconfid" placeholder="请输入服务配置ID" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -195,8 +212,7 @@
     </el-dialog>
   </div>
 </template>
-<style lang="scss" > 
-  @import "@/assets/styles/self-defined.scss";
+<style lang="scss" > @import "@/assets/styles/self-defined.scss";
 </style>
 <script setup name="Kingcodetransform">
 import { listKingcodetransform, getKingcodetransform, delKingcodetransform, addKingcodetransform, updateKingcodetransform } from "@/api/transerver/kingcodetransform";
@@ -332,12 +348,12 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const _ids = row.id || ids.value;
-  proxy.$modal.confirm('是否确认删除IOServer变量转换编号为"' + _ids + '"的数据项？').then(function() {
+  proxy.$modal.confirm('是否确认删除IOServer变量转换编号为"' + _ids + '"的数据项？').then(function () {
     return delKingcodetransform(_ids);
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+  }).catch(() => { });
 }
 
 /** 导出按钮操作 */
@@ -351,7 +367,7 @@ function toggleFixedColumns() {
   fixedColumns.value = !fixedColumns.value;
 }
 
-onMounted(()=>{
+onMounted(() => {
   calculateTableHeight();
   window.addEventListener('resize', calculateTableHeight);
   window.onresize = () => {
@@ -365,14 +381,14 @@ onUnmounted(() => {
   window.removeEventListener('resize', calculateTableHeight);
 });
 watch(
-  [collapseVisible,showSearch],
+  [collapseVisible, showSearch],
   () => {
     calculateTableHeight();
   }
 );
 const calculateTableHeight = () => {
   nextTick(() => {
-    const heightForm = proxy.$refs.queryRef?.$el.clientHeight||0;
+    const heightForm = proxy.$refs.queryRef?.$el.clientHeight || 0;
     const windowHeight = window.innerHeight;
     const paginationHeight = 60;
     const tableHeaderHeight = 40;

From c7ec3d1c3692dd2fcc97986f7fac92f5e538666f Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Thu, 11 Jan 2024 10:50:13 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E6=B7=BB=E5=8A=A0=E5=88=B7=E6=96=B0redis=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/device.js                |  8 ++++++++
 src/views/model/device/index.vue       | 12 +++++++++++-
 src/views/model/tbserverinfo/index.vue |  1 -
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/api/model/device.js b/src/api/model/device.js
index 39d144b..db5992e 100644
--- a/src/api/model/device.js
+++ b/src/api/model/device.js
@@ -91,4 +91,12 @@ export function selectDcBaseDeviceinfoMaxSort(){
     url: '/model/dcBaseDeviceinfo/selectDcBaseDeviceinfoMaxSort',
     method: 'get'
   });
+}
+
+//清空redis缓存
+export function cleanRedisCache() {
+  return request({
+    url: '/model/dcBaseDeviceinfo/cleanRedisCache',
+    method: 'post'
+  });
 }
\ No newline at end of file
diff --git a/src/views/model/device/index.vue b/src/views/model/device/index.vue
index 6d35126..d68f01f 100644
--- a/src/views/model/device/index.vue
+++ b/src/views/model/device/index.vue
@@ -146,6 +146,9 @@
           <el-col :span="1.5">
             <el-button type="warning" icon="Download" @click="handleExport">导出</el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="Refresh" @click="cleanRedis">刷新redis缓存</el-button>
+          </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList">
           </right-toolbar>
         </el-row>
@@ -399,7 +402,7 @@
  }
 </style>
 <script setup name="Device">
-import { getUuid, listDevice, getDevice, delDevice, addDevice, updateDevice, listWithFilterColumn, selectDcBaseDeviceinfoMaxSort } from "@/api/model/device";
+import { getUuid, listDevice, getDevice, delDevice, addDevice, updateDevice, listWithFilterColumn, selectDcBaseDeviceinfoMaxSort,cleanRedisCache } from "@/api/model/device";
 import { deptTreeSelect } from "@/api/system/user";
 import lock from "@/assets/icons/svg/lock.svg";
 import { ref, onMounted, onUnmounted } from "vue";
@@ -944,6 +947,13 @@ watch(deptName, val => {
   proxy.$refs["deptTreeRef"].filter(val);
 });
 
+function cleanRedis() {
+  proxy.$modal.confirm('是否确认清空所有缓存？').then(function () {
+    return cleanRedisCache();
+  }).catch(function () {
+  });
+}
+
 
 getDeptTree();
 getList();
diff --git a/src/views/model/tbserverinfo/index.vue b/src/views/model/tbserverinfo/index.vue
index 21a5e26..6adf0cf 100644
--- a/src/views/model/tbserverinfo/index.vue
+++ b/src/views/model/tbserverinfo/index.vue
@@ -311,7 +311,6 @@ function submitForm() {
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  debugger
   const _ids = row.id || ids.value;
   proxy.$modal.confirm('是否确认删除TB服务信息编号为"' + _ids + '"的数据项？').then(function () {
     return delTbserverinfo(_ids);