Merge branch 'lkh-v4fix' into 'all-v4'

fix: 修改对删除时对话框格式，修改删除的函数名防止与传入的重复

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

src/views/templateManage/CardCommon.vue

@@ -77,7 +77,7 @@
               </el-tooltip>
             </el-button>
 
-            <el-button link type="primary" size="small" @click="deleteTableData(scope.row)"
+            <el-button link type="primary" size="small" @click="deleteTemplate(scope.row)"
               ><el-tooltip class="box-item" effect="dark" content="删除" placement="top">
                 <el-icon :size="16">
                   <Delete />
@@ -226,7 +226,7 @@
   };
 
   // 删除数据-finish
-  function deleteTableData(row: TableModel) {
+  function deleteTemplate(row: TableModel) {
     // emit('deleteTableData', row);
     currentRow.value = row;
     props.deleteTableData(row).then(() => {

src/views/templateManage/SceneManager.vue

@@ -93,14 +93,14 @@
 
   // 删除数据
   function deleteSceneModuleFun(data: TableModel) {
-    console.log('detele', data);
+    // console.log('detele', data);
     return deleteSceneModule(data.id)
       .then((res) => {
         console.log(res);
         return res;
       })
       .catch((error) => {
-        ElMessageBox.alert(error, '异常', {
+        ElMessageBox.alert(error.message, '模板删除', {
           confirmButtonText: '确定',
           callback: () => {
             ElMessage({
@@ -114,7 +114,7 @@
 
   // 编辑数据
   function updateSceneModuleFun(data: SceneModule) {
-    console.log('edit', data);
+    // console.log('edit', data);
     return updateSceneModule(data)
       .then((res) => {
         console.log(res);