Merge branch 'dev-fix-delCode' into 'dev'

fix: 角色表隐藏code查改

See merge request skyeye/skyeye_frontend/skyeye-admin!100

src/views/system-config/template/CardCommon.vue

@@ -6,6 +6,7 @@
       :pagesize="currentPageSize"
       :pagenumber="currentPage"
       :drawer="cardaddDrawer"
+      :tab="props.tab"
       @find-data-by-name="searchDataByName"
       @submit-drawer="addData"
       @add-form="clickAddData"
@@ -88,6 +89,7 @@
   import { Records, SceneModule } from '@/api/template/template';
   import del from '@/assets/icons/del.png';
   import edit from '@/assets/icons/edit.png';
+  import { LabelType } from './constant';
 
   // const currentFormType = ref('场景');
 
@@ -121,6 +123,7 @@
 
   const props = defineProps<{
     type: string;
+    tab: LabelType;
     addData: (d: SceneModule) => Promise<unknown>;
     searchDataByName: (d: DataCommon) => Promise<unknown>;
     deleteTableData: (d: TableModel) => Promise<unknown>;

src/views/system-config/template/LabelManager.vue

@@ -1,121 +1,138 @@
 <template>
-    <div>
-
-        <CardCommon :type='type' :search-data-by-name="findSceneLabelFun" :get-data="getSceneLabelListFun"
-            :delete-table-data="deleteSceneLabelFun" :submit-drawer="updateSceneLabelFun" :add-data="saveSceneLabelFun">
-        </CardCommon>
-
-    </div>
+  <div>
+    <CardCommon
+      :type="type"
+      :tab="props.tab"
+      :search-data-by-name="findSceneLabelFun"
+      :get-data="getSceneLabelListFun"
+      :delete-table-data="deleteSceneLabelFun"
+      :submit-drawer="updateSceneLabelFun"
+      :add-data="saveSceneLabelFun"
+    >
+    </CardCommon>
+  </div>
 </template>
 
 <script setup lang="ts">
-import { updateSceneLabel, getSceneLabelList, deleteSceneLabel, findSceneLabelByName, saveSceneLabel, SceneLabel } from '@/api/template/template';
-import { ElMessage, ElMessageBox } from 'element-plus';
-import CardCommon, { TableModel } from './CardCommon.vue'
-import { DataCommon } from './TitleCommon.vue';
-import { ref } from 'vue';
-const type = ref('标签');
-
-
-// 添加数据
-function saveSceneLabelFun(data: SceneLabel) {
-    return saveSceneLabel(data).then(res => {
+  import {
+    updateSceneLabel,
+    getSceneLabelList,
+    deleteSceneLabel,
+    findSceneLabelByName,
+    saveSceneLabel,
+    SceneLabel,
+  } from '@/api/template/template';
+  import { ElMessage, ElMessageBox } from 'element-plus';
+  import CardCommon, { TableModel } from './CardCommon.vue';
+  import { DataCommon } from './TitleCommon.vue';
+  import { ref } from 'vue';
+  const type = ref('标签');
+
+  const props = defineProps<{
+    tab: LabelType;
+  }>();
+
+  // 添加数据
+  function saveSceneLabelFun(data: SceneLabel) {
+    return saveSceneLabel(data)
+      .then((res) => {
         console.log(res);
         return res;
-
-    }).catch(error => {
+      })
+      .catch((error) => {
         ElMessageBox.alert(error, '异常', {
-            confirmButtonText: 'OK',
-            callback: () => {
-                ElMessage({
-                    type: 'info',
-                    message: `添加数据失败`,
-                })
-            },
-        })
-    });
-};
-
-// 根据名称查找
-function findSceneLabelFun(data: DataCommon) {
+          confirmButtonText: 'OK',
+          callback: () => {
+            ElMessage({
+              type: 'info',
+              message: `添加数据失败`,
+            });
+          },
+        });
+      });
+  }
+
+  // 根据名称查找
+  function findSceneLabelFun(data: DataCommon) {
     console.log('findSceneLabelByName', data.name, data.page, data.size);
-    return findSceneLabelByName(data.name, data.page, data.size).then((res) => {
-        console.log(res)
+    return findSceneLabelByName(data.name, data.page, data.size)
+      .then((res) => {
+        console.log(res);
         return res;
-    }).catch(error => {
+      })
+      .catch((error) => {
         ElMessageBox.alert(error, '异常', {
-            confirmButtonText: 'OK',
-            callback: () => {
-                ElMessage({
-                    type: 'info',
-                    message: `查询数据失败`,
-                })
-            },
-        })
-    });
-}
-
-// 查找数据列表-finish
-function getSceneLabelListFun(data) {
-    return getSceneLabelList(data.page, data.size).then((res) => {
-        return res
-    }).catch(error => {
+          confirmButtonText: 'OK',
+          callback: () => {
+            ElMessage({
+              type: 'info',
+              message: `查询数据失败`,
+            });
+          },
+        });
+      });
+  }
+
+  // 查找数据列表-finish
+  function getSceneLabelListFun(data) {
+    return getSceneLabelList(data.page, data.size)
+      .then((res) => {
+        return res;
+      })
+      .catch((error) => {
         ElMessageBox.alert(error.message, '异常', {
-            confirmButtonText: 'OK',
-            callback: () => {
-                ElMessage({
-                    type: 'info',
-                    message: `查询数据失败`,
-                })
-            },
-        })
-    });
-}
-
-// 删除数据
-function deleteSceneLabelFun(data: TableModel) {
+          confirmButtonText: 'OK',
+          callback: () => {
+            ElMessage({
+              type: 'info',
+              message: `查询数据失败`,
+            });
+          },
+        });
+      });
+  }
+
+  // 删除数据
+  function deleteSceneLabelFun(data: TableModel) {
     console.log('detele', data);
-    return deleteSceneLabel(data.id).then(res => {
+    return deleteSceneLabel(data.id)
+      .then((res) => {
         console.log(res);
         return res;
-
-    }).catch(error => {
+      })
+      .catch((error) => {
         ElMessageBox.alert(error, '异常', {
-            confirmButtonText: 'OK',
-            callback: () => {
-                ElMessage({
-                    type: 'info',
-                    message: `删除数据失败`,
-                })
-            },
-        })
-    });
-}
-
-// 编辑数据
-function updateSceneLabelFun(data: SceneLabel) {
+          confirmButtonText: 'OK',
+          callback: () => {
+            ElMessage({
+              type: 'info',
+              message: `删除数据失败`,
+            });
+          },
+        });
+      });
+  }
+
+  // 编辑数据
+  function updateSceneLabelFun(data: SceneLabel) {
     console.log('edit', data);
-    return updateSceneLabel(data).then(res => {
+    return updateSceneLabel(data)
+      .then((res) => {
         console.log(res);
         return res;
-
-    }).catch(error => {
+      })
+      .catch((error) => {
         ElMessageBox.alert(error, '异常', {
-            confirmButtonText: 'OK',
-            callback: () => {
-                ElMessage({
-                    type: 'info',
-                    message: `编辑数据失败`,
-                })
-            },
-        })
-    });
-}
-
-
-
-
-
+          confirmButtonText: 'OK',
+          callback: () => {
+            ElMessage({
+              type: 'info',
+              message: `编辑数据失败`,
+            });
+          },
+        });
+      });
+  }
 </script>
 
-<style scoped></style>
+<style scoped></style>

src/views/system-config/template/SceneManager.vue

@@ -2,6 +2,7 @@
   <div>
     <CardCommon
       :type="type"
+      :tab="props.tab"
       :search-data-by-name="findSceneModuleFun"
       :get-data="getSceneLabelListFun"
       :delete-table-data="deleteSceneModuleFun"
@@ -25,8 +26,13 @@
   import CardCommon, { TableModel } from './CardCommon.vue';
   import { DataCommon } from './TitleCommon.vue';
   import { ref } from 'vue';
+  import { LabelType } from './constant';
   const type = ref('模板');
 
+  const props = defineProps<{
+    tab: LabelType;
+  }>();
+
   // 添加数据
   function saveSceneModuleFun(data: SceneModule) {
     return saveSceneModule(data)

src/views/system-config/template/TemplateManager.vue

@@ -3,13 +3,13 @@
     <div>
       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
         <el-tab-pane label="公司模板" name="scene">
-          <SceneManagerVue />
+          <SceneManagerVue tab="scene" />
         </el-tab-pane>
         <el-tab-pane label="场景标签" name="label">
-          <LabelManagerVue />
+          <LabelManagerVue tab="label" />
         </el-tab-pane>
         <el-tab-pane label="车间模板" name="workspace">
-          <WorkspaceManagerVue />
+          <WorkspaceManagerVue tab="workspace" />
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -22,9 +22,9 @@
   import LabelManagerVue from './LabelManager.vue';
   import WorkspaceManagerVue from './WorkspaceManager.vue';
   import SceneManagerVue from './SceneManager.vue';
+  import { LabelType } from './constant';
 
   const activeName = ref('scene');
-  export type LabelType = 'scene' | 'label' | 'workspace';
   const currentLabel = ref<LabelType>('scene');
 
   const handleClick = (tab: TabsPaneContext) => {
@@ -41,22 +41,26 @@
   };
 </script>
 
-<style>
-  .demo-tabs > .el-tabs__content {
+<style scoped>
+  :deep(.demo-tabs > .el-tabs__content) {
     padding: 32px;
     color: #6b778c;
     font-size: 32px;
     font-weight: 600;
   }
 
-  .el-tabs__item:hover {
+  :deep(.el-tabs__item:hover) {
     /* color: rgb(53, 120, 220); */
     background-color: rgb(53, 120, 220);
   }
 
-  .el-tabs__item.is-active {
+  :deep(.el-tabs__item.is-active) {
     /* color: rgb(221, 239, 255); */
     background-color: rgb(221, 239, 255);
     border: 3px solid #4693f1 !important;
   }
+
+  :deep(.el-tabs__header) {
+    margin: 0;
+  }
 </style>

src/views/system-config/template/TitleCommon.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
+    <div class="form-tip">{{ '提示：' + getTipByTab(props.tab) }}</div>
     <el-form inline ref="ruleFormRef" :model="form">
-      <el-form-item style="margin-top: 20px">
+      <el-form-item style="margin-top: 0px">
         <el-input
           v-model="form.name"
           :placeholder="`请输入` + props.type + `名称`"
@@ -43,12 +44,15 @@
   import { ElMessageBox, FormInstance } from 'element-plus';
   import DrawerCommonVue, { FormModelCommon } from './DrawerCommon.vue';
   import { useKeyPress } from 'vue-hooks-plus';
+  import { LabelType, getTipByTab } from './constant';
+
   export type CreateType = '添加模板' | '修改模板';
   const props = defineProps<{
     type: string;
     pagesize: number;
     pagenumber: number;
     drawer: boolean;
+    tab: LabelType;
   }>();
   const emit = defineEmits([
     'findDataByName',
@@ -125,4 +129,14 @@
   onMounted(() => {});
 </script>
 
-<style scoped></style>
+<style scoped>
+  .form-tip {
+    font-family: PingFangSC, PingFang SC;
+    font-weight: 400;
+    font-size: 12px;
+    color: #909399;
+    line-height: 38px;
+    text-align: left;
+    font-style: normal;
+  }
+</style>

src/views/system-config/template/WorkspaceManager.vue

@@ -1,122 +1,138 @@
 <template>
-    <div>
-
-        <CardCommon :type='type' :search-data-by-name="findWorkshopModuleFun" :get-data="getWorkshopModuleListFun"
-            :delete-table-data="deleteWorkshopModuleFun" :submit-drawer="updateWorkshopModuleFun"
-            :add-data="saveWorkshopModuleFun">
-        </CardCommon>
-
-    </div>
+  <div>
+    <CardCommon
+      :type="type"
+      :tab="props.tab"
+      :search-data-by-name="findWorkshopModuleFun"
+      :get-data="getWorkshopModuleListFun"
+      :delete-table-data="deleteWorkshopModuleFun"
+      :submit-drawer="updateWorkshopModuleFun"
+      :add-data="saveWorkshopModuleFun"
+    >
+    </CardCommon>
+  </div>
 </template>
 
 <script setup lang="ts">
-import { updateWorkshopModule, getWorkshopModuleList, deleteWorkshopModule, findWorkshopModuleByName, saveWorkshopModule, WorkshopModule } from '@/api/template/template';
-import { ElMessage, ElMessageBox } from 'element-plus';
-import CardCommon, { TableModel } from './CardCommon.vue'
-import { DataCommon } from './TitleCommon.vue';
-import { ref } from 'vue';
-const type = ref('模板');
-
-
-// 添加数据
-function saveWorkshopModuleFun(data: WorkshopModule) {
-    return saveWorkshopModule(data).then(res => {
+  import {
+    updateWorkshopModule,
+    getWorkshopModuleList,
+    deleteWorkshopModule,
+    findWorkshopModuleByName,
+    saveWorkshopModule,
+    WorkshopModule,
+  } from '@/api/template/template';
+  import { ElMessage, ElMessageBox } from 'element-plus';
+  import CardCommon, { TableModel } from './CardCommon.vue';
+  import { DataCommon } from './TitleCommon.vue';
+  import { ref } from 'vue';
+  const type = ref('模板');
+
+  const props = defineProps<{
+    tab: LabelType;
+  }>();
+
+  // 添加数据
+  function saveWorkshopModuleFun(data: WorkshopModule) {
+    return saveWorkshopModule(data)
+      .then((res) => {
         console.log(res);
         return res;
-
-    }).catch(error => {
+      })
+      .catch((error) => {
         ElMessageBox.alert(error, '异常', {
-            confirmButtonText: 'OK',
-            callback: () => {
-                ElMessage({
-                    type: 'info',
-                    message: `添加数据失败`,
-                })
-            },
-        })
-    });
-};
-
-// 根据名称查找
-function findWorkshopModuleFun(data: DataCommon) {
+          confirmButtonText: 'OK',
+          callback: () => {
+            ElMessage({
+              type: 'info',
+              message: `添加数据失败`,
+            });
+          },
+        });
+      });
+  }
+
+  // 根据名称查找
+  function findWorkshopModuleFun(data: DataCommon) {
     console.log('findWorkshopModuleByName', data.name, data.page, data.size);
-    return findWorkshopModuleByName(data.name, data.page, data.size).then((res) => {
-        console.log(res)
+    return findWorkshopModuleByName(data.name, data.page, data.size)
+      .then((res) => {
+        console.log(res);
         return res;
-    }).catch(error => {
+      })
+      .catch((error) => {
         ElMessageBox.alert(error, '异常', {
-            confirmButtonText: 'OK',
-            callback: () => {
-                ElMessage({
-                    type: 'info',
-                    message: `查询数据失败`,
-                })
-            },
-        })
-    });
-}
-
-// 查找数据列表-finish
-function getWorkshopModuleListFun(data) {
-    return getWorkshopModuleList(data.page, data.size).then((res) => {
-        return res
-    }).catch(error => {
+          confirmButtonText: 'OK',
+          callback: () => {
+            ElMessage({
+              type: 'info',
+              message: `查询数据失败`,
+            });
+          },
+        });
+      });
+  }
+
+  // 查找数据列表-finish
+  function getWorkshopModuleListFun(data) {
+    return getWorkshopModuleList(data.page, data.size)
+      .then((res) => {
+        return res;
+      })
+      .catch((error) => {
         ElMessageBox.alert(error.message, '异常', {
-            confirmButtonText: 'OK',
-            callback: () => {
-                ElMessage({
-                    type: 'info',
-                    message: `查询数据失败`,
-                })
-            },
-        })
-    });
-}
-
-// 删除数据
-function deleteWorkshopModuleFun(data: TableModel) {
+          confirmButtonText: 'OK',
+          callback: () => {
+            ElMessage({
+              type: 'info',
+              message: `查询数据失败`,
+            });
+          },
+        });
+      });
+  }
+
+  // 删除数据
+  function deleteWorkshopModuleFun(data: TableModel) {
     console.log('detele', data);
-    return deleteWorkshopModule(data.id).then(res => {
+    return deleteWorkshopModule(data.id)
+      .then((res) => {
         console.log(res);
         return res;
-
-    }).catch(error => {
+      })
+      .catch((error) => {
         ElMessageBox.alert(error, '异常', {
-            confirmButtonText: 'OK',
-            callback: () => {
-                ElMessage({
-                    type: 'info',
-                    message: `删除数据失败`,
-                })
-            },
-        })
-    });
-}
-
-// 编辑数据
-function updateWorkshopModuleFun(data: WorkshopModule) {
+          confirmButtonText: 'OK',
+          callback: () => {
+            ElMessage({
+              type: 'info',
+              message: `删除数据失败`,
+            });
+          },
+        });
+      });
+  }
+
+  // 编辑数据
+  function updateWorkshopModuleFun(data: WorkshopModule) {
     console.log('edit', data);
-    return updateWorkshopModule(data).then(res => {
+    return updateWorkshopModule(data)
+      .then((res) => {
         console.log(res);
         return res;
-
-    }).catch(error => {
+      })
+      .catch((error) => {
         ElMessageBox.alert(error, '异常', {
-            confirmButtonText: 'OK',
-            callback: () => {
-                ElMessage({
-                    type: 'info',
-                    message: `编辑数据失败`,
-                })
-            },
-        })
-    });
-}
-
-
-
-
-
+          confirmButtonText: 'OK',
+          callback: () => {
+            ElMessage({
+              type: 'info',
+              message: `编辑数据失败`,
+            });
+          },
+        });
+      });
+  }
 </script>
 
-<style scoped></style>
+<style scoped></style>

src/views/system-config/template/constant.ts

@@ -0,0 +1,19 @@
+export type LabelType = 'scene' | 'label' | 'workspace';
+
+export const templateTips = [
+  {
+    tab: 'scene',
+    tip: '决定了平台主页的页面布局、功能模块、监测数据类型，系统已进行初始化配置，请勿修改、删除。',
+  },
+  {
+    tab: 'label',
+    tip: '用于关联公司场景与模板之间的关系，实现模板的实例化。为系统底层能力，请勿修改、删除。',
+  },
+  {
+    tab: 'workspace',
+    tip: '决定了每个车间的页面布局、功能模块、监测数据类型，系统已进行初始化配置，请勿修改、删除。',
+  },
+];
+
+export const getTipByTab = (tab: LabelType) =>
+  templateTips.find((item) => item.tab === tab)?.tip || '';

src/views/system/role/CreateDrawer.vue

@@ -13,7 +13,7 @@
       label-placement="left"
       :label-width="80"
     >
-      <el-form-item label="角色编码" prop="roleCode">
+      <el-form-item v-if="!formParams.roleId" label="角色编码" prop="roleCode">
         <el-input
           placeholder="请输入角色编码"
           v-model="formParams.roleCode"

src/views/system/role/CreateUserDrawer.vue

@@ -13,7 +13,7 @@
       label-placement="left"
       :label-width="80"
     >
-      <el-form-item label="角色编码" prop="roleCode">
+      <el-form-item v-if="!formParams.roleId" label="角色编码" prop="roleCode">
         <el-input
           placeholder="请输入角色编码"
           v-model="formParams.roleCode"

src/views/system/role/columns.ts

@@ -20,10 +20,10 @@ export const columns: BasicColumn[] = [
       );
     },
   },
-  {
-    label: '角色编码',
-    prop: 'roleCode',
-  },
+  // {
+  //   label: '角色编码',
+  //   prop: 'roleCode',
+  // },
   {
     label: '角色名称',
     prop: 'roleName',