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

src/store/modules/processView.ts

@@ -1,9 +1,10 @@
-export const processViewStore = defineStore(
+import { store } from "@/store";
+export const useProcessStore = defineStore(
   "process",
   () => {
     //首页到工序操作传递参数
-    const odersData = ref({});
-    const processInfo = ref({});
+    const odersData = ref<any>({});
+    const processInfo = ref<any>({});
     function setOdersData(obj: object) {
       odersData.value = obj;
     }
@@ -17,3 +18,6 @@ export const processViewStore = defineStore(
     persist: true,
   }
 );
+export function useProcessStoreHook() {
+  return useProcessStore(store);
+}

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

@@ -24,8 +24,8 @@
 </template>
 
 <script lang="ts" setup>
-import { processViewStore } from "@/store";
-const store = processViewStore();
+import { useProcessStore } from "@/store";
+const store = useProcessStore();
 const processInfo = ref({ materialName: "...", materialModel: "..." });
 const substringInfo = ref({});
 onMounted(() => {

src/views/pro-steps/index.vue

@@ -36,9 +36,9 @@
 <script setup>
 import { onMounted } from "vue";
 import Jiluxiang from "@/views/pro-steps/Jiluxiang.vue";
-import { processViewStore } from "@/store";
+import { useProcessStore } from "@/store";
 
-const store = processViewStore();
+const store = useProcessStore();
 defineOptions({ name: "ProSteps" });
 const route = useRoute();
 //配置标签信息Data
@@ -140,7 +140,6 @@ onMounted(() => {
 .routerView {
   display: flex;
   flex: 1;
-  background-color: red;
   overflow-y: auto;
 }
 

src/views/process/components/order.vue

@@ -44,9 +44,10 @@
 
 <script lang="ts" setup>
 import { reactive, ref } from "vue";
-import { processViewStore } from "@/store";
+import { useProcessStore } from "@/store";
+
+const store = useProcessStore();
 const router = useRouter();
-const store = processViewStore();
 defineProps<{
   hoverStatus?: boolean;
   item: object;

src/views/process/components/steps.vue

@@ -36,8 +36,9 @@
 
 <script lang="ts" setup>
 import router from "@/router";
-import { processViewStore } from "@/store";
-const store = processViewStore();
+import { useProcessStore } from "@/store";
+
+const store = useProcessStore();
 defineProps<{
   opsArray?: object;
   selectStepIndex: number;

src/views/process/currentProduction.vue

@@ -16,9 +16,9 @@
 import CurrentOrderInfo from "@/views/process/components/currentOrderInfo.vue";
 import Operate from "@/views/process/components/operate.vue";
 import ScanCode from "@/views/process/components/scanCode.vue";
-import { processViewStore } from "@/store";
+import { useProcessStore } from "@/store";
 
-const store = processViewStore();
+const store = useProcessStore();
 const router = useRouter();
 const orderData = { name: 2, id: 44 };
 const click = (itemValue) => {

src/views/process/orders.vue

@@ -9,8 +9,9 @@
 
 <script lang="ts" setup>
 import Order from "@/views/process/components/order.vue";
-import { processViewStore } from "@/store";
-const store = processViewStore();
+import { useProcessStore } from "@/store";
+
+const store = useProcessStore();
 defineProps<{
   ordersSum?: number;
 }>();