Browse Source

fix:修改字典

lupeng 11 months ago
parent
commit
bda772716c
53 changed files with 100 additions and 100 deletions
  1. 2 2
      src/components/CommonTable/configs/tableConfig.ts
  2. 2 2
      src/views/base/accessories/index.vue
  3. 1 1
      src/views/base/bom/components/version-drawing.vue
  4. 1 1
      src/views/base/bom/components/version-page.vue
  5. 2 2
      src/views/base/bom/index.vue
  6. 2 2
      src/views/base/craftManagement/process/index.vue
  7. 2 2
      src/views/base/craftManagement/route/bindConfig.ts
  8. 2 2
      src/views/base/craftManagement/route/bindProcess.vue
  9. 2 2
      src/views/base/craftManagement/route/components/configs.ts
  10. 2 2
      src/views/base/craftManagement/route/index.vue
  11. 2 2
      src/views/base/defectCheck/index.vue
  12. 2 2
      src/views/base/defectMana/index.vue
  13. 2 2
      src/views/base/information/index.vue
  14. 2 2
      src/views/base/materials/columns.ts
  15. 2 2
      src/views/base/materials/components/choice-item-page.vue
  16. 2 2
      src/views/base/materials/components/drawing-page.vue
  17. 1 1
      src/views/base/modeling/production-line/components/capacity-page.vue
  18. 2 2
      src/views/base/modeling/production-line/components/columns.ts
  19. 2 2
      src/views/base/modeling/station/columns.ts
  20. 2 2
      src/views/base/modeling/station/components/columns.ts
  21. 1 1
      src/views/base/modeling/station/components/station-page.vue
  22. 2 2
      src/views/base/modeling/station/index.vue
  23. 2 2
      src/views/base/skill/components/edit-skill.vue
  24. 2 2
      src/views/base/skill/components/user-skill.vue
  25. 2 2
      src/views/base/skill/components/view-skill.vue
  26. 2 2
      src/views/base/skill/index.vue
  27. 2 2
      src/views/demo/hooksDemo.vue
  28. 2 2
      src/views/demo/traceabilityComDemo.vue
  29. 1 1
      src/views/plan/finishProduct/components/detail-stock.vue
  30. 1 1
      src/views/plan/finishProduct/components/in-stock.vue
  31. 2 2
      src/views/plan/finishProduct/index.vue
  32. 2 2
      src/views/plan/schedule/index.vue
  33. 2 2
      src/views/pro/traceability/components/checkCom.vue
  34. 2 2
      src/views/pro/traceability/components/equitCom.vue
  35. 2 2
      src/views/pro/traceability/components/faultCom.vue
  36. 2 2
      src/views/pro/traceability/components/materialsCom.vue
  37. 2 2
      src/views/pro/traceability/components/mediaCom.vue
  38. 2 2
      src/views/pro/traceability/components/recordCom.vue
  39. 2 2
      src/views/pro/traceability/components/traceabilityCom.vue
  40. 2 2
      src/views/quality/faultHandle/components/fault-detail.vue
  41. 2 2
      src/views/quality/faultHandle/components/fault-examine.vue
  42. 2 2
      src/views/quality/faultHandle/components/fault-handle.vue
  43. 2 2
      src/views/quality/faultHandle/components/fault-page.vue
  44. 2 2
      src/views/quality/faultHandle/index.vue
  45. 2 2
      src/views/quality/unqualified/columns.ts
  46. 2 2
      src/views/quality/unqualified/index.vue
  47. 2 2
      src/views/report/statistics/dailystorage/index.vue
  48. 2 2
      src/views/report/statistics/outputstatistics/index.vue
  49. 2 2
      src/views/report/statistics/processanomaly/index.vue
  50. 2 2
      src/views/report/statistics/stationbeat/index.vue
  51. 2 2
      src/views/report/statistics/workeveryday/index.vue
  52. 2 2
      src/views/storage/vehicleMaterial/index.vue
  53. 2 2
      src/views/system/post/components/post-skill.vue

+ 2 - 2
src/components/CommonTable/configs/tableConfig.ts

@@ -1,5 +1,5 @@
-import { useDictionaryStoreHook } from "@/store";
-const { dicts } = useDictionaryStoreHook();
+import { useDictionaryStore } from "@/store";
+const { dicts } = useDictionaryStore();
 import dictDataUtil from "@/common/configs/dictDataUtil";
 export const tableConfig = {
 	MARTERIAL: {

+ 2 - 2
src/views/base/accessories/index.vue

@@ -40,10 +40,10 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 // 传入一个url,后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =

+ 1 - 1
src/views/base/bom/components/version-drawing.vue

@@ -40,7 +40,7 @@
   import { useCommonStoreHook } from "@/store";
 
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-  import { useDictionaryStoreHook } from "@/store";
+  import { useDictionaryStore } from "@/store";
   const test = () => {
     isShowTable.value = true;
     tableType.value = tableType.value == 1 ? 2 : 1;

+ 1 - 1
src/views/base/bom/components/version-page.vue

@@ -47,7 +47,7 @@
   import { useCommonStoreHook } from "@/store";
 
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-  import { useDictionaryStoreHook } from "@/store";
+  import { useDictionaryStore } from "@/store";
   const test = () => {
     isShowTable.value = true;
     tableType.value = tableType.value == 1 ? 2 : 1;

+ 2 - 2
src/views/base/bom/index.vue

@@ -110,7 +110,7 @@
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "../../../hooks/userCrud";
 import ButtonPermKeys from "../../../common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "../../../store/index";
+import { useCommonStoreHook, useDictionaryStore } from "../../../store/index";
 
 import {
   getMaterialDetails,
@@ -122,7 +122,7 @@ import {
 } from "@/api/bom";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 const router = useRouter();
 const route = useRoute();
 

+ 2 - 2
src/views/base/craftManagement/process/index.vue

@@ -58,10 +58,10 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 // 传入一个url,后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =

+ 2 - 2
src/views/base/craftManagement/route/bindConfig.ts

@@ -1,5 +1,5 @@
-import { useDictionaryStoreHook } from "@/store";
-const { dicts } = useDictionaryStoreHook();
+import { useDictionaryStore } from "@/store";
+const { dicts } = useDictionaryStore();
 
 const switchOp = [
   {

+ 2 - 2
src/views/base/craftManagement/route/bindProcess.vue

@@ -106,7 +106,7 @@ import {
 } from "@element-plus/icons-vue";
 import { VueDraggable } from "vue-draggable-plus";
 import { processTreeList } from "@/api/craft/process/index";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import {
   processesByRouteId,
   saveProcessInRoute,
@@ -120,7 +120,7 @@ const router = useRouter();
 const route = useRoute();
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 // 顶部====================
 const back = () => {

+ 2 - 2
src/views/base/craftManagement/route/components/configs.ts

@@ -1,5 +1,5 @@
-import { useDictionaryStoreHook } from "@/store";
-const { dicts } = useDictionaryStoreHook();
+import { useDictionaryStore } from "@/store";
+const { dicts } = useDictionaryStore();
 
 export const getTableConfig = (id : string) => {
 	return {

+ 2 - 2
src/views/base/craftManagement/route/index.vue

@@ -94,11 +94,11 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
 import dictDataUtil from "@/common/configs/dictDataUtil";
-import { useDictionaryStoreHook } from "@/store";
+import { useDictionaryStore } from "@/store";
 import { copyRoute } from "@/api/craft/route/index";
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 const testDebunce = () => {
   console.log("执行了事件");

+ 2 - 2
src/views/base/defectCheck/index.vue

@@ -35,10 +35,10 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 // 传入一个url,后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =

+ 2 - 2
src/views/base/defectMana/index.vue

@@ -58,10 +58,10 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 // 传入一个url,后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =

+ 2 - 2
src/views/base/information/index.vue

@@ -67,13 +67,13 @@
 <script setup lang="ts">
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import {updateDrawaing} from "@/api/drawing";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import PDFView from "@/components/PDFView/index.vue";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 const fileUrl = ref(""); //单文件
 const pdfUrlList = ref([]);
 const srcList = ref([]);

+ 2 - 2
src/views/base/materials/columns.ts

@@ -1,5 +1,5 @@
-import { useDictionaryStoreHook } from "@/store";
-const { dicts } = useDictionaryStoreHook();
+import { useDictionaryStore } from "@/store";
+const { dicts } = useDictionaryStore();
 export const columns = [
   { label: "物料编码", prop: "materialCode", width: 130,overHidden: true,search: true ,rules: [{
       required: true,

+ 2 - 2
src/views/base/materials/components/choice-item-page.vue

@@ -20,9 +20,9 @@
 import {defineProps, ref} from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import { useCommonStoreHook } from "@/store";
-import { useDictionaryStoreHook } from "@/store";
+import { useDictionaryStore } from "@/store";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 const test = () => {
   isShowTable.value = true;
   tableType.value = tableType.value == 1 ? 2 : 1;

+ 2 - 2
src/views/base/materials/components/drawing-page.vue

@@ -68,9 +68,9 @@ import ButtonPermKeys from "@/common/configs/buttonPermission";
 import { useCommonStoreHook } from "@/store";
 
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-import { useDictionaryStoreHook } from "@/store";
+import { useDictionaryStore } from "@/store";
 import { addDrawing,getDrawing } from "@/api/drawing";
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 const filePath = import.meta.env.VITE_APP_UPLOAD_URL;
 const test = () => {
   isShowTable.value = true;

+ 1 - 1
src/views/base/modeling/production-line/components/capacity-page.vue

@@ -54,7 +54,7 @@
   import { useCommonStoreHook } from "@/store";
 
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-  import { useDictionaryStoreHook } from "@/store";
+  import { useDictionaryStore } from "@/store";
   import {
     addStationDevice,
   } from "@/api/station";

+ 2 - 2
src/views/base/modeling/production-line/components/columns.ts

@@ -1,5 +1,5 @@
-import { useDictionaryStoreHook } from "@/store";
-const { dicts } = useDictionaryStoreHook();
+import { useDictionaryStore } from "@/store";
+const { dicts } = useDictionaryStore();
 export const columns = [
   {
     label: "物料编号",

+ 2 - 2
src/views/base/modeling/station/columns.ts

@@ -1,5 +1,5 @@
-import { useDictionaryStoreHook } from "@/store";
-const { dicts } = useDictionaryStoreHook();
+import { useDictionaryStore } from "@/store";
+const { dicts } = useDictionaryStore();
 
 const ctableRef=ref(null);
 export const columns = [

+ 2 - 2
src/views/base/modeling/station/components/columns.ts

@@ -1,5 +1,5 @@
-import { useDictionaryStoreHook } from "@/store";
-const { dicts } = useDictionaryStoreHook();
+import { useDictionaryStore } from "@/store";
+const { dicts } = useDictionaryStore();
 export const columns = [
   {
     label: "设备编号",

+ 1 - 1
src/views/base/modeling/station/components/station-page.vue

@@ -48,7 +48,7 @@
   import { useCommonStoreHook } from "@/store";
 
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-  import { useDictionaryStoreHook } from "@/store";
+  import { useDictionaryStore } from "@/store";
   import { columns } from "./columns";
   import {
     addStationDevice,

+ 2 - 2
src/views/base/modeling/station/index.vue

@@ -71,8 +71,8 @@
   import { useCommonStoreHook } from "@/store";
   import { updateStation } from "@/api/station";
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-  import { useDictionaryStoreHook } from "@/store";
-  const { dicts } = useDictionaryStoreHook();
+  import { useDictionaryStore } from "@/store";
+  const { dicts } = useDictionaryStore();
   const test = () => {
     isShowTable.value = true;
     tableType.value = tableType.value == 1 ? 2 : 1;

+ 2 - 2
src/views/base/skill/components/edit-skill.vue

@@ -45,13 +45,13 @@
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import SingleUpload from "@/components/Upload/SingleUpload.vue";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 import {getPostSkill,addEmployeeSkill,getSkillDetail} from "@/api/system/skill";
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 const test = () => {
   isShowTable.value = true;

+ 2 - 2
src/views/base/skill/components/user-skill.vue

@@ -64,13 +64,13 @@
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import SingleUpload from "@/components/Upload/SingleUpload.vue";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 import {getPostSkill,addEmployeeSkill} from "@/api/system/skill";
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 const test = () => {
   isShowTable.value = true;

+ 2 - 2
src/views/base/skill/components/view-skill.vue

@@ -32,13 +32,13 @@
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import SingleUpload from "@/components/Upload/SingleUpload.vue";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 import {getPostSkill,addEmployeeSkill,getSkillDetail} from "@/api/system/skill";
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 const test = () => {
   isShowTable.value = true;

+ 2 - 2
src/views/base/skill/index.vue

@@ -80,13 +80,13 @@
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import editSkill from "@/views/base/skill/components/edit-skill.vue"
 import viewSkill from "@/views/base/skill/components/view-skill.vue"
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 const test = () => {
   isShowTable.value = true;

+ 2 - 2
src/views/demo/hooksDemo.vue

@@ -96,7 +96,7 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import SingleUpload from "@/components/Upload/SingleUpload.vue";
 import PDFView from "@/components/PDFView/index.vue";
 // 测试上传文件相关
@@ -111,7 +111,7 @@ const testFiles = () => {
 };
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 // 公共弹窗相关
 const ctableRef = ref(null);

+ 2 - 2
src/views/demo/traceabilityComDemo.vue

@@ -15,10 +15,10 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 // 传入一个url,后面不带/
 const {

+ 1 - 1
src/views/plan/finishProduct/components/detail-stock.vue

@@ -29,7 +29,7 @@
   import { ref, getCurrentInstance } from "vue";
   import { useCrud } from "@/hooks/userCrud";
   import ButtonPermKeys from "@/common/configs/buttonPermission";
-  import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+  import { useCommonStoreHook, useDictionaryStore } from "@/store";
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
   import {addStock} from "@/api/inStock"
   import dictDataUtil from "@/common/configs/dictDataUtil";

+ 1 - 1
src/views/plan/finishProduct/components/in-stock.vue

@@ -47,7 +47,7 @@
   import { ref, getCurrentInstance } from "vue";
   import { useCrud } from "@/hooks/userCrud";
   import ButtonPermKeys from "@/common/configs/buttonPermission";
-  import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+  import { useCommonStoreHook, useDictionaryStore } from "@/store";
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
   import {addStock} from "@/api/inStock"
   import dictDataUtil from "@/common/configs/dictDataUtil";

+ 2 - 2
src/views/plan/finishProduct/index.vue

@@ -56,13 +56,13 @@
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import inStocks from "@/views/plan/finishProduct/components/in-stock.vue"
 import detailStocks from "@/views/plan/finishProduct/components/detail-stock.vue"
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 const stockDetail=ref({});
 const test = () => {
   isShowTable.value = true;

+ 2 - 2
src/views/plan/schedule/index.vue

@@ -19,12 +19,12 @@ import { ref } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import { queryStationByLineId } from "@/api/station";
-import { useDictionaryStoreHook } from "@/store";
+import { useDictionaryStore } from "@/store";
 import { getStatistics } from "@/api/order/index";
 import * as echarts from "echarts";
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 // 传入一个url,后面不带/
 const { form, data, option, search, page, toDeleteIds, Methords, Utils } =

+ 2 - 2
src/views/pro/traceability/components/checkCom.vue

@@ -24,10 +24,10 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 // 传入一个url,后面不带/
 const {

+ 2 - 2
src/views/pro/traceability/components/equitCom.vue

@@ -24,10 +24,10 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 // 传入一个url,后面不带/
 const {

+ 2 - 2
src/views/pro/traceability/components/faultCom.vue

@@ -24,10 +24,10 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 // 传入一个url,后面不带/
 const {

+ 2 - 2
src/views/pro/traceability/components/materialsCom.vue

@@ -24,10 +24,10 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 // 传入一个url,后面不带/
 const {

+ 2 - 2
src/views/pro/traceability/components/mediaCom.vue

@@ -31,10 +31,10 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 const dialog = reactive({
   title: "图片预览",
   visible: false,

+ 2 - 2
src/views/pro/traceability/components/recordCom.vue

@@ -24,10 +24,10 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 // 传入一个url,后面不带/
 const {

+ 2 - 2
src/views/pro/traceability/components/traceabilityCom.vue

@@ -16,10 +16,10 @@ import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ButtonPermKeys from "@/common/configs/buttonPermission";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 
 // 传入一个url,后面不带/
 const {

+ 2 - 2
src/views/quality/faultHandle/components/fault-detail.vue

@@ -75,12 +75,12 @@
   import { ref, getCurrentInstance } from "vue";
   import { useCrud } from "@/hooks/userCrud";
   import ButtonPermKeys from "@/common/configs/buttonPermission";
-  import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+  import { useCommonStoreHook, useDictionaryStore } from "@/store";
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
   import {getFault,getFaultDetails,getSeqNoList} from "@/api/fault"
   import dictDataUtil from "@/common/configs/dictDataUtil";
   // 数据字典相关
-  const { dicts } = useDictionaryStoreHook();
+  const { dicts } = useDictionaryStore();
 
   const test = () => {
     isShowTable.value = true;

+ 2 - 2
src/views/quality/faultHandle/components/fault-examine.vue

@@ -89,12 +89,12 @@
   import { ref, getCurrentInstance } from "vue";
   import { useCrud } from "@/hooks/userCrud";
   import ButtonPermKeys from "@/common/configs/buttonPermission";
-  import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+  import { useCommonStoreHook, useDictionaryStore } from "@/store";
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
   import {getFault,getFaultDetails,updateFault} from "@/api/fault"
   import dictDataUtil from "@/common/configs/dictDataUtil";
   // 数据字典相关
-  const { dicts } = useDictionaryStoreHook();
+  const { dicts } = useDictionaryStore();
 
   const test = () => {
     isShowTable.value = true;

+ 2 - 2
src/views/quality/faultHandle/components/fault-handle.vue

@@ -81,12 +81,12 @@
   import { ref, getCurrentInstance } from "vue";
   import { useCrud } from "@/hooks/userCrud";
   import ButtonPermKeys from "@/common/configs/buttonPermission";
-  import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+  import { useCommonStoreHook, useDictionaryStore } from "@/store";
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
   import {getFault,getFaultDetails,handleEscalationFault} from "@/api/fault"
   import dictDataUtil from "@/common/configs/dictDataUtil";
   // 数据字典相关
-  const { dicts } = useDictionaryStoreHook();
+  const { dicts } = useDictionaryStore();
 
   const test = () => {
     isShowTable.value = true;

+ 2 - 2
src/views/quality/faultHandle/components/fault-page.vue

@@ -88,12 +88,12 @@
   import { ref, getCurrentInstance } from "vue";
   import { useCrud } from "@/hooks/userCrud";
   import ButtonPermKeys from "@/common/configs/buttonPermission";
-  import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+  import { useCommonStoreHook, useDictionaryStore } from "@/store";
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
   import {getFault,getFaultDetails,getSeqNoList,getProcessInfoList,rework} from "@/api/fault"
   import dictDataUtil from "@/common/configs/dictDataUtil";
   // 数据字典相关
-  const { dicts } = useDictionaryStoreHook();
+  const { dicts } = useDictionaryStore();
 
   const test = () => {
     isShowTable.value = true;

+ 2 - 2
src/views/quality/faultHandle/index.vue

@@ -100,11 +100,11 @@
   import { useCrud } from "@/hooks/userCrud";
   import ButtonPermKeys from "@/common/configs/buttonPermission";
   import dictDataUtil from "@/common/configs/dictDataUtil";
-  import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+  import { useCommonStoreHook, useDictionaryStore } from "@/store";
   import FaultExamine from "@/views/quality/faultHandle/components/fault-examine.vue"
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
   // 数据字典相关
-  const { dicts } = useDictionaryStoreHook();
+  const { dicts } = useDictionaryStore();
 
   const test = () => {
     isShowTable.value = true;

+ 2 - 2
src/views/quality/unqualified/columns.ts

@@ -1,5 +1,5 @@
-import { useDictionaryStoreHook } from "../../../store/index";
-const { dicts } = useDictionaryStoreHook();
+import { useDictionaryStore } from "../../../store/index";
+const { dicts } = useDictionaryStore();
 export const columns = [
 
   {

+ 2 - 2
src/views/quality/unqualified/index.vue

@@ -48,11 +48,11 @@
   import { useCrud } from "@/hooks/userCrud";
   import ButtonPermKeys from "@/common/configs/buttonPermission";
   import { columns } from "./columns";
-  import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+  import { useCommonStoreHook, useDictionaryStore } from "@/store";
   import FaultDetail from "@/views/quality/faultHandle/components/fault-detail.vue"
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
   // 数据字典相关
-  const { dicts } = useDictionaryStoreHook();
+  const { dicts } = useDictionaryStore();
 
   const test = () => {
     isShowTable.value = true;

+ 2 - 2
src/views/report/statistics/dailystorage/index.vue

@@ -23,13 +23,13 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import editSkill from "@/views/base/skill/components/edit-skill.vue";
 import { getEchartData } from "@/api/report";
 import * as echarts from "echarts";
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 const editDialog = ref({ visible: false, title: "订单详情" });
 // const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
 //   useCrud({

+ 2 - 2
src/views/report/statistics/outputstatistics/index.vue

@@ -9,13 +9,13 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import editSkill from "@/views/base/skill/components/edit-skill.vue";
 import { getEchartData } from "@/api/report";
 import * as echarts from "echarts";
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 const editDialog = ref({ visible: false, title: "订单详情" });
 const key = ref(false);
 // const { form, data, option, search, page, toDeleteIds, Methords, Utils } =

+ 2 - 2
src/views/report/statistics/processanomaly/index.vue

@@ -41,13 +41,13 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import editSkill from "@/views/base/skill/components/edit-skill.vue";
 import { getEchartData } from "@/api/report";
 import * as echarts from "echarts";
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 const editDialog = ref({ visible: false, title: "订单详情" });
 const key = ref(false);
 // const { form, data, option, search, page, toDeleteIds, Methords, Utils } =

+ 2 - 2
src/views/report/statistics/stationbeat/index.vue

@@ -18,13 +18,13 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import editSkill from "@/views/base/skill/components/edit-skill.vue";
 import { getBeatInfo } from "@/api/report";
 import * as echarts from "echarts";
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 // const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
 //   useCrud({
 //     src: "/api/v1/process/census/completeOrder",

+ 2 - 2
src/views/report/statistics/workeveryday/index.vue

@@ -31,13 +31,13 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import { useCommonStoreHook, useDictionaryStoreHook } from "@/store";
+import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import editSkill from "@/views/base/skill/components/edit-skill.vue";
 import { getOperationList, getOperationInfo } from "@/api/report";
 import * as echarts from "echarts";
 // 数据字典相关
-const { dicts } = useDictionaryStoreHook();
+const { dicts } = useDictionaryStore();
 const editDialog = ref({ visible: false, title: "订单详情" });
 const charts = shallowRef(null);
 const charts2 = shallowRef(null);

+ 2 - 2
src/views/storage/vehicleMaterial/index.vue

@@ -43,8 +43,8 @@
   import { useCommonStoreHook } from "@/store";
 
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
-  import { useDictionaryStoreHook } from "../../../store/index";
-  const { dicts } = useDictionaryStoreHook();
+  import { useDictionaryStore } from "../../../store/index";
+  const { dicts } = useDictionaryStore();
   const test = () => {
     isShowTable.value = true;
     tableType.value = tableType.value == 1 ? 2 : 1;

+ 2 - 2
src/views/system/post/components/post-skill.vue

@@ -38,11 +38,11 @@
   import { ref, getCurrentInstance } from "vue";
   import { useCrud } from "@/hooks/userCrud";
   import ButtonPermKeys from "@/common/configs/buttonPermission";
-  import { useCommonStoreHook, useDictionaryStoreHook } from "@/store/index";
+  import { useCommonStoreHook, useDictionaryStore } from "@/store/index";
   import {addPostSkill} from "../../../../api/system/skill";
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
   // 数据字典相关
-  const { dicts } = useDictionaryStoreHook();
+  const { dicts } = useDictionaryStore();
   const router = useRouter();
   const route = useRoute();