木星 4 months ago
parent
commit
376f38b082

+ 1 - 1
.env.base

@@ -10,7 +10,7 @@
10 10
 VITE_NODE_ENV=development
11 11
 
12 12
 # 接口前缀
13
-VITE_API_BASE_PATH='https://test.you07.com/link-server'
13
+VITE_API_BASE_PATH='http://192.168.4.194:9098/X3D-server'
14 14
 
15 15
 # 打包路径
16 16
 VITE_BASE_PATH=/

+ 1 - 1
.env.dev

@@ -10,7 +10,7 @@
10 10
 VITE_NODE_ENV=production
11 11
 
12 12
 # 接口前缀
13
-VITE_API_BASE_PATH='https://test.you07.com/link-server'
13
+VITE_API_BASE_PATH='http://192.168.4.194:9098/X3D-server'
14 14
 
15 15
 # 打包路径
16 16
 VITE_BASE_PATH=./

+ 1 - 1
.env.gitee

@@ -2,7 +2,7 @@
2 2
 VITE_NODE_ENV=production
3 3
 
4 4
 # 接口前缀
5
-VITE_API_BASE_PATH='https://test.you07.com/link-server'
5
+VITE_API_BASE_PATH='http://192.168.4.194:9098/X3D-server'
6 6
 
7 7
 # 打包路径
8 8
 VITE_BASE_PATH=/vue-element-plus-admin/

+ 1 - 1
.env.pro

@@ -10,7 +10,7 @@
10 10
 VITE_NODE_ENV=production
11 11
 
12 12
 # 接口前缀
13
-VITE_API_BASE_PATH='https://test.you07.com/link-server'
13
+VITE_API_BASE_PATH='http://192.168.4.194:9098/X3D-server'
14 14
 # 打包路径
15 15
 VITE_BASE_PATH=./
16 16
 

+ 1 - 1
.env.test

@@ -10,7 +10,7 @@
10 10
 VITE_NODE_ENV=production
11 11
 
12 12
 # 接口前缀
13
-VITE_API_BASE_PATH='https://test.you07.com/link-server'
13
+VITE_API_BASE_PATH='http://192.168.4.194:9098/X3D-server'
14 14
 
15 15
 # 打包路径
16 16
 VITE_BASE_PATH=./

+ 2 - 1
index.html

@@ -14,7 +14,8 @@
14 14
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
15 15
     <title><%= title %></title>
16 16
     <script>
17
-     window.VITE_API_BASE_PATH='https://test.you07.com/link-server'
17
+     window.VITE_API_BASE_PATH='http://192.168.4.194:9098/X3D-server'
18
+     window.JumpUrl='https://wisec.you07.com/#/'
18 19
     </script>
19 20
 
20 21
   </head>

+ 21 - 21
mock/role/index.mock.ts

@@ -26,7 +26,7 @@ const adminList = [
26 26
         name: 'TemplateManage',
27 27
         component: 'views/Template/TemplateManage',
28 28
         meta: {
29
-          title: '模板管理',
29
+          title: '区域管理',
30 30
           icon: 'ant-design:dashboard-filled',
31 31
         }
32 32
       }
@@ -100,26 +100,26 @@ const adminList = [
100 100
       },
101 101
     ]
102 102
   },
103
-  {
104
-    path: '/System',
105
-    component: '#',
106
-    redirect: '/System/SystemSetting',
107
-    name: 'System',
108
-    meta: {
109
-      title: '系统设置',
110
-    },
111
-    children: [
112
-      {
113
-        path: 'SystemSetting',
114
-        name: 'SystemSetting',
115
-        component: 'views/System/SystemSetting',
116
-        meta: {
117
-          icon: 'ic:outline-webhook',
118
-          title: '系统设置'
119
-        }
120
-      }
121
-    ]
122
-  }
103
+  // {
104
+  //   path: '/System',
105
+  //   component: '#',
106
+  //   redirect: '/System/SystemSetting',
107
+  //   name: 'System',
108
+  //   meta: {
109
+  //     title: '系统设置',
110
+  //   },
111
+  //   children: [
112
+  //     {
113
+  //       path: 'SystemSetting',
114
+  //       name: 'SystemSetting',
115
+  //       component: 'views/System/SystemSetting',
116
+  //       meta: {
117
+  //         icon: 'ic:outline-webhook',
118
+  //         title: '系统设置'
119
+  //       }
120
+  //     }
121
+  //   ]
122
+  // }
123 123
 ]
124 124
 
125 125
 const testList: string[] = [

+ 1 - 1
src/api/table/index.ts

@@ -21,7 +21,7 @@ export const getTreeTableListApi = (params: any) => {
21 21
   return request.get({ url: '/mock/example/treeList', params })
22 22
 }
23 23
 
24
-//模板管理分页接口
24
+//区域管理分页接口
25 25
 export const getTemplate = (params: any) => {
26 26
   params.page = params.page - 1
27 27
   return request.post({ url: '/zone/template/pageQuery', params })

+ 3 - 2
src/locales/zh-CN.ts

@@ -121,7 +121,7 @@ export default {
121 121
     login: '登录',
122 122
     level: '多级菜单',
123 123
     menu: '菜单',
124
-    menu1: '模板管理',
124
+    menu1: '区域管理',
125 125
     menu11: '菜单1-1',
126 126
     menu111: '菜单1-1-1',
127 127
     menu12: '菜单1-2',
@@ -371,7 +371,7 @@ export default {
371 371
     title: '注意事项'
372 372
   },
373 373
   levelDemo: {
374
-    menu: '模板管理',
374
+    menu: '区域管理',
375 375
     menu2: '资源管理'
376 376
   },
377 377
   searchDemo: {
@@ -400,6 +400,7 @@ export default {
400 400
     sticky: '黏性'
401 401
   },
402 402
   tableDemo: {
403
+    OnlineEditing: '在线编辑',
403 404
     table: '表格',
404 405
     tableDes: '基于 ElementPlus 的 Table 组件二次封装',
405 406
     index: '序号',

+ 1 - 1
src/views/Authority/Role.vue

@@ -222,7 +222,7 @@ const tianjia = async () => {
222 222
   //处理树状结构
223 223
   const transformedData = [
224 224
     {
225
-      label: '模板管理',
225
+      label: '区域管理',
226 226
       id: 1,
227 227
       value: [2, 1]
228 228
     },

+ 2 - 2
src/views/Level/Menu2.vue

@@ -29,7 +29,7 @@ const columns = reactive<TableColumn[]>([
29 29
   },
30 30
   {
31 31
     field: 'mubannane',
32
-    label: '模板名称'
32
+    label: '区域名称'
33 33
   },
34 34
   {
35 35
     field: 'fabutime',
@@ -83,7 +83,7 @@ const text = ref('')
83 83
     <el-input
84 84
       v-model="text"
85 85
       style="width: 200px; height: 43px; margin: 7px"
86
-      placeholder="请输入模板名称"
86
+      placeholder="请输入区域名称"
87 87
     />
88 88
     <ElButton type="primary" size="large" :icon="Search">搜索</ElButton>
89 89
     <ElButton type="success" size="large" :icon="Edit">添加</ElButton>

+ 1 - 1
src/views/Resource/ResourceManage.vue

@@ -260,7 +260,7 @@ const edittab = async (data: TableSlotDefault) => {
260 260
     }
261 261
   ]
262 262
 }
263
-// 添加编辑模板管理
263
+// 添加编辑区域管理
264 264
 const signIn = async () => {
265 265
   const formRef = await getElFormExpose()
266 266
   const formData = await getFormData()

+ 20 - 7
src/views/Template/TemplateManage.vue

@@ -65,7 +65,7 @@ const columns = reactive<TableColumn[]>([
65 65
   },
66 66
   {
67 67
     field: 'zoneName',
68
-    label: '模板名称'
68
+    label: '区域名称'
69 69
   },
70 70
   {
71 71
     field: 'updateTime',
@@ -85,6 +85,9 @@ const columns = reactive<TableColumn[]>([
85 85
             <ElButton type="danger" onClick={() => deletetab(data)}>
86 86
               {t('tableDemo.delete')}
87 87
             </ElButton>
88
+            <ElButton type="primary" onClick={() => OnlineEditing(data)}>
89
+              {t('tableDemo.OnlineEditing')}
90
+            </ElButton>
88 91
           </>
89 92
         )
90 93
       }
@@ -113,6 +116,14 @@ const deletetab = async (data: TableSlotDefault) => {
113 116
     })
114 117
 }
115 118
 
119
+const OnlineEditing = async (data: TableSlotDefault) => {
120
+  console.log('kankankna', data.row.zoneId)
121
+  // 打开一个新窗口或标签,并导航到指定的URL
122
+  console.log('window.open', window.JumpUrl)
123
+  let rul = window.JumpUrl + '?zoneId=' + data.row.zoneId
124
+  window.open(rul, '_blank')
125
+}
126
+
116 127
 const dialogVisible = ref(false)
117 128
 
118 129
 const token = userStore.getToken
@@ -125,7 +136,7 @@ const { getElFormExpose, getFormData } = formMethods
125 136
 const schema = reactive<FormSchema[]>([
126 137
   {
127 138
     field: 'zoneName',
128
-    label: '模板名称',
139
+    label: '区域名称',
129 140
     component: 'Input',
130 141
     colProps: {
131 142
       span: 24
@@ -134,7 +145,7 @@ const schema = reactive<FormSchema[]>([
134 145
       style: {
135 146
         width: '100%'
136 147
       },
137
-      placeholder: '请输入模板名称'
148
+      placeholder: '请输入区域名称'
138 149
     },
139 150
     formItemProps: {
140 151
       rules: [required()]
@@ -148,7 +159,7 @@ const schema = reactive<FormSchema[]>([
148 159
       rules: [required()]
149 160
     },
150 161
     componentProps: {
151
-      action: PATH_URL + '/resource/ossUpload',
162
+      action: PATH_URL + '/resource/manage/uploadImg',
152 163
       headers: headers,
153 164
       showFileList: false,
154 165
       onSuccess: async (_response, uploadFile) => {
@@ -244,7 +255,9 @@ const edittab = async (data: TableSlotDefault) => {
244 255
   formData.templateFileName = data.row.templateFileName
245 256
   formData.templateFilePath = data.row.templateFilePath
246 257
   formData.thumbnail = data.row.thumbnail
247
-  imageUrl.value = data.row.thumbnail
258
+  imageUrl.value = data.row.thumbnail.includes('http')
259
+    ? data.row.thumbnail
260
+    : PATH_URL + data.row.thumbnail
248 261
   formData.zoneId = data.row.zoneId
249 262
   schema[2].componentProps.fileList = [
250 263
     {
@@ -253,7 +266,7 @@ const edittab = async (data: TableSlotDefault) => {
253 266
     }
254 267
   ]
255 268
 }
256
-// 添加编辑模板管理
269
+// 添加编辑区域管理
257 270
 const signIn = async () => {
258 271
   const formRef = await getElFormExpose()
259 272
   const formData = await getFormData()
@@ -325,7 +338,7 @@ const tianjia = async () => {
325 338
       <el-input
326 339
         v-model="text"
327 340
         style="width: 200px; height: 43px; margin: 7px"
328
-        placeholder="请输入模板名称"
341
+        placeholder="请输入区域名称"
329 342
       />
330 343
       <ElButton type="primary" size="large" @click="handersearch" :icon="Search">搜索</ElButton>
331 344
       <ElButton type="success" size="large" @click="tianjia" :icon="Edit">添加</ElButton>