Merge branch 'xf_dev' of http://maven.jgiot.com:7012/jiaxiaoqiang/JG-CLIENT-TEMP into xf_dev

src/views/pro-operation/inspect/components/checkForm.vue

@@ -55,8 +55,8 @@ const props = defineProps({
 const SeqArray = ref([]);
 const emits = defineEmits(["update:modelValue", "submit"]);
 const getSeq = async () => {
-  const { data } = await getSeqData(processStore.scanInfo.id);
-  SeqArray.value = data.processWorkSeq;
+  // const { data } = await getSeqData(processStore.scanInfo.id);
+  SeqArray.value = [processStore.useSeqNo];
 };
 onMounted(() => {
   getSeq();

src/views/pro-steps/components/dianjian.vue

@@ -14,7 +14,9 @@
       </div>
       <div class="rightOperate">
         <!-- 占位div -->
-        <div></div>
+        <div style="width: 280px; font-size: 20px">
+          内容：{{ item.content }}
+        </div>
         <div class="operate">
           <div class="describeText operateText">结果</div>
           <div class="operateBox">
@@ -120,7 +122,6 @@ onMounted(() => {
 }
 
 .recordBox {
-  height: 210px;
   background-color: white;
   border-radius: 16px;
   display: flex;