Merge branch 'main_dev' of http://git.yunteng.com/yunteng/thingskit-front into f…

…ix/attribute-distribution

@@ -10,6 +10,7 @@ export const batchImportDevice = (data: ImportDeviceParams) => {
     {
     {
       url: BatchImportApi.IMPORT,
       url: BatchImportApi.IMPORT,
       data,
       data,
+      timeout: 1000 * 60 * 60,
     },
     },
     { joinPrefix: false }
     { joinPrefix: false }
   );
   );

@@ -171,7 +171,7 @@
 
 
   const resize = async () => {
   const resize = async () => {
     const { height } = unref(getContainerSize);
     const { height } = unref(getContainerSize);
-    height && setProps({ maxHeight: height - 100, scroll: { x: 470, y: height - 100 } });
+    height && setProps({ maxHeight: height - 110, scroll: { x: 470, y: height - 110 } });
     await nextTick();
     await nextTick();
     redoHeight();
     redoHeight();
   };
   };

@@ -216,10 +216,13 @@
     :class="!getDesign.showTime && 'p-5'"
     :class="!getDesign.showTime && 'p-5'"
   >
   >
     <DeviceName :config="config" />
     <DeviceName :config="config" />
-    <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
-    <div class="text-gray-500 text-xs text-center truncate">{{
-      getDesign.attribute || '湿度'
-    }}</div>
+    <div class="w-full h-full flex flex-1 flex-col justify-center items-center">
+      <div ref="chartRefEl" class="flex-1 w-full h-6/7 flex flex-col justify-center items-center">
+      </div>
+      <div class="text-gray-500 text-xs text-center truncate">{{
+        getDesign.attribute || '湿度'
+      }}</div>
+    </div>
     <UpdateTime v-if="getDesign.showTime" :time="time" />
     <UpdateTime v-if="getDesign.showTime" :time="time" />
   </main>
   </main>
 </template>
 </template>

@@ -226,10 +226,13 @@
     :class="!getDesign.showTime && 'p-5'"
     :class="!getDesign.showTime && 'p-5'"
   >
   >
     <DeviceName :config="config" />
     <DeviceName :config="config" />
-    <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
-    <div class="text-gray-500 text-xs text-center truncate">{{
-      getDesign.attribute || '湿度'
-    }}</div>
+    <div class="flex w-full h-full flex-col justify-center items-center flex-1">
+      <div ref="chartRefEl" class="flex-1 w-full h-6/7 flex-col justify-center items-center flex">
+      </div>
+      <div class="text-gray-500 text-xs text-center truncate">{{
+        getDesign.attribute || '湿度'
+      }}</div>
+    </div>
     <UpdateTime v-if="getDesign.showTime" :time="time" />
     <UpdateTime v-if="getDesign.showTime" :time="time" />
   </main>
   </main>
 </template>
 </template>

@@ -316,7 +316,8 @@
 <template>
 <template>
   <main class="w-full h-full flex flex-col justify-center items-center">
   <main class="w-full h-full flex flex-col justify-center items-center">
     <DeviceName :config="config" />
     <DeviceName :config="config" />
-    <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
+    <div ref="chartRefEl" class="flex-1 w-full h-full justify-center items-center flex-col flex">
+    </div>
     <!-- <UpdateTime :time="time" /> -->
     <!-- <UpdateTime :time="time" /> -->
   </main>
   </main>
 </template>
 </template>

@@ -208,10 +208,13 @@
     :class="!getDesign.showTime && 'p-5'"
     :class="!getDesign.showTime && 'p-5'"
   >
   >
     <DeviceName :config="config" />
     <DeviceName :config="config" />
-    <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
-    <div class="text-gray-500 text-xs text-center truncate">{{
-      getDesign.attribute || '速度'
-    }}</div>
+    <div class="flex flex-1 flex-col justify-center items-center w-full h-full">
+      <div ref="chartRefEl" class="flex-1 w-full h-6/7 flex flex-col justify-center items-center">
+      </div>
+      <div class="text-gray-500 text-xs text-center truncate">{{
+        getDesign.attribute || '速度'
+      }}</div>
+    </div>
     <UpdateTime v-if="getDesign.showTime" :time="time" />
     <UpdateTime v-if="getDesign.showTime" :time="time" />
   </main>
   </main>
 </template>
 </template>

@@ -235,10 +235,13 @@
     :class="!getDesign.showTime && 'p-5'"
     :class="!getDesign.showTime && 'p-5'"
   >
   >
     <DeviceName :config="config" />
     <DeviceName :config="config" />
-    <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
-    <div class="text-gray-500 text-xs text-center truncate">{{
-      getDesign.attribute || '温度'
-    }}</div>
+    <div class="w-full h-full flex justify-center items-center flex-1 flex-col">
+      <div ref="chartRefEl" class="flex-1 w-full h-6/7 flex justify-center items-center flex-col">
+      </div>
+      <div class="text-gray-500 text-xs text-center truncate">{{
+        getDesign.attribute || '温度'
+      }}</div>
+    </div>
     <UpdateTime v-show="getDesign.showTime" :time="time" />
     <UpdateTime v-show="getDesign.showTime" :time="time" />
   </main>
   </main>
 </template>
 </template>

@@ -215,9 +215,12 @@
     :class="!getDesign.showTime && 'p-5'"
     :class="!getDesign.showTime && 'p-5'"
   >
   >
     <DeviceName :config="config" />
     <DeviceName :config="config" />
-    <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
-    <div class="text-center text-gray-500 text-xs truncate">
-      {{ getDesign.attribute || '速度' }}
+    <div class="w-full h-full flex justify-center items-center flex-col flex-1">
+      <div ref="chartRefEl" class="flex-1 w-full h-6/7 flex flex-col justify-center items-center">
+      </div>
+      <div class="text-center text-gray-500 text-xs truncate">
+        {{ getDesign.attribute || '速度' }}
+      </div>
     </div>
     </div>
     <UpdateTime v-show="getDesign.showTime" :time="time" />
     <UpdateTime v-show="getDesign.showTime" :time="time" />
   </main>
   </main>

@@ -159,6 +159,7 @@
   });
   });
 
 
   const resize = async () => {
   const resize = async () => {
+    console.log(123321);
     await nextTick();
     await nextTick();
 
 
     // 修改echarts大小
     // 修改echarts大小
@@ -178,7 +179,11 @@
 <template>
 <template>
   <main class="w-full h-full flex flex-col justify-center items-center">
   <main class="w-full h-full flex flex-col justify-center items-center">
     <DeviceName :config="config" />
     <DeviceName :config="config" />
-    <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
+    <div
+      ref="chartRefEl"
+      class="flex-1 w-full h-7/8 flex justify-center items-center flex-col mb-3"
+    >
+    </div>
     <!-- <UpdateTime :time="time" /> -->
     <!-- <UpdateTime :time="time" /> -->
   </main>
   </main>
 </template>
 </template>

@@ -180,7 +180,11 @@
 <template>
 <template>
   <main class="w-full h-full flex flex-col justify-center items-center">
   <main class="w-full h-full flex flex-col justify-center items-center">
     <DeviceName :config="config" />
     <DeviceName :config="config" />
-    <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
+    <div
+      ref="chartRefEl"
+      class="flex-1 w-full h-full flex flex-col justify-center items-center mb-3"
+    >
+    </div>
     <!-- <UpdateTime :time="time" /> -->
     <!-- <UpdateTime :time="time" /> -->
   </main>
   </main>
 </template>
 </template>

@@ -137,7 +137,7 @@
   });
   });
   const resize = async () => {
   const resize = async () => {
     const { height } = unref(getContainerSize);
     const { height } = unref(getContainerSize);
-    height && setProps({ maxHeight: height - 100, scroll: { x: 470, y: height - 100 } });
+    height && setProps({ maxHeight: height - 110, scroll: { x: 470, y: height - 110 } });
 
 
     await nextTick();
     await nextTick();
     redoHeight();
     redoHeight();

@@ -52,7 +52,7 @@
         top: '30%',
         top: '30%',
         left: '6%',
         left: '6%',
         right: '10%',
         right: '10%',
-        bottom: '1%',
+        bottom: '8%',
         containLabel: true,
         containLabel: true,
       },
       },
       xAxis: {
       xAxis: {
@@ -206,9 +206,13 @@
 </script>
 </script>
 
 
 <template>
 <template>
-  <main class="w-full h-full flex flex-col justify-center items-center">
+  <main class="w-full h-full flex flex-col justify-center items-center flex-1">
     <DeviceName :config="config" />
     <DeviceName :config="config" />
-    <div ref="chartRefEl" class="flex-1 w-full h-full"> </div>
+    <div
+      ref="chartRefEl"
+      class="flex-1 w-full h-7/8 flex-col justify-center items-center flex mb-3"
+    >
+    </div>
     <!-- <UpdateTime :time="time" /> -->
     <!-- <UpdateTime :time="time" /> -->
   </main>
   </main>
 </template>
 </template>