Merge remote-tracking branch 'origin/develop' into develop

src/components/drawers/AddFaceteach.vue

@@ -593,8 +593,8 @@ export default {
         state.duration = result.duration;
         if (result.beginTime && result.endTime) {
           state.chooseTime = [
-            dayjs(result.beginTime, "YYYY-MM-DD"),
-            dayjs(result.endTime, "YYYY-MM-DD"),
+            dayjs(result.beginTime, "YYYY-MM-DD HH-mm"),
+            dayjs(result.endTime, "YYYY-MM-DD HH-mm"),
           ];
         } else {
           state.chooseTime = [];

src/views/research/ResearchAdd.vue

@@ -46,7 +46,7 @@
         @del="handleDel"
       />
     </div>
-    <div class="opinion name2">
+    <!-- <div class="opinion name2">
       <div class="namebox">
         <div class="inname" style="margin-top: 13px">您的其他意见</div>
       </div>
@@ -58,7 +58,7 @@
           :maxlength="200"
         />
       </div>
-    </div>
+    </div> -->
     <div class="footer">
       <div class="btn">
         <a-button

src/views/research/components/ResearchAddAsk.vue

@@ -22,7 +22,7 @@
           v-model:value="curItem.valueAsk"
           placeholder="请输入标题名称"
           show-count
-          :maxlength="20"
+          :maxlength="100"
           style="border-radius: 8px"
         />
       </div>
@@ -33,6 +33,7 @@
       </div>
       <div class="in">
         <a-textarea
+        :maxlength="100"
           v-model:value="curItem.valueAskDesc"
           style="height: 148px"
         />

src/views/research/components/ResearchAddItem.vue

@@ -10,7 +10,7 @@
           <a-input
             v-model:value="curItem.inputVal"
             show-count
-            :maxlength="30"
+            :maxlength="100"
             style="border-radius: 8px"
           />
         </div>

src/views/research/components/ResearchAddMulti.vue

@@ -22,7 +22,7 @@
           v-model:value="curItem.valueMutil"
           placeholder="请输入题干名称"
           show-count
-          :maxlength="20"
+          :maxlength="100"
           style="border-radius: 8px"
         />
       </div>

src/views/research/components/ResearchAddPin.vue

@@ -22,7 +22,7 @@
           v-model:value="curItem.valuePin"
           placeholder="请输入标题名称"
           show-count
-          :maxlength="20"
+          :maxlength="100"
           style="border-radius: 8px"
         />
       </div>

src/views/research/components/ResearchAddSingle.vue

@@ -22,7 +22,7 @@
           v-model:value="curItem.valueSingle"
           placeholder="请输入题干名称"
           show-count
-          :maxlength="20"
+          :maxlength="100"
           style="border-radius: 8px"
         />
       </div>