Merge branch 'f-dev' into 'main'

fix：修复设备列表详情 告警详情 详情字段回显问题

See merge request huang/yun-teng-iot-front!225

@@ -3,11 +3,12 @@
     <div :class="`${prefixCls}__links`">
     <div :class="`${prefixCls}__links`">
       <a @click="openWindow(SITE_URL)">{{ t('layout.footer.onlinePreview') }}</a>
       <a @click="openWindow(SITE_URL)">{{ t('layout.footer.onlinePreview') }}</a>
 
 
-      <GithubFilled @click="openWindow(GITHUB_URL)" :class="`${prefixCls}__github`" />
+      <!-- <GithubFilled @click="openWindow(GITHUB_URL)" :class="`${prefixCls}__github`" /> -->
+      <span style="width: 50px; height: 50px; margin-left: 65px"></span>
 
 
       <a @click="openWindow(DOC_URL)">{{ t('layout.footer.onlineDocument') }}</a>
       <a @click="openWindow(DOC_URL)">{{ t('layout.footer.onlineDocument') }}</a>
     </div>
     </div>
-    <div>Copyright &copy;2020 Vben Admin</div>
+    <div>Copyright &copy;2018-2022 云腾五洲</div>
   </Footer>
   </Footer>
 </template>
 </template>
 
 

 export default {
 export default {
-  footer: { onlinePreview: '在线预览', onlineDocument: '在线文档' },
+  footer: { onlinePreview: 'ThingsKit官网', onlineDocument: '在线文档' },
   header: {
   header: {
     // user dropdown
     // user dropdown
     dropdownItemDoc: '文档',
     dropdownItemDoc: '文档',

@@ -2,7 +2,7 @@
 export const GITHUB_URL = 'https://github.com/anncwb/vue-vben-admin';
 export const GITHUB_URL = 'https://github.com/anncwb/vue-vben-admin';
 
 
 // vue-vben-admin-next-doc
 // vue-vben-admin-next-doc
-export const DOC_URL = 'https://vvbin.cn/doc-next/';
+export const DOC_URL = 'https://docs.thingskit.com';
 
 
 // site url
 // site url
-export const SITE_URL = 'https://vvbin.cn/next/';
+export const SITE_URL = 'https://www.thingskit.com';

@@ -54,6 +54,10 @@
         await resetFields();
         await resetFields();
         await setFieldsValue({
         await setFieldsValue({
           ...data,
           ...data,
+          details: JSON.stringify(data?.details?.data).slice(
+            1,
+            JSON.stringify(data?.details?.data).length - 1
+          ),
           severity: alarmLevel(data.severity),
           severity: alarmLevel(data.severity),
           status: statusType(data.status),
           status: statusType(data.status),
         });
         });