wanghao il y a 2 mois
Parent
commit
cd8ed662da
3 fichiers modifiés avec 113 ajouts et 169 suppressions
  1. 41 0
      src/api/braze/index.ts
  2. 72 166
      src/views/pro-steps/components/zhiyin.vue
  3. 0 3
      src/views/pro-steps/index.vue

+ 41 - 0
src/api/braze/index.ts

@@ -0,0 +1,41 @@
+import request from "@/utils/request";
+
+/**
+ * 获取工序钎焊绑定信息,传入工序id
+ * @param id 
+ * @returns 
+ */
+export function operationBrazeQuery(operationId: string | number) {
+  return request({
+    url: `/api/v1/operationBraze/query/${operationId}`,
+    method: "get",
+  });
+}
+
+
+
+/**
+ * 过程钎焊绑定分页查询
+ * @param data
+ * @returns 
+ */
+export function processBrazePage(data: any) {
+  return request({
+    url: `/api/v1/processBraze/page`,
+    method: "post",
+    data
+  });
+}
+
+/**
+ * 更新过程钎焊绑定
+ * @param data
+ * @returns 
+ */
+export function processBrazeUpdate(data: any) {
+  return request({
+    url: `/api/v1/processBraze/update`,
+    method: "post",
+    data
+  });
+}

+ 72 - 166
src/views/pro-steps/components/zhiyin.vue

@@ -1,25 +1,32 @@
 <template>
-  <div class="body1" id="body1" :key="pageKey">
+  <div class="body1" id="body1">
     <div class="left">
       <div style="margin-bottom: 20px">
-        <el-button type="info" @click="reset"> 重置页面 </el-button>
+        <el-select v-model="selectBraze" placeholder="请选择钎焊方式" @change="handleSelectChange">
+          <el-option
+            v-for="item in brazeOption"
+            :key="item.id"
+            :label="item.brazeName"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
       </div>
 
       <el-table
-        :data="tableData1"
+        :data="tableData"
         style="margin-bottom: 20px"
         class="tableView1"
         border
       >
-        <el-table-column prop="a" label="序号" align="center" />
-        <el-table-column prop="b" label="起始端" align="center" />
-        <el-table-column prop="c" label="连接端" align="center" />
-        <el-table-column prop="d" label="标识" align="center" />
-        <el-table-column prop="e" label="定义" align="center" />
-        <el-table-column prop="f" label="线号" align="center" />
-        <el-table-column prop="g" label="线色" align="center" />
+        <el-table-column type="index" label="序号" align="center" />
+        <el-table-column prop="lineStart" label="起始端" align="center" />
+        <el-table-column prop="lineEnd" label="结束端" align="center" />
+        <el-table-column prop="wireDiameter" label="线径" align="center" />
+        <el-table-column prop="length" label="长度" align="center" />
+        <el-table-column prop="lineColor" label="颜色" align="center" />
         <el-table-column
-          label="连接状态"
+          label="状态"
           width="120"
           fixed="right"
           align="center"
@@ -27,39 +34,8 @@
           <template #default="scope">
             <el-button
               type="success"
-              @click="scope.row.status = true"
-              :disabled="scope.row.status"
-            >
-              完成
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-table
-        :data="tableData2"
-        style="width: 100%"
-        v-if="status1"
-        border
-        class="tableView1"
-      >
-        <el-table-column prop="a" label="序号" align="center" />
-        <el-table-column prop="b" label="起始端" align="center" />
-        <el-table-column prop="c" label="连接端" align="center" />
-        <el-table-column prop="d" label="标识" align="center" />
-        <el-table-column prop="e" label="定义" align="center" />
-        <el-table-column prop="f" label="线号" align="center" />
-        <el-table-column prop="g" label="线色" align="center" />
-        <el-table-column
-          label="连接状态"
-          width="120"
-          fixed="right"
-          align="center"
-        >
-          <template #default="scope">
-            <el-button
-              type="success"
-              @click="scope.row.status = true"
-              :disabled="scope.row.status"
+              @click="toFinish(scope.row)"
+              :disabled="scope.row.state == 1"
             >
               完成
             </el-button>
@@ -68,138 +44,68 @@
       </el-table>
     </div>
     <div class="right">
-      <el-image
-        :src="url"
+      <!-- <el-image
+        :src="imageUrl"
         :zoom-rate="1.2"
         :max-scale="7"
         :min-scale="0.2"
-        :preview-src-list="srcList"
-        :initial-index="initialIndex"
         fit="contain"
-      />
+      /> -->
+      <el-scrollbar ref="scrollbarRef" class="pdmView">
+          <!-- <PDFView :need-to-show-pdf="true" :show-pdf-number="3" :is-link="true"
+            pdf-source="http://192.168.101.4:9000/jgfile/2024/04/20/%E7%AC%AC08%E7%AB%A0_%E8%81%9A%E5%90%88%E5%87%BD%E6%95%B0.pdf" /> -->
+          <PDFView
+            :need-to-show-pdf="true"
+            :is-link="true"
+            :pdf-source="baseUrl + imageUrl"
+          />
+        </el-scrollbar>
     </div>
   </div>
 </template>
 
 <script setup>
-const pageKey = ref(false);
-const reset = () => {
-  tableData1.value[0].status = false;
-  tableData1.value[1].status = false;
-  tableData2.value[0].status = false;
-  tableData2.value[1].status = false;
-  tableData2.value[2].status = false;
-  status1.value = false;
-  status2.value = false;
-  setTimeout(() => {
-    url.value = "/images/bz1.png";
-    initialIndex.value = 0;
-  }, 0);
-};
-const status1 = ref(false);
-const status2 = ref(false);
-const initialIndex = ref(0);
-const tableData1 = ref([
-  {
-    a: "1",
-    b: "X2-5",
-    c: "X7-1",
-    d: "-",
-    e: "-",
-    f: "L05",
-    g: "蓝",
-    status: false,
-  },
-  {
-    a: "2",
-    b: "X2-15",
-    c: "X7-2",
-    d: "-",
-    e: "-",
-    f: "L15",
-    g: "蓝",
-    status: false,
-  },
-]);
-const tableData2 = ref([
-  {
-    a: "3",
-    b: "X2-1",
-    c: "X4-6",
-    d: "-",
-    e: "-",
-    f: "L01",
-    g: "黑",
-    status: false,
-  },
-  {
-    a: "4",
-    b: "X2-9",
-    c: "X4-7",
-    d: "-",
-    e: "-",
-    f: "L09",
-    g: "黑",
-    status: false,
-  },
-  {
-    a: "5",
-    b: "X2-10",
-    c: "X4-8",
-    d: "-",
-    e: "-",
-    f: "L10",
-    g: "黑",
-    status: false,
-  },
-]);
-const url = ref("/images/bz1.png");
-const srcList = ref([
-  "/images/bz1.png",
-  "/images/bz2.png",
-  "/images/bz3.png",
-  "/images/bz4.png",
-]);
+import { useProcessStore } from "@/store";
+import {operationBrazeQuery, processBrazePage, processBrazeUpdate} from '@/api/braze'
+const proStore = useProcessStore();
+const selectBraze = ref(null)
+const brazeOption = ref([])
+const baseUrl = import.meta.env.VITE_APP_UPLOAD_URL;
+const getBrazeOption = () => {
+  operationBrazeQuery(proStore.odersData.operationId).then(res => {
+    brazeOption.value = res.data
+  })
+}
+getBrazeOption()
+
+const tableData = ref([])
+const handleSelectChange = (brazeId) => {
+  const data = {
+    brazeId,
+    processId: proStore.scanInfo.id,
+  }
+  processBrazePage(data).then(res => {
+    tableData.value = res.data.records
+  })
+}
+const toFinish = async (row) => {
+  const data = {
+    id: row.id,
+    state: 1
+  }
+  await processBrazeUpdate(data)
+  ElMessage.success('操作成功');
+  handleSelectChange(selectBraze.value)
+}
+
+const imageUrl = ref("")
+watch(tableData, () => {
+  imageUrl.value = ""
+  const data = tableData.value.find(item => item.state == 0)
+  imageUrl.value = data ? data.viewPath : ''
+  console.log(imageUrl.value)
+})
 
-watch(
-  tableData1.value,
-  () => {
-    if (
-      tableData1.value[0].status == true &&
-      tableData1.value[1].status == true
-    ) {
-      status1.value = true;
-    }
-    if (status1.value == false) {
-      url.value = "/images/bz1.png";
-      initialIndex.value = 0;
-    } else {
-      url.value = "/images/bz3.png";
-      initialIndex.value = 2;
-    }
-  },
-  { deep: true }
-);
-watch(
-  tableData2.value,
-  () => {
-    if (
-      tableData2.value[0].status == true &&
-      tableData2.value[1].status == true &&
-      tableData2.value[2].status == true
-    ) {
-      status2.value = true;
-    }
-    if (status2.value == false) {
-      url.value = "/images/bz3.png";
-      initialIndex.value = 2;
-    } else {
-      url.value = "/images/bz4.png";
-      initialIndex.value = 3;
-    }
-  },
-  { deep: true }
-);
 </script>
 
 <style lang="scss" scoped>

+ 0 - 3
src/views/pro-steps/index.vue

@@ -188,9 +188,6 @@ const selectIndex = ref(0);
 
 //配置data固定路由参数等
 const setStepComponents = (data) => {
-  data.push({
-    compentName: "钎焊指引",
-  });
   let resData = [];
   data.forEach((item) => {
     defaultComponents.forEach((obj) => {