Home Explore Help
Register Sign In
jiaxiaoqiang
/
JG-CLIENT-TEMP
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://192.168.101.4:3000/jiaxiaoqiang/JG-CLIENT-TEMP

jiaxiaoqiang 11 months ago
parent
1437eb537f ee6bdcdd9d
commit
0bfb33167e
12 changed files with 112 additions and 74 deletions
Split View Show Diff Stats
  1. 57 57
      index.html
  2. 1 1
      package.json
  3. 16 0
      src/api/process/index.ts
  4. 13 5
      src/components/RealTimeMsg/index.vue
  5. 1 1
      src/layout/components/header.vue
  6. 3 3
      src/layout/index.vue
  7. 3 3
      src/views/process/components/steps.vue
  8. 4 1
      src/views/process/main.vue
  9. 1 1
      src/views/process/orders.vue
  10. 11 0
      src/views/process/popUpView/checkPop.vue
  11. 1 1
      src/views/storage-in/index.vue
  12. 1 1
      src/views/storage-out/index.vue

+ 57 - 57
index.html
View File 

@@ -1,66 +1,66 @@
 
 <!doctype html>
 
 <html lang="en">
 
-<head>
 
-  <meta charset="UTF-8"/>
 
-  <link href="/favicon.ico" rel="icon"/>
 
-  <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
 
-  <meta
 
-    content="Vue3 + Vite5 + TypeScript5 + Element-Plus 的后台管理模板，配套接口文档和后端源码，vue-element-admin 的 Vue3 版本"
 
-    name="description"
 
-  />
 
-  <meta
 
-    content="vue,element-plus,typescript,vue-element-admin,vue3-element-admin"
 
-    name="keywords"
 
-  />
 
-  <title>晶格智汇</title>
 
-</head>
 
+  <head>
 
+    <meta charset="UTF-8" />
 
+    <link href="/favicon.ico" rel="icon" />
 
+    <meta content="width=device-width, initial-scale=1.0" name="viewport" />
 
+    <meta
 
+      content="Vue3 + Vite5 + TypeScript5 + Element-Plus 的后台管理模板，配套接口文档和后端源码，vue-element-admin 的 Vue3 版本"
 
+      name="description"
 
+    />
 
+    <meta
 
+      content="vue,element-plus,typescript,vue-element-admin,vue3-element-admin"
 
+      name="keywords"
 
+    />
 
+    <title>综合管控采集平台-一体机</title>
 
+  </head>
 
 
-<body>
 
-<div id="app">
 
-  <div class="loader"></div>
 
-</div>
 
-</body>
 
-<script src="/src/main.ts" type="module"></script>
 
+  <body>
 
+    <div id="app">
 
+      <div class="loader"></div>
 
+    </div>
 
+  </body>
 
+  <script src="/src/main.ts" type="module"></script>
 
 
-<style>
 
-  html,
 
-  body,
 
-  #app {
 
-    position: relative;
 
-    display: flex;
 
-    align-items: center;
 
-    justify-content: center;
 
-    width: 100%;
 
-    height: 100%;
 
-  }
 
+  <style>
 
+    html,
 
+    body,
 
+    #app {
 
+      position: relative;
 
+      display: flex;
 
+      align-items: center;
 
+      justify-content: center;
 
+      width: 100%;
 
+      height: 100%;
 
+    }
 
 
-  .loader {
 
-    position: relative;
 
-    width: 40px;
 
-    aspect-ratio: 0.577;
 
-    overflow: hidden;
 
-    clip-path: polygon(0 0, 100% 100%, 0 100%, 100% 0);
 
-    animation: l19 2s infinite linear;
 
-  }
 
+    .loader {
 
+      position: relative;
 
+      width: 40px;
 
+      aspect-ratio: 0.577;
 
+      overflow: hidden;
 
+      clip-path: polygon(0 0, 100% 100%, 0 100%, 100% 0);
 
+      animation: l19 2s infinite linear;
 
+    }
 
 
-  .loader::before {
 
-    position: absolute;
 
-    inset: -150%;
 
-    content: "";
 
-    background: repeating-conic-gradient(
 
-      from 30deg,
 
-      #ffabab 0 60deg,
 
-      #abe4ff 0 120deg,
 
-      #ff7373 0 180deg
 
-    );
 
-    animation: inherit;
 
-    animation-direction: reverse;
 
-  }
 
+    .loader::before {
 
+      position: absolute;
 
+      inset: -150%;
 
+      content: "";
 
+      background: repeating-conic-gradient(
 
+        from 30deg,
 
+        #ffabab 0 60deg,
 
+        #abe4ff 0 120deg,
 
+        #ff7373 0 180deg
 
+      );
 
+      animation: inherit;
 
+      animation-direction: reverse;
 
+    }
 
 
-  @keyframes l19 {
 
-    100% {
 
-      transform: rotate(360deg);
 
+    @keyframes l19 {
 
+      100% {
 
+        transform: rotate(360deg);
 
+      }
 
     }
 
-  }
 
-</style>
 
+  </style>
 
 </html>

+ 1 - 1
package.json
View File 

@@ -1,5 +1,5 @@
 
 {
 
-  "name": "晶格智汇 | 鸿蒙工业系统",
 
+  "name": "综合管控采集平台-一体机",
 
   "version": "1.0.0",
 
   "private": true,
 
   "type": "module",

+ 16 - 0
src/api/process/index.ts
View File 

@@ -36,3 +36,19 @@ export function callItems(data: any) {
 
     data: data,
 
   });
 
 }
 
+// 设备点检列表查询
 
+export function checkList() {
 
+  return request({
 
+    url: "/api/v1/process/equit/checkList",
 
+    method: "get",
 
+  });
 
+}
 
+
 
+// 设备点检操作
 
+export function maintenanceCheck(data: any) {
 
+  return request({
 
+    url: "/api/v1/process/equit/maintenanceCheck",
 
+    method: "post",
 
+    data: data,
 
+  });
 
+}

+ 13 - 5
src/components/RealTimeMsg/index.vue
View File 

@@ -18,7 +18,7 @@
 
       </el-scrollbar>
 
     </div>
 
     <div class="iconBox">
 
-      <el-icon class="icon" :size="40" @click="showStatus = !showStatus">
 
+      <el-icon class="icon" :size="40" @click="changePop">
 
         <Expand v-if="showStatus" />
 
         <Fold v-else />
 
       </el-icon>
 
@@ -39,6 +39,8 @@ const porps = defineProps({
 
 //true关闭 false打开
 
 const showStatus = ref(true);
 
 const messages = ref([]);
 
+//首次通知是否弹框
 
+const firstNotice = ref(false);
 
 const page = ref(1);
 
 const emits = defineEmits(["update:modelValue"]);
 
 const submit = async (item, index) => {
 
@@ -58,12 +60,18 @@ ws.onopen = () => {
 
 ws.onmessage = (event) => {
 
   const receivedMessage = event.data;
 
   messages.value = JSON.parse(receivedMessage).content;
 
-  if (messages.value.length > 0) {
 
-    showStatus.value = false;
 
-  } else {
 
-    showStatus.value = true;
 
+  if (firstNotice.value == false) {
 
+    if (messages.value.length > 0) {
 
+      showStatus.value = false;
 
+    } else {
 
+      showStatus.value = true;
 
+    }
 
   }
 
 };
 
+const changePop = () => {
 
+  showStatus.value = !showStatus.value;
 
+  firstNotice.value = true;
 
+};
 
 ws.onclose = () => {
 
   console.log("实时连接断开");
 
 };

+ 1 - 1
src/layout/components/header.vue
View File 

@@ -2,7 +2,7 @@
 
   <div class="commonHeader">
 
     <div style="width: 155px">
 
       <svg-icon v-if="routeMeta.back" icon-class="back" size="48" @click="commonBack" />
 
-      <svg-icon v-else icon-class="LOGO" style="height: 48px; width: 155px" />
 
+      <!-- <svg-icon v-else icon-class="LOGO" style="height: 48px; width: 155px" /> -->
 
     </div>
 
     <div v-if="routeMeta.back && routeMeta.title" class="middle-title">
 
       {{ routeMeta.title }}

+ 3 - 3
src/layout/index.vue
View File 

@@ -5,9 +5,9 @@
 
       <router-view>
 
         <template #default="{ Component, route }">
 
           <transition enter-active-class="animate__animated animate__fadeIn" mode="out-in">
 
-            <!--            <keep-alive exclude="ProSteps,AppointOut">-->
 
-            <component :is="Component" />
 
-            <!--            </keep-alive>-->
 
+            <keep-alive exclude="Process">
 
+              <component :is="Component" />
 
+            </keep-alive>
 
           </transition>
 
         </template>
 
       </router-view>

+ 3 - 3
src/views/process/components/steps.vue
View File 

@@ -154,7 +154,7 @@ onBeforeUnmount(() => {
 
   margin-left: 40px;
 
   font-size: $f16;
 
   font-weight: 500;
 
-  color: red;
 
+  color: #303030;
 
 }
 
 
 .stepBox {
 
@@ -173,12 +173,12 @@ onBeforeUnmount(() => {
 
 }
 
 
 .stepExistsHover {
 
-  background-color: red;
 
+  background-color: grey;
 
   cursor: not-allowed;
 
 }
 
 
 .stepBoxDisabled {
 
-  background-color: grey;
 
+  background-color: green;
 
   cursor: not-allowed;
 
 }

+ 4 - 1
src/views/process/main.vue
View File 

@@ -11,6 +11,7 @@
 
       </el-col>
 
       <CurrentProduction />
 
     </el-row>
 
+    <CheckPop v-model="checkPop" />
 
   </div>
 
 </template>
 
 
@@ -18,8 +19,10 @@
 
 import Orders from "@/views/process/orders.vue";
 
 import Processes from "@/views/process/processes.vue";
 
 import CurrentProduction from "@/views/process/currentProduction.vue";
 
-
 
+import CheckPop from "./popUpView/checkPop.vue";
 
+import { checkList } from "@/api/process";
 
 defineOptions({ name: "ProcessMain" });
 
+const checkPop = ref(false);
 
 //未完成订单数组
 
 const ordersDataArray = ref([]);
 
 //未完成任务总数

+ 1 - 1
src/views/process/orders.vue
View File 

@@ -134,7 +134,7 @@ onMounted(() => {
 
 }
 
 
 :deep(.el-tabs--card > .el-tabs__header .el-tabs__item) {
 
-  width: 11.5vw;
 
+  width: calc(12.5vw - 15px);
 
   height: 80px;
 
   border-radius: 0;
 
   font-weight: 500;

+ 11 - 0
src/views/process/popUpView/checkPop.vue
View File 

@@ -0,0 +1,11 @@
 
+<template>
 
+  <div class="midPopUp" v-if="modelValue">
 
+    <div class="container" @click.stop></div>
 
+  </div>
 
+</template>
 
+
 
+<script lang="ts" setup>
 
+const modelValue = defineModel<boolean>();
 
+</script>
 
+
 
+<style lang="scss" scoped></style>

+ 1 - 1
src/views/storage-in/index.vue
View File 

@@ -189,7 +189,7 @@ const sureToAdd = () => {
 
 // 流转终点
 
 const destinationList = ref([]);
 
 onMounted(() => {
 
-  getDestinationList().then((res) => {
 
+  getDestinationList(1).then((res) => {
 
     destinationList.value = res.data;
 
   });
 
   getStorageBoxesList({}).then((res) => {

+ 1 - 1
src/views/storage-out/index.vue
View File 

@@ -2,7 +2,7 @@
 
   <div>
 
     <el-row :gutter="20">
 
       <el-col :span="6">
 
-        <div class="type-title">仓盒出库</div>
 
+        <div class="type-title">载具出库</div>
 
         <ScanCodeInput
 
           v-model="boxSearch"
 
           :clearable="true"