Merge branch 'projects/mesxc-test' into projects/mesxc-lb

2024-03-14 17:08:39 +08:00 · 2024-03-14 17:08:39 +08:00 · e3133cef1f
commit e3133cef1f
parent 7b4cd85ba0 efdf1f5b54
7 changed files with 115 additions and 156 deletions
--- a/src/utils/request.js
+++ b/src/utils/request.js
@ -1,10 +1,10 @@
 import axios from 'axios'
-import {Message, MessageBox, Notification, Loading} from 'element-ui'
+import { Message, MessageBox, Notification, Loading } from 'element-ui'
 import store from '@/store'
-import {getAccessToken, getRefreshToken, getTenantId, setToken} from '@/utils/auth'
+import { getAccessToken, getRefreshToken, getTenantId, setToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
-import {getPath, getTenantEnable} from "@/utils/ruoyi";
-import {refreshToken} from "@/api/login";
+import { getPath, getTenantEnable } from "@/utils/ruoyi";
+import { refreshToken } from "@/api/login";

 // 需要忽略的提示。忽略后，自动 Promise.reject('error')
 const ignoreMsgs = [
@ -42,7 +42,7 @@ const service = axios.create({
 let loadingInstance = null
 function startLoading() {
  loadingInstance = Loading.service({
-    fullscreen: false,
+    fullscreen: true,
    text: '拼命加载中...',
    background: 'rgba(0, 0, 0, 0.1)'
  })
@ -86,7 +86,7 @@ service.interceptors.request.use(config => {
    for (const propName of Object.keys(config.params)) {
      const value = config.params[propName];
      const part = encodeURIComponent(propName) + '='
-      if (value !== null && typeof(value) !== "undefined") {
+      if (value !== null && typeof (value) !== "undefined") {
        if (typeof value === 'object') {
          for (const key of Object.keys(value)) {
            let params = propName + '[' + key + ']';
@ -104,9 +104,9 @@ service.interceptors.request.use(config => {
  }
  return config
 }, error => {
-    tryHideFullScreenLoading()
-    console.log(error)
-    Promise.reject(error)
+  tryHideFullScreenLoading()
+  console.log(error)
+  Promise.reject(error)
 })

 // 响应拦截器
@ -189,23 +189,23 @@ service.interceptors.response.use(async res => {
    return res.data
  }
 }, error => {
-    tryHideFullScreenLoading()
-    console.log('err' + error)
-    let {message} = error;
-    if (message === "Network Error") {
-      message = "后端接口连接异常";
-    } else if (message.includes("timeout")) {
-      message = "系统接口请求超时";
-    } else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
-    }
-    Message({
-      message: message,
-      type: 'error',
-      duration: 5 * 1000
-    })
-    return Promise.reject(error)
+  tryHideFullScreenLoading()
+  console.log('err' + error)
+  let { message } = error;
+  if (message === "Network Error") {
+    message = "后端接口连接异常";
+  } else if (message.includes("timeout")) {
+    message = "系统接口请求超时";
+  } else if (message.includes("Request failed with status code")) {
+    message = "系统接口" + message.substr(message.length - 3) + "异常";
  }
+  Message({
+    message: message,
+    type: 'error',
+    duration: 5 * 1000
+  })
+  return Promise.reject(error)
+}
 )

 export function getBaseHeader() {
@ -219,10 +219,10 @@ function handleAuthorized() {
  if (!isRelogin.show) {
    isRelogin.show = true;
    MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
-        confirmButtonText: '重新登录',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }
+      confirmButtonText: '重新登录',
+      cancelButtonText: '取消',
+      type: 'warning'
+    }
    ).then(() => {
      isRelogin.show = false;
      store.dispatch('LogOut').then(() => {
--- a/src/views/group/base/groupTeam/components/workerTeamAdd.vue
+++ b/src/views/group/base/groupTeam/components/workerTeamAdd.vue
@ -2,11 +2,7 @@
  <el-form ref="form" :rules="rules" label-width="100px" :model="form">
    <el-form-item label="员工" prop="workerId" v-if='!isEdit'>
      <el-select v-model="form.workerId" placeholder="请选择" filterable style="width: 100%;" @change="selectWorker()">
-        <el-option
-          v-for="item in workerList"
-          :key="item.id"
-          :label="item.name"
-          :value="item.id">
+        <el-option v-for="item in workerList" :key="item.id" :label="item.name" :value="item.id">
        </el-option>
      </el-select>
    </el-form-item>
@ -48,12 +44,12 @@ export default {
      this.form.teamId = param.teamId
      this.form.majorName = param.majorName
      this.workName = param.workName
-      otherWorkerList({teamId:this.form.teamId}).then(res => {
+      otherWorkerList({ teamId: this.form.teamId }).then(res => {
        this.workerList = res.data || []
        if (param.id) {
          this.isEdit = true
          this.form.id = param.id
-          groupTeamDet({id: this.form.id}).then((res) => {
+          groupTeamDet({ id: this.form.id }).then((res) => {
            if (res.code === 0) {
              this.form.workerId = res.data.workerId
              this.form.remark = res.data.remark
@ -72,7 +68,7 @@ export default {
            this.form.majorName = item.majorName
          }
        })
-      }else{
+      } else {
        this.form.majorName = ''
      }
    },
--- a/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue
+++ b/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue
@ -9,18 +9,15 @@
          </el-col>
          <el-col :span="6">
            <p class="boldTitle">车间名称</p>
-            <p class="lightText">{{ (queryParams.roomNameDict || queryParams.roomNameDict === 0) ? getDictDataLabel('workshop',queryParams.roomNameDict) : '-' }}</p>
+            <p class="lightText">{{ (queryParams.roomNameDict || queryParams.roomNameDict === 0) ?
+      getDictDataLabel('workshop', queryParams.roomNameDict) : '-' }}</p>
          </el-col>
          <el-col :span="6">
            <p class="boldTitle">班组名称</p>
            <p class="lightText">{{ queryParams.teamName ? queryParams.teamName : '-' }}</p>
          </el-col>
        </el-row>
-        <base-table
-          :table-props="tableProps"
-          :table-data="tableData"
-          :max-height="tableH"
-        />
+        <base-table :table-props="tableProps" :table-data="tableData" :max-height="tableH" :page="1" :limit="1000000" />
      </div>
    </el-drawer>
  </div>
@ -47,7 +44,7 @@ const tableProps = [
  },
  {
    prop: 'workTime',
-    label: '工作时长'
+    label: '工作时长(h)'
  }
 ]
 export default {
@ -83,21 +80,24 @@ export default {
 <style lang="scss" scoped>
 .box {
  padding: 0 32px;
+
  .topBox {
    padding-bottom: 30px;
    margin-bottom: 30px;
    border-bottom: 1px solid #E9E9E9;
+
    .boldTitle {
      font-size: 14px;
      font-weight: 600;
-      color: rgba(0,0,0,0.85);
+      color: rgba(0, 0, 0, 0.85);
      margin: 0;
      margin-bottom: 10px;
    }
+
    .lightText {
      font-size: 14px;
      font-weight: 400;
-      color: rgba(102,102,102,0.75);
+      color: rgba(102, 102, 102, 0.75);
      margin: 0;
    }
  }
--- a/src/views/group/monitoring/teamProduction/components/searchArea.vue
+++ b/src/views/group/monitoring/teamProduction/components/searchArea.vue
@ -2,28 +2,20 @@
  <el-form :inline="true" class="demo-form-inline">
    <span class="blue-block"></span>
    <el-form-item label="班次信息">
-      <el-select v-model="queryParams.classesId" placeholder="班次信息" style="width: 200px;" size="small" clearable>
-        <el-option
-          v-for="item in classesArr"
-          :key="item.id"
-          :label="(item.roomName?item.roomName:'')+'-'+item.name"
-          :value="item.id">
-          <span>{{ item.roomName }}-{{item.name}}</span>
+      <el-select v-model="queryParams.classesId" placeholder="班次信息" style="width: 200px;" size="small" clearable
+        filterable>
+        <el-option v-for="item in classesArr" :key="item.id"
+          :label="(item.roomName ? item.roomName : '') + '-' + item.name" :value="item.id">
+          <span>{{ item.roomName }}-{{ item.name }}</span>
        </el-option>
      </el-select>
    </el-form-item>
    <el-form-item label="班组信息">
      <el-input v-model="queryParams.teamName" placeholder="班组信息" style="width: 200px;" clearable></el-input>
    </el-form-item>
-    <el-form-item label="上班时间">
-      <el-date-picker
-        v-model="queryParams.tiemStr"
-        type="daterange"
-        format='yyyy-MM-dd'
-        value-format='yyyy-MM-dd'
-        range-separator='-'
-        style="width: 250px;"
-        size="small">
+    <el-form-item label="上班日期">
+      <el-date-picker v-model="queryParams.tiemStr" type="daterange" format='yyyy-MM-dd' value-format='yyyy-MM-dd'
+        range-separator='-' style="width: 250px;" size="small">
      </el-date-picker>
    </el-form-item>
    <el-form-item>
@ -69,6 +61,7 @@ export default {
    font-size: 16px;
    color: #0B58FF;
  }
+
  .el-input__prefix .el-icon-date {
    font-size: 16px;
    color: #0B58FF;
@ -83,6 +76,7 @@ export default {
  background: #E8E8E8;
  vertical-align: middle;
 }
+
 .demo-form-inline {
  .blue-block {
    display: inline-block;
--- a/src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue
+++ b/src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue
@ -1,12 +1,8 @@
 <template>
  <div>
-    <el-drawer title="查看详情" :visible.sync="visible" size="70%" :wrapperClosable='false' @closed="closeDrawer">
+    <el-drawer title="生产情况" :visible.sync="visible" size="70%" @closed="closeDrawer" :show-close='false'>
      <div class="box">
-        <base-table
-          :table-props="tableProps"
-          :table-data="tableData"
-          :max-height="tableH"
-        />
+        <base-table :table-props="tableProps" :table-data="tableData" :max-height="tableH" />
      </div>
    </el-drawer>
  </div>
@ -53,7 +49,7 @@ export default {
    init(params) {
      this.visible = true
      // console.log(params)
-      getByScheduling({id:params.id}).then(res => {
+      getByScheduling({ id: params.id }).then(res => {
        let dataList1 = []
        let dataList2 = []
        if (res.data.nameData && res.data.nameData.length > 0) {
@ -90,11 +86,11 @@ export default {
            timeArr.push(this.parseTime(item.name))
            tablePropsObj.prop = item.name
            tablePropsObj.label = this.parseTime(item.name)
-            tablePropsObj.children[0].prop = item.name+'sumInput'
-            tablePropsObj.children[1].prop = item.name+'sumOutput'
-            tablePropsObj.children[2].prop = item.name+'goodArea'
-            tablePropsObj.children[3].prop = item.name+'dynamicValue'
-            tablePropsObj.children[4].prop = item.name+'dynamicRatio'
+            tablePropsObj.children[0].prop = item.name + 'sumInput'
+            tablePropsObj.children[1].prop = item.name + 'sumOutput'
+            tablePropsObj.children[2].prop = item.name + 'goodArea'
+            tablePropsObj.children[3].prop = item.name + 'dynamicValue'
+            tablePropsObj.children[4].prop = item.name + 'dynamicRatio'
            this.tableProps.push(tablePropsObj)
          })
          getSchedulingMonitoringRecord({
@ -111,15 +107,15 @@ export default {
              obj.workOrderList = dataList1.data[i].workOrderList
              let subData1 = dataList1.data[i].data
              for (let ii = 0; ii < subData1.length; ii++) {
-                obj[subData1[ii].dynamicName+'sumInput'] = subData1[ii].dynamicValue.sumInput
-                obj[subData1[ii].dynamicName+'sumOutput'] = subData1[ii].dynamicValue.sumOutput
-                obj[subData1[ii].dynamicName+'goodArea'] = subData1[ii].dynamicValue.goodArea
+                obj[subData1[ii].dynamicName + 'sumInput'] = subData1[ii].dynamicValue.sumInput
+                obj[subData1[ii].dynamicName + 'sumOutput'] = subData1[ii].dynamicValue.sumOutput
+                obj[subData1[ii].dynamicName + 'goodArea'] = subData1[ii].dynamicValue.goodArea
              }
              for (let j = 0; j < dataList2.data.length; j++) {
                let subData2 = dataList2.data[j].data
                for (let jj = 0; jj < subData2.length; jj++) {
-                  obj[subData2[jj].dynamicName+'dynamicValue'] = subData2[jj].dynamicValue
-                  obj[subData2[jj].dynamicName+'dynamicRatio'] = obj[subData2[jj].dynamicName+'dynamicValue'] / obj[subData2[jj].dynamicName+'sumOutput']
+                  obj[subData2[jj].dynamicName + 'dynamicValue'] = subData2[jj].dynamicValue
+                  obj[subData2[jj].dynamicName + 'dynamicRatio'] = obj[subData2[jj].dynamicName + 'dynamicValue'] / obj[subData2[jj].dynamicName + 'sumOutput']
                }
              }
              this.tableData.push(obj)
--- a/src/views/group/monitoring/teamProduction/index.vue
+++ b/src/views/group/monitoring/teamProduction/index.vue
@ -1,37 +1,22 @@
 <template>
  <div class="app-container">
    <!-- 搜索工作栏 -->
-    <search-area @submit="buttonClick"/>
+    <search-area @submit="buttonClick" />
    <!-- <search-bar
      :formConfigs="formConfig"
      ref="searchBarForm"
      @headBtnClick="buttonClick"
    /> -->
    <!-- 列表 -->
-    <base-table
-      :page="queryParams.pageNo"
-      :limit="queryParams.pageSize"
-      :table-props="tableProps"
-      :table-data="list"
-      :max-height="tableH"
-    >
-      <method-btn
-        v-if="tableBtn.length"
-        slot="handleBtn"
-        :width="80"
-        label="操作"
-        :method-list="tableBtn"
-        @clickBtn="handleClick"
-      />
+    <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
+      :max-height="tableH">
+      <method-btn v-if="tableBtn.length" slot="handleBtn" :width="80" label="操作" :method-list="tableBtn"
+        @clickBtn="handleClick" />
    </base-table>
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
+      @pagination="getList" />
    <!-- 查看生产情况 -->
-    <team-production-detail v-if='paramVisible' ref='schedulingMonitoringDetail'/>
+    <team-production-detail v-if='paramVisible' ref='schedulingMonitoringDetail' />
  </div>
 </template>
 <script>
@ -86,38 +71,6 @@ export default {
  name: 'GroupTeamScheduling',
  data() {
    return {
-      formConfig: [
-        {
-          type: 'select',
-          label: '班次信息',
-          selectOptions: [],
-          param: 'classesId'
-        },
-        {
-          type: 'input',
-          label: '班组信息',
-          placeholder: '班组信息',
-          param: 'teamName'
-        },
-        {
-          type: 'datePicker',
-          label: '上班日期',
-          dateType: 'daterange',
-          format: 'yyyy-MM-dd',
-          valueFormat: 'yyyy-MM-dd',
-          rangeSeparator: '-',
-          // valueFormat: "timestamp",
-          param: 'tiemStr',
-          defaultSelect: '',
-          width: 250
-        },
-        {
-          type: 'button',
-          btnName: '查询',
-          name: 'search',
-          color: 'primary'
-        }
-      ],
      // 查询参数
      queryParams: {
        pageNo: 1,
@ -128,11 +81,12 @@ export default {
      },
      tableProps,
      tableBtn: [
-      this.$auth.hasPermi('base:team-production:detail')
+        this.$auth.hasPermi('base:team-production:detail')
          ? {
-              type: 'detail',
-              btnName: '详情'
-            }
+            type: 'productionDetail',
+            btnName: '查看',
+            showTip: '生产情况'
+          }
          : undefined
      ].filter((v) => v),
      list: [],
@ -158,7 +112,7 @@ export default {
      this.getList()
    },
    getList() {
-      groupTeamSchedulingPage({...this.queryParams}).then(res => {
+      groupTeamSchedulingPage({ ...this.queryParams }).then(res => {
        console.log(res)
        this.list = res.data.list || []
        this.total = res.data.total || 0
--- a/src/views/report/productionShipmentsReport/index.vue
+++ b/src/views/report/productionShipmentsReport/index.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-12 11:17:14
+ * @LastEditTime: 2024-03-14 13:46:39
 * @LastEditors: zhp
 * @Description:
 -->
@ -9,9 +9,7 @@
  <div class="app-container">
    <el-form :inline="true" :model="dataForm" class="demo-form-inline">
      <el-form-item>
-        <el-date-picker clearable v-model="monthValue" type="monthrange" range-separator="至" start-placeholder="开始日期"
-          end-placeholder="结束日期" value-format="timestamp" :clearable="false" :picker-options="pickerOptions"
-          size="small" style='width:350px;' @change="timeSelect">
+        <el-date-picker clearable v-model="reportTime" @change="changeTime" type="date" placeholder="选择日期">
        </el-date-picker>
      </el-form-item>
      <el-button type="primary" @click="getDataList()">查询</el-button>
@ -431,7 +429,8 @@ export default {
 			// 	explainText: undefined,
 			// 	remark: undefined,
 			// },
-			// 查询参数
+      // 查询参数
+      reportTime:'',
      dataForm: {
        // pageSize: 100,
        // pageNo:1,
@ -449,10 +448,41 @@ export default {
 		// this.getProductLineList();
  },
  mounted() {
+    this.getTodayStartTimeAndEndTime()
    this.getDataList()
    this.getDict()
  },
  methods: {
+    format(shijianchuo) {
+      //shijianchuo是整数，否则要parseInt转换
+      var time = moment(new Date(shijianchuo)).format('YYYY-MM-DD HH:mm:ss')
+      // console.log(time)
+      // var y = time.getFullYear();
+      // var m = time.getMonth() + 1;
+      // var d = time.getDate();
+      // var h = time.getHours();
+      // var mm = time.getMinutes();
+      // var s = time.getSeconds();
+      return time
+    },
+    getTodayStartTimeAndEndTime() {
+      this.reportTime = new Date()
+      this.changeTime(this.reportTime)
+    },
+    changeTime(val) {
+      console.log(val)
+      if (val) {
+        // console.log(val)
+        // console.log(val.setHours(7, 0, 0))
+        // console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000)
+        // let time = this.format(val.setHours(7, 0, 0))
+        this.dataForm.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.dataForm.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        console.log(this.dataForm.reportTime);
+      } else {
+        this.dataForm.reportTime = []
+      }
+    },
    async getDict() {
      // 产线列表
      const res = await getCorePLList()
@ -530,18 +560,7 @@ export default {
      }
    },
    async getDataList() {
-      if (this.monthValue.length > 0) {
-        console.log(this.monthValue)
-        this.dataForm.reportTime[0] = this.transformTime(this.monthValue[0])
-        // this.queryParams.startTime = this.monthValue[0]
-        this.dataForm.reportTime[1] = this.transformTime(this.monthValue[1])
-        this.timeTips = moment(this.monthValue[0]).format('YYYY-MM-DD') + ' - ' + moment(this.monthValue[1]).format('YYYY-MM-DD')
-        console.log(this.timeTips);
-      } else {
-        // this.$modal.msgError('月范围不能为空')
-        // return false
-      }
-
+      this.timeTips = moment(new Date()).format('YYYY-MM-DD') + ' - ' + moment(new Date().setHours(7, 0, 0) + 24 * 60 * 60 * 1000).format('YYYY-MM-DD')
      console.log(this.dataForm);
      const res = await this.$axios({
        url: 'base/report-auto-delive/listPlus',