简柏林 / thingskit-front · Commits

Commit 034b01cce7d9c6403e371ccc84f2e7e1c31674ad

Authored by xp.Huang
2 parents df909a25 ca7d3c56

Merge branch 'dev-fix-ww' into 'main_dev' 

perf: 修改产品card模式图标

See merge request yunteng/thingskit-front!576
Inline Side-by-side
Showing 5 changed files with 16 additions and 23 deletions
@@ -8,10 +8,12 @@ VITE_GLOB_PUBLIC_PATH = / @@ -8,10 +8,12 @@ VITE_GLOB_PUBLIC_PATH = /
8 # Please note that no line breaks 8 # Please note that no line breaks
9 9
10 # 本地 10 # 本地
11 -VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-scada","http://localhost:3000/"],["/large-designer", "http://localhost:5555/large-designer/"]] 11 +VITE_PROXY = [["/api","http://222.180.200.114:48080/api"],["/thingskit-scada","http://localhost:3000/"],["/large-designer", "http://localhost:5555/large-designer/"]]
  12 +# VITE_PROXY = [["/api","http://192.168.10.112:8080/api"],["/thingskit-scada","http://localhost:3000/"],["/large-designer", "http://localhost:5555/large-designer/"]]
12 13
13 # 实时数据的ws地址 14 # 实时数据的ws地址
14 -VITE_GLOB_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token= 15 +VITE_GLOB_WEB_SOCKET = ws://222.180.200.114:48080/api/ws/plugins/telemetry?token=
  16 +# VITE_GLOB_WEB_SOCKET = ws://192.168.10.112:48080/api/ws/plugins/telemetry?token=
15 17
16 # Delete console 18 # Delete console
17 VITE_GLOB_DROP_CONSOLE = true 19 VITE_GLOB_DROP_CONSOLE = true
1 -<svg t="1671442803003" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4002" width="200" height="200"><path d="M0 0m178.086957 0l667.826086 0q178.086957 0 178.086957 178.086957l0 667.826086q0 178.086957-178.086957 178.086957l-667.826086 0q-178.086957 0-178.086957-178.086957l0-667.826086q0-178.086957 178.086957-178.086957Z" fill="#2E7BFC" p-id="4003"></path><path d="M758.717217 394.373565v268.866783l-238.191304 134.455652v-268.911304l124.14887-70.054957v94.497391l51.956869-29.985391V429.412174l62.107826-35.038609z m-493.434434 0l238.191304 134.433392v268.866782l-238.191304-134.433391V394.373565zM512 226.304l246.717217 139.241739L512 504.787478l-246.717217-139.241739L512 226.326261z" fill="#FFFFFF" p-id="4004"></path></svg> 1 +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1682599359349" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="30418" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="400"><path d="M482.7904 529.6384H256a10.24 10.24 0 0 0-10.24 10.24V768a10.24 10.24 0 0 0 10.24 10.24h226.7904a10.24 10.24 0 0 0 10.24-10.24v-228.1216a10.24 10.24 0 0 0-10.24-10.24z m-9.0624 218.7264a10.24 10.24 0 0 1-10.24 10.24h-187.8528a10.24 10.24 0 0 1-10.24-10.24v-188.5184a10.24 10.24 0 0 1 10.24-10.24h187.8528a10.24 10.24 0 0 1 10.24 10.24v188.5184zM768 529.6384h-226.7904a10.24 10.24 0 0 0-10.24 10.24V768a10.24 10.24 0 0 0 10.24 10.24H768a10.24 10.24 0 0 0 10.24-10.24v-228.1216a10.24 10.24 0 0 0-10.24-10.24z m-9.3952 218.7264a10.24 10.24 0 0 1-10.24 10.24h-187.8528a10.24 10.24 0 0 1-10.24-10.24v-188.5184a10.24 10.24 0 0 1 10.24-10.24h187.8528a10.24 10.24 0 0 1 10.24 10.24v188.5184zM482.7904 245.76H256a10.24 10.24 0 0 0-10.24 10.24v228.1216a10.24 10.24 0 0 0 10.24 10.24h226.7904a10.24 10.24 0 0 0 10.24-10.24V256a10.24 10.24 0 0 0-10.24-10.24z m-9.0624 218.3936a10.24 10.24 0 0 1-10.24 10.24h-187.8528a10.24 10.24 0 0 1-10.24-10.24v-188.5184a10.24 10.24 0 0 1 10.24-10.24h187.8528a10.24 10.24 0 0 1 10.24 10.24v188.5184z" fill="#608DF5" p-id="30419"></path><path d="M768 245.76h-226.7904a10.24 10.24 0 0 0-10.24 10.24v228.1216a10.24 10.24 0 0 0 10.24 10.24H768a10.24 10.24 0 0 0 10.24-10.24V256a10.24 10.24 0 0 0-10.24-10.24z m-9.3952 218.3936a10.24 10.24 0 0 1-10.24 10.24h-187.8528a10.24 10.24 0 0 1-10.24-10.24v-188.5184a10.24 10.24 0 0 1 10.24-10.24h187.8528a10.24 10.24 0 0 1 10.24 10.24v188.5184z" fill="#E9895D" p-id="30420"></path></svg>
@@ -20,7 +20,7 @@ export enum ConfigurationPermission { @@ -20,7 +20,7 @@ export enum ConfigurationPermission {
20 DESIGN = 'api:yt:dataview:center:get_configuration_info:design', 20 DESIGN = 'api:yt:dataview:center:get_configuration_info:design',
21 PREVIEW = 'api:yt:dataview:center:get_configuration_info:preview', 21 PREVIEW = 'api:yt:dataview:center:get_configuration_info:preview',
22 PUBLISH = 'api:yt:dataview:center:publish', 22 PUBLISH = 'api:yt:dataview:center:publish',
23 - CANCEL_PUBLISH = 'api:yt:dataview:center:cancel_publish', 23 + // CANCEL_PUBLISH = 'api:yt:dataview:center:cancel_publish',
24 } 24 }
25 25
26 // 查询字段 26 // 查询字段
@@ -190,14 +190,9 @@ @@ -190,14 +190,9 @@
190 } 190 }
191 }; 191 };
192 192
193 - const handlePublish = async ({ id }) => {  
194 - await bigScreenPublish(id);  
195 - createMessage.success('发布成功');  
196 - getListData();  
197 - };  
198 - const handleCancelPublish = async ({ id }) => {  
199 - await bigScreenCancelPublish(id);  
200 - createMessage.success('取消发布成功'); 193 + const handlePublish = async ({ id, state }) => {
  194 + state === 0 ? await bigScreenPublish(id) : await bigScreenCancelPublish(id);
  195 + createMessage.success(state === 0 ? '发布成功' : '取消发布成功');
201 getListData(); 196 getListData();
202 }; 197 };
203 </script> 198 </script>
@@ -310,20 +305,14 @@ @@ -310,20 +305,14 @@
310 onClick: handleOpenShareModal.bind(null, item), 305 onClick: handleOpenShareModal.bind(null, item),
311 }, 306 },
312 { 307 {
313 - text: '发布', 308 + text: item.state == 0 ? '发布' : '取消发布',
314 auth: ConfigurationPermission.PUBLISH, 309 auth: ConfigurationPermission.PUBLISH,
315 - icon: 'ant-design:node-expand-outlined', 310 + icon:
  311 + item.state == 0
  312 + ? 'ant-design:node-expand-outlined'
  313 + : 'ant-design:node-collapse-outlined',
316 event: '', 314 event: '',
317 onClick: handlePublish.bind(null, item), 315 onClick: handlePublish.bind(null, item),
318 - disabled: item.state === 0 ? false : true,  
319 - },  
320 - {  
321 - text: '取消发布',  
322 - auth: ConfigurationPermission.CANCEL_PUBLISH,  
323 - icon: 'ant-design:node-collapse-outlined',  
324 - event: '',  
325 - onClick: handleCancelPublish.bind(null, item),  
326 - disabled: item.state === 1 ? false : true,  
327 }, 316 },
328 { 317 {
329 text: '编辑', 318 text: '编辑',
@@ -138,6 +138,7 @@ @@ -138,6 +138,7 @@
138 }, 138 },
139 { 139 {
140 label: record?.customerAdditionalInfo?.isPublic ? '私有' : '公开', 140 label: record?.customerAdditionalInfo?.isPublic ? '私有' : '公开',
  141 + auth: 'api:yt:device:public',
141 icon: record?.customerAdditionalInfo?.isPublic 142 icon: record?.customerAdditionalInfo?.isPublic
142 ? 'ant-design:lock-outlined' 143 ? 'ant-design:lock-outlined'
143 : 'ant-design:unlock-outlined', 144 : 'ant-design:unlock-outlined',
@@ -145,6 +146,7 @@ @@ -145,6 +146,7 @@
145 }, 146 },
146 { 147 {
147 label: '上下线记录', 148 label: '上下线记录',
  149 + auth: 'api:yt:device:online:record',
148 icon: 'ant-design:rise-outlined', 150 icon: 'ant-design:rise-outlined',
149 onClick: handleUpAndDownRecord.bind(null, record), 151 onClick: handleUpAndDownRecord.bind(null, record),
150 }, 152 },