Merge branch 'feat/add-task-components-lesChamps' into 'main_dev'

fix: 修改任务中心命令内容bug

See merge request yunteng/thingskit-front!677

@@ -7,7 +7,7 @@ import {
 } from '../DetailModal/config';
 import { TaskStatusEnum, TaskTargetEnum, TaskTargetNameEnum } from '../../config';
 import { h } from 'vue';
-import { Tag, Textarea } from 'ant-design-vue';
+import { Tag, Input } from 'ant-design-vue';
 import { TaskStatusNameEnum } from '../../config';
 import { TaskRecordType } from '/@/api/task/model';
 import { TaskTypeNameEnum } from '../../config';
@@ -105,7 +105,12 @@ export const schemas: DescItem[] = [
     field: 'rpcCommand',
     label: '命令内容',
     render(_val: any, data: TaskRecordType) {
-      return h(Textarea, { value: data.executeContent.pushContent.rpcCommand } as Recordable);
+      const value = data.executeContent.pushContent.rpcCommand;
+      return h(Input.TextArea, {
+        value: typeof value == 'object' ? JSON.stringify(value) : value,
+        autoSize: true,
+        style: { border: 'none', padding: 0 },
+      } as Recordable);
     },
   },
   {

@@ -275,15 +275,12 @@
   const { getNumberValue } = useReceiveValue();
   const updateFn: MultipleDataFetchUpdateFn = (message, deviceId, attribute) => {
     forEachGroupMessage(message, deviceId, attribute, (attribute, value) => {
-      console.log(value, 'value');
       series.value.forEach((item) => {
         if (item.id === deviceId && item.attribute === attribute) {
           item.value = getNumberValue(value);
         }
       });
-      console.log(value);
     });
-    console.log(series, 'series');
     unref(chartInstance)?.setOption({
       series: [{ data: unref(series), pointer: { show: false } }],
       color: unref(series).map((item) => item.title.color),

@@ -33,8 +33,8 @@
   const defaultValue: PercentType[] = [
     {
       value: 20,
-      fontColor: '#19eff',
-      backgroundColor: '#19eff',
+      fontColor: '#377dff',
+      backgroundColor: '#377dff',
       unit: '℃',
       deviceName: '温度',
       attribute: '1',
@@ -122,6 +122,13 @@
       </div>
       <div>
         <Progress :strokeColor="item.backgroundColor" :percent="item.value" :showInfo="false" />
+        <!-- <Slider
+          :style="{ '--slider-color': item.backgroundColor }"
+          v-model:value="item.value"
+          :disabled="true"
+          :min="0"
+          :max="index == 0 ? 100 : 1000"
+        /> -->
       </div>
     </div>
   </main>
@@ -130,4 +137,14 @@
   // :deep(.ant-progress-success-bg, .ant-progress-bg) {
   //   background: '#2196F3' !important;
   // }
+  // :deep(.ant-slider-handle) {
+  //   all: unset;
+  // }
+  // :deep(.ant-slider-track) {
+  //   background: var(--slider-color) !important;
+  //   height: 8px;
+  // }
+  // :deep(.ant-slider-rail) {
+  //   height: 8px;
+  // }
 </style>