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

src/api/report/index.ts

@@ -32,3 +32,10 @@ export function getOperationInfo(data: string) {
     data,
   });
 }
+export function outTimeInfo(data: string) {
+  return request({
+    url: "/api/v1/process/census/outTime/info",
+    method: "post",
+    data: {}
+  });
+}

src/common/configs/dictDataUtil.ts

@@ -19,6 +19,8 @@ const DictDataUtil = {
     plan_work_order_state: "plan_work_order_state",
     //订单状态
     plan_order_state: "plan_order_state",
+    //预警角色
+    warning_role: "warning_role",
     //设备类型
     device_type: "device_type",
     //设备状态

src/layout/components/NavBar/components/NavbarRight.vue

@@ -153,6 +153,9 @@ const clickItem =(row) =>{
   if(row.msgId === '4'){
     window.open("/outsource",'_blank')
   }
+  if(row.msgId === '5'){
+    window.open("/storage/warningInfo",'_blank')
+  }
 }
 const openMessageDialog = () => {
   handleQuery();

src/views/device/instance/index.vue

@@ -382,7 +382,7 @@ option.value = Object.assign(option.value, {
         }
       },
     },
-    {
+    /*{
       label: "连接状态",
       prop: "collectState",
       width: 100,
@@ -395,7 +395,7 @@ option.value = Object.assign(option.value, {
           return '<b class="el-tag el-tag--warning el-tag--light">未连接</b>';
         }
       },
-    },
+    },*/
     {
       label: "负责人",
       prop: "head",

src/views/report/statistics/outTime/components/PieChart1.vue

@@ -0,0 +1,99 @@
+<!-- 饼图 -->
+<template>
+  <el-card>
+    <div :id="id" :class="className" :style="{ height, width }"></div>
+  </el-card>
+</template>
+
+<script setup lang="ts">
+import * as echarts from "echarts";
+import {defineProps, ref} from "vue";
+
+const props = defineProps({
+  id: {
+    type: String,
+    default: "pieChart",
+  },
+  className: {
+    type: String,
+    default: "",
+  },
+  width: {
+    type: String,
+    default: "200px",
+    required: true,
+  },
+  height: {
+    type: String,
+    default: "200px",
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: [],
+    required: true
+  }
+});
+const options = {
+  title : {
+    text: '订单准时完成率',
+    x:'center'
+  },
+  tooltip : {
+    trigger: 'item',
+    formatter: "{b} : {c} ({d}%)"
+  },
+  legend: {
+    orient : 'vertical',
+    x : 'left',
+    data:['直接访问','邮件营销','联盟广告','视频广告','搜索引擎']
+  },
+  calculable : true,
+  series : [
+    {
+      name:'访问来源',
+      type:'pie',
+      radius : '75%',
+      center: ['50%', '50%'],
+      data:[
+        { name:'直接访问',value:70},
+        {value:30, name:'邮件营销'},
+      ]
+    }
+  ]
+};
+
+const chart = ref<any>("");
+watch?.(
+    () => props.list,
+    (newVal) => {
+      options.series[0].data = props.list
+      options.legend.data = []
+      props.list.forEach(item=>{
+        options.legend.data.push(item.name)
+      })
+      handle()
+    }
+);
+
+const handle=()=>{
+  chart.value = markRaw(
+      echarts.init(document.getElementById(props.id) as HTMLDivElement)
+  );
+
+  chart.value.setOption(options);
+
+  window.addEventListener("resize", () => {
+    chart.value.resize();
+  });
+}
+onMounted(() => {
+ handle();
+});
+
+onActivated(() => {
+  if (chart.value) {
+    chart.value.resize();
+  }
+});
+</script>

src/views/report/statistics/outTime/components/PieChart2.vue

@@ -0,0 +1,99 @@
+<!-- 饼图 -->
+<template>
+  <el-card>
+    <div :id="id" :class="className" :style="{ height, width }"></div>
+  </el-card>
+</template>
+
+<script setup lang="ts">
+import * as echarts from "echarts";
+import {defineProps, ref} from "vue";
+
+const props = defineProps({
+  id: {
+    type: String,
+    default: "pieChart",
+  },
+  className: {
+    type: String,
+    default: "",
+  },
+  width: {
+    type: String,
+    default: "200px",
+    required: true,
+  },
+  height: {
+    type: String,
+    default: "200px",
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: [],
+    required: true
+  }
+});
+const options = {
+  title : {
+    text: '工单准时完成率',
+    x:'center'
+  },
+  tooltip : {
+    trigger: 'item',
+    formatter: "{b} : {c} ({d}%)"
+  },
+  legend: {
+    orient : 'vertical',
+    x : 'left',
+    data:['直接访问','邮件营销','联盟广告','视频广告','搜索引擎']
+  },
+  calculable : true,
+  series : [
+    {
+      name:'访问来源',
+      type:'pie',
+      radius : '75%',
+      center: ['50%', '50%'],
+      data:[
+        { name:'直接访问',value:70},
+        {value:30, name:'邮件营销'},
+      ]
+    }
+  ]
+};
+
+const chart = ref<any>("");
+watch?.(
+    () => props.list,
+    (newVal) => {
+      options.series[0].data = props.list
+      options.legend.data = []
+      props.list.forEach(item=>{
+        options.legend.data.push(item.name)
+      })
+      handle()
+    }
+);
+
+const handle=()=>{
+  chart.value = markRaw(
+      echarts.init(document.getElementById(props.id) as HTMLDivElement)
+  );
+
+  chart.value.setOption(options);
+
+  window.addEventListener("resize", () => {
+    chart.value.resize();
+  });
+}
+onMounted(() => {
+  handle();
+});
+
+onActivated(() => {
+  if (chart.value) {
+    chart.value.resize();
+  }
+});
+</script>

src/views/report/statistics/outTime/components/PieChart3.vue

@@ -0,0 +1,99 @@
+<!-- 饼图 -->
+<template>
+  <el-card>
+    <div :id="id" :class="className" :style="{ height, width }"></div>
+  </el-card>
+</template>
+
+<script setup lang="ts">
+import * as echarts from "echarts";
+import {defineProps, ref} from "vue";
+
+const props = defineProps({
+  id: {
+    type: String,
+    default: "pieChart",
+  },
+  className: {
+    type: String,
+    default: "",
+  },
+  width: {
+    type: String,
+    default: "200px",
+    required: true,
+  },
+  height: {
+    type: String,
+    default: "200px",
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: [],
+    required: true
+  }
+});
+const options = {
+  title : {
+    text: '超期原因分析',
+    x:'center'
+  },
+  tooltip : {
+    trigger: 'item',
+    formatter: "{b} : {c} ({d}%)"
+  },
+  legend: {
+    orient : 'vertical',
+    x : 'left',
+    data:['直接访问','邮件营销','联盟广告','视频广告','搜索引擎']
+  },
+  calculable : true,
+  series : [
+    {
+      name:'访问来源',
+      type:'pie',
+      radius : '75%',
+      center: ['50%', '50%'],
+      data:[
+        { name:'直接访问',value:70},
+        {value:30, name:'邮件营销'},
+      ]
+    }
+  ]
+};
+
+const chart = ref<any>("");
+watch?.(
+    () => props.list,
+    (newVal) => {
+      options.series[0].data = props.list
+      options.legend.data = []
+      props.list.forEach(item=>{
+        options.legend.data.push(item.name)
+      })
+      handle()
+    }
+);
+
+const handle=()=>{
+  chart.value = markRaw(
+      echarts.init(document.getElementById(props.id) as HTMLDivElement)
+  );
+
+  chart.value.setOption(options);
+
+  window.addEventListener("resize", () => {
+    chart.value.resize();
+  });
+}
+onMounted(() => {
+  handle();
+});
+
+onActivated(() => {
+  if (chart.value) {
+    chart.value.resize();
+  }
+});
+</script>

src/views/report/statistics/outTime/index.vue

@@ -0,0 +1,148 @@
+<template>
+  <div class="dashboard-container">
+    <!-- 数据卡片 -->
+    <el-row :gutter="10" class="mt-3">
+      <el-col :xs="24" :sm="12" :lg="12">
+        <el-card shadow="never">
+          <template #header>
+            <div class="flex items-center justify-between">
+              <span class="text-[var(--el-text-color-secondary)]">总订单数</span>
+              <el-tag type="success">{{ amount1 }}</el-tag>
+            </div>
+          </template>
+
+          <div
+            class="flex items-center justify-between mt-5 text-sm text-[var(--el-text-color-secondary)]"
+          >
+            <span> 超期订单 </span>
+            <el-tag type="error">{{outAmount1}}</el-tag>
+          </div>
+        </el-card>
+      </el-col>
+
+      <!--消息数-->
+      <el-col :xs="24" :sm="12" :lg="12">
+        <el-card shadow="never">
+          <template #header>
+            <div class="flex items-center justify-between">
+              <span class="text-[var(--el-text-color-secondary)]">总工单数</span>
+              <el-tag type="success">{{amount2}}</el-tag>
+            </div>
+          </template>
+
+
+          <div
+            class="flex items-center justify-between mt-5 text-sm text-[var(--el-text-color-secondary)]"
+          >
+            <span> 超期工单 </span>
+            <el-tag type="error">{{outAmount2}}</el-tag>
+          </div>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <!-- Echarts 图表 -->
+    <el-row :gutter="10" class="mt-3">
+      <el-col :xs="24" :sm="12" :lg="8" class="mb-2">
+        <PieChart1
+            id="pieChart1"
+            height="400px"
+            width="100%"
+            class="bg-[var(--el-bg-color-overlay)]"
+            :list="list1"
+        />
+      </el-col>
+      <el-col :xs="24" :sm="12" :lg="8" class="mb-2">
+        <PieChart2
+          id="pieChart2"
+          height="400px"
+          width="100%"
+          class="bg-[var(--el-bg-color-overlay)]"
+          :list="list2"
+        />
+      </el-col>
+
+      <el-col :xs="24" :sm="12" :lg="8" class="mb-2">
+        <PieChart3
+            id="pieChart3"
+            height="400px"
+            width="100%"
+            class="bg-[var(--el-bg-color-overlay)]"
+            :list="list3"
+        />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  name: "Dashboard",
+  inheritAttrs: false,
+});
+import { useUserStore } from "@/store/modules/user";
+import {outTimeInfo} from "@/api/report"
+const userStore = useUserStore();
+const date: Date = new Date();
+
+const duration = 5000;
+
+const list1 = ref([])
+const list2 = ref([])
+const list3 = ref([])
+// 销售额
+const amount1 = ref(0);
+const amount2 = ref(0);
+
+
+const outAmount1 = ref(0);
+const outAmount2 = ref(0);
+
+onMounted(() => {
+  outTimeInfo("").then((res)=>{
+    amount1.value = res.data.orderNum;
+    amount2.value = res.data.workOrderNum;
+    outAmount1.value = res.data.outOrder;
+    outAmount2.value = res.data.outWorkOrder;
+    list1.value = res.data.orderRate;
+    list2.value = res.data.workOrderRate;
+    list3.value = res.data.reasons;
+  });
+});
+</script>
+
+<style lang="scss" scoped>
+.dashboard-container {
+  position: relative;
+  padding: 24px;
+
+  .user-avatar {
+    width: 40px;
+    height: 40px;
+    border-radius: 50%;
+  }
+
+  .github-corner {
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 1;
+    border: 0;
+  }
+
+  .data-box {
+    display: flex;
+    justify-content: space-between;
+    padding: 20px;
+    font-weight: bold;
+    color: var(--el-text-color-regular);
+    background: var(--el-bg-color-overlay);
+    border-color: var(--el-border-color);
+    box-shadow: var(--el-box-shadow-dark);
+  }
+
+  .svg-icon {
+    fill: currentcolor !important;
+  }
+}
+</style>

src/views/storage/warningInfo/index.vue

@@ -0,0 +1,161 @@
+<template>
+  <div class="mainContentBox">
+    <avue-crud
+        ref="crudRef"
+        v-model:search="search"
+        v-model="form"
+        :data="data"
+        :option="option"
+        v-model:page="page"
+        @row-save="createRow"
+        @row-update="updateRow"
+        @row-del="deleteRow"
+        @search-change="searchChange"
+        @search-reset="resetChange"
+        @size-change="dataList"
+        @current-change="dataList"
+        @selection-change="selectionChange"
+    >
+      <template #menu="{ size, row, index }">
+        <el-button
+            v-if="row.state === '0' && row.userName === userStore.user.username"
+            type="primary"
+            link
+            size="small"
+            @click="test(row, 0)"
+        ><i-ep-edit />处理
+        </el-button>
+      </template>
+    </avue-crud>
+    <el-dialog
+        v-model="dialog1.visible"
+        :title="dialog1.title"
+        width="950px"
+        @close="dialog1.visible = false"
+    >
+      <choice-item-page enabled="" @materialInfo="materialInfo"/>
+    </el-dialog>
+  </div>
+</template>
+<script setup>
+import { ref, getCurrentInstance } from "vue";
+import { useCrud } from "@/hooks/userCrud";
+import { useCommonStoreHook,useUserStoreHook} from "@/store";
+const { isShowTable, tableType } = toRefs(useCommonStoreHook());
+const userStore = useUserStoreHook();
+const test = (row) => {
+  ElMessageBox.confirm("你确定要处理当前消息吗", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(() => {
+    row.state = 1;
+    form.value = row
+    updateRow(row).then((res)=>{
+      dataList()
+    });
+  });
+};
+
+// 传入一个url，后面不带/
+const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
+  useCrud({
+    src: "/api/v1/warningInfo",
+  });
+const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } = Methords; //增删改查
+const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
+const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
+const dialog1 = reactive({
+  title: "物料选择",
+  visible: false,
+});
+const materialInfo = (value) => {
+  form.value.code = value.materialCode
+  form.value.name = value.materialName
+  form.value.unit = value.unitDictValue
+  dialog1.visible = false
+}
+const crudRef = ref(null); //crudRef.value 获取avue-crud对象
+
+// 设置表格列或者其他自定义的option
+option.value = Object.assign(option.value, {
+  delBtn: false,
+  selection: false,
+  editBtn: false,
+  viewBtn: false,
+  addBtn: false,
+  column: [
+    {
+      label: "物料编码",
+      prop: "materialCode",
+      width: 150,
+      overHidden: true,
+      search: true,
+    },
+    {
+      label: "物料名称",
+      prop: "materialName",
+      search: true,
+      width: 150,
+      overHidden: true,
+      disabled: true,
+    },
+    {
+      label: "物料型号",
+      prop: "materialModel",
+      search: true,
+      width: 150,
+      overHidden: true,
+      disabled: true,
+      rules: [
+        {
+          required: true,
+          message: "物料名称不能为空",
+          trigger: "trigger",
+        },
+      ],
+    },
+    {
+      label: "预警信息",
+      prop: "warningInfo",
+
+    },
+    {
+      label: "处理人",
+      prop: "userName",
+      search: true,
+      display: false
+    },
+    {
+      label: "状态",
+      prop: "state",
+      type: 'select',
+      dicData: [{label: '未处理',value : '0'},{label: '已处理', value : '1'}],
+    },
+    {
+      label: "创建时间",
+      prop: "created",
+      width: 180,
+      display: false
+    },
+    {
+      label: "处理时间",
+      prop: "updated",
+      width: 180,
+      html: true,
+      formatter: (val) => {
+        if (val.state === "1") {
+          return val.updated
+        } else {
+          return '';
+        }
+      },
+    },
+  ],
+});
+
+onMounted(() => {
+  // console.log("crudRef", crudRef)
+  dataList();
+});
+</script>

src/views/storage/warningRole/index.vue

@@ -0,0 +1,101 @@
+<template>
+  <div class="mainContentBox" style="width:50%; float: left;">
+    <avue-crud
+        ref="crudRef"
+        v-model="form"
+        :data="data"
+        :option="option"
+        @row-save="createRow"
+        @row-update="updateRow"
+        @row-del="deleteRow"
+        @row-click="rowClick"
+    >
+    </avue-crud>
+  </div>
+  <div class="mainContentBox" style="width:50%;float: left;">
+    <avue-crud
+        ref="crudRef"
+        v-model="form"
+        :data="data1"
+        :option="option1"
+        @row-save="createRow"
+        @row-update="updateRow"
+        @row-del="deleteRow"
+    >
+    </avue-crud>
+  </div>
+</template>
+<script setup>
+import { ref, getCurrentInstance } from "vue";
+import { useCrud } from "@/hooks/userCrud";
+import {queryDictDataByType } from "@/api/system/dict"
+import { useCommonStoreHook } from "@/store";
+import dictDataUtil from "@/common/configs/dictDataUtil";
+const { isShowTable, tableType } = toRefs(useCommonStoreHook());
+const rowClick = (row) => {
+
+};
+
+// 传入一个url，后面不带/
+const { form, data, option, search, page, toDeleteIds, Methords, Utils } =
+  useCrud({
+    src: "/api/v1/wmsOrder",
+  });
+const { dataList, createRow, updateRow, deleteRow, searchChange, resetChange } = Methords; //增删改查
+const { selectionChange, multipleDelete } = Methords; //选中和批量删除事件
+const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等工具
+
+const crudRef = ref(null); //crudRef.value 获取avue-crud对象
+// 设置表格列或者其他自定义的option
+option.value = Object.assign(option.value, {
+  delBtn: false,
+  selection: false,
+  viewBtn: false,
+  editBtn: true,
+  menu: true,
+  addBtn: false,
+  searchBtn: false,
+  column: [
+    {
+      label: "角色名称",
+      prop: "dictLabel",
+      overHidden: true,
+      type: "select",
+    },
+  ],
+});
+const data1 = ref([])
+const option1 = ref({
+  delBtn: true,
+  selection: false,
+  viewBtn: false,
+  editBtn: false,
+  menu: true,
+  addBtn: false,
+  searchBtn: false,
+  column: [
+    {
+      label: "用户名称",
+      prop: "dictLabel",
+      overHidden: true,
+      type: "select",
+      dicUrl:
+          dictDataUtil.request_url + dictDataUtil.TYPE_CODE.warning_role,
+      props: {
+        label: "dictLabel",
+        value: "dictValue",
+      },
+    },
+  ],
+});
+const queryRoles = () => {
+  queryDictDataByType("warning_role").then((res)=>{
+    data.value =res.data
+  });
+};
+onMounted(() => {
+  // console.log("crudRef", crudRef)
+  //search.value.type = '2'
+  queryRoles();
+});
+</script>

src/views/storage/wmsOrder/index.vue

@@ -142,6 +142,13 @@ option.value = Object.assign(option.value, {
       }
     },
     {
+      label: "操作日志",
+      prop: "message",
+      width: 180,
+      overHidden: true,
+      display: false
+    },
+    {
       label: "操作时间",
       prop: "created",
       width: 180,