feat: 1.添加时间轴工具箱折叠功能 2.添加联网超时时间

CHANGELOG.md

@@ -161,6 +161,7 @@
  - | 修改时间轴bug | [fe08608](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/fe08608)
  - | 修改样式 | [f0ddc90](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/f0ddc90)
  - | 修改添加基本信息 压缩代码 | [ce20ff7](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/ce20ff7)
+ - | 修改照顾着负担量表按钮名字 | [02b001e](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/02b001e)
  - | 修改脑力测评+选项 展示问题 | [c0ccb4e](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/c0ccb4e)
  - | 修改药物使用记录验证必填项逻辑 | [14ad8ee](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/14ad8ee)
  - | 修改角色栏组件 | [a54c601](http://101.201.226.163:3000/binbin0314/yanyuan_js/commits/a54c601)

src/pagesProject/project/components/ConfigInfo/components/Medicine.vue

@@ -15,7 +15,7 @@
         </view>
         <!-- 内容区 -->
         <view v-if="item.open" class="w-full mt-3">
-          <MedicineDetail :detail="item" @showToast="showToast" v-if="item && item.id" />
+          <MedicineDetail @queryMedicine="queryMedicine" :detail="item" @showToast="showToast" v-if="item && item.id" />
         </view>
       </view>
     </view>
@@ -106,7 +106,7 @@ export default {
               item.open = false;
             }
           });
-          this.itemList = date;
+          this.itemList = [...date];
         }
       } catch (error) {
         console.error('error: ', error);

src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue

@@ -376,6 +376,7 @@ export default {
           params[item.label] = '未服用';
         }
         await this.$u.api.updateMedicine(params);
+        this.$emit('queryMedicine');
         this.$emit('showToast', 'success', '修改成功');
       } catch (error) {
         console.error('error: ', error);

src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue

@@ -77,7 +77,7 @@ export default {
         })
         .exec();
 
-      this.cHeight = uni.upx2px(400);
+      this.cHeight = uni.upx2px(420);
       setTimeout(() => {
         this.getData();
       }, 1000);

src/pagesProject/project/components/Evaluated/components/EvaluatedDetail.vue

@@ -2,11 +2,16 @@
   <view class="my-2">
     <!-- 工具箱 -->
     <view v-if="train.tools.length" class="mb-2">
-      <u-radio-group v-model="radioDefaultValue">
-        <u-radio @change="radioChange(tool)" v-for="(tool, index) in train.tools" :key="index" :name="tool.toolId">
-          {{ tool.toolCode }}
-        </u-radio>
-      </u-radio-group>
+      <view :class="showMore ? 'h-compress overflow-hidden' : ''">
+        <u-radio-group v-model="radioDefaultValue">
+          <u-radio @change="radioChange(tool)" v-for="(tool, index) in train.tools" :key="index" :name="tool.toolId">
+            {{ tool.toolCode }}
+          </u-radio>
+        </u-radio-group>
+      </view>
+      <view class="flex flex-row-reverse text-xs text-blue-400 mt-1" @click="checkShowMore">
+        {{ showMore ? '查看更多' : '收起' }}
+      </view>
     </view>
     <view v-if="train.contentDetails.length" class="text-xs mb-2">
       <!-- 训练目标 训练元素 训练原理 训练步骤 -->
@@ -80,6 +85,7 @@ export default {
       ],
       // u-radio-group的v-model绑定的值如果设置为某个radio的name，就会被默认选中
       value: 'orange',
+      showMore: true,
     };
   },
 
@@ -109,8 +115,16 @@ export default {
         console.error('error: ', error);
       }
     },
+
+    checkShowMore() {
+      this.showMore = !this.showMore;
+    },
   },
 };
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+.h-compress {
+  height: 160rpx;
+}
+</style>

src/pagesProject/project/components/Evaluated/components/UCharts.vue

@@ -71,7 +71,7 @@ export default {
         context: uni.createCanvasContext(this.canvasId, this),
         type: 'radar',
         fontSize: 11,
-        padding: [-20, -15, -40, -10],
+        padding: [-10, -10, -40, -10],
         legend: { show: false },
         background: '#FFFFFF',
         pixelRatio: this.pixelRatio,

src/pagesYanyuan/add-info/add-info.vue

@@ -113,6 +113,13 @@ export default {
           if (item.frequencyValue) {
             item.frequencyValue = null;
           }
+          if (item.showClasses) {
+            item.showClasses = false;
+            item.showOther = false;
+            item.classesValue = null;
+            item.frequencyValue = null;
+            item.otherValue = null;
+          }
         });
       });
       this.infoList = [...array];

src/pagesYanyuan/assess/assess.vue

@@ -131,7 +131,7 @@ export default {
         setTimeout(() => {
           this.backProject();
           this.setTimeNode(Date.now());
-        }, 3000);
+        }, 1000);
       } catch (error) {
         console.error('error: ', error);
         this.$t.ui.showToast(error.msg || '提交失败');

src/utils/request.js

@@ -7,6 +7,12 @@ const install = (Vue, vm) => {
     loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透
     // 配置请求头信息
     header: { 'content-type': 'application/json;charset=UTF-8' },
+    getTask: task => {
+      // 相当于设置了请求超时时间20s
+      setTimeout(() => {
+        task.abort();
+      }, 20000);
+    },
   });
 
   // 请求拦截部分，如配置，每次请求前都会执行