Browse Source

Merge branch 'farmer' of http://www.sysuimars.cn:3000/feiniao/feiniao-farm-h5 into farmer

lxf 1 day ago
parent
commit
ec39118c36

+ 1 - 0
src/views/old_mini/home/subPages/prescriptionPage.vue

@@ -599,6 +599,7 @@ async function submit() {
                     localStorage.setItem("selectedFarmName", res.data.name);
                     router.replace('/growth_report');
                 }
+                ElMessage.success('创建成功');
                 // return true;
             } else {
                 ElMessage.error(res.msg || '提交失败,请重试');

+ 10 - 2
src/views/old_mini/interactionList/index.vue

@@ -17,7 +17,7 @@
                     <div class="item-header">
                         <div class="header-wrapper">
                             <div class="title title-block">{{ item.varietyName }}</div>
-                            <div class="title title-block">{{ item.interactionTypeName }}</div>
+                            <div class="title title-block">{{ item.interactionThemeText }}</div>
                         </div>
                         <div class="status title-block" :class="['urgent-' + item.urgent]" v-if="item.questionStatus === 3">
                             {{
@@ -509,8 +509,16 @@ const loadData = async () => {
             while (item.answerValues.length < item.questionList.length) {
                 item.answerValues.push('');
             }
+            // interactionTypeName 按 : 分割,取第 0 项 + reproductiveName 生成互动主题文案
+            const interactionTypeNameStr = item.interactionTypeName != null ? String(item.interactionTypeName) : '';
+            const interactionTypeNameList = interactionTypeNameStr
+                ? interactionTypeNameStr.split(':').map(s => s.trim()).filter(Boolean)
+                : [];
+            const interactionThemeText = `${interactionTypeNameList[0]}:${item.reproductiveName}`;
             return {
-                ...item
+                ...item,
+                interactionTypeNameList,
+                interactionThemeText,
             };
         });
     } catch (error) {