Merge branch 'projects/mes-test' into projects/mes-zhp

修改bug
Merge pull request 'projects/mes-lb' (#88 ) from projects/mes-lb into projects/mes-test
2023-11-16 18:54:43 +08:00 · 2023-11-16 18:52:55 +08:00 · 2023-11-16 17:31:03 +08:00 · 2023-11-16 17:25:39 +08:00 · 2023-11-16 17:23:58 +08:00 · 2023-11-16 17:16:37 +08:00
45 changed files with 1071 additions and 797 deletions
--- a/.env.dev
+++ b/.env.dev
@ -1,8 +1,8 @@
 ###
 # @Author: Do not edit
 # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-11-16 08:52:02
- # @LastEditors: zhp
+ # @LastEditTime: 2023-11-16 14:07:34
+ # @LastEditors: DY
 # @Description:
 ###
 # 开发环境配置
--- a/.env.prod
+++ b/.env.prod
@ -1,3 +1,10 @@
+###
+ # @Author: zhp
+ # @Date: 2023-11-07 19:11:40
+ # @LastEditTime: 2023-11-16 16:40:59
+ # @LastEditors: zhp
+ # @Description:
+###
 # 生产环境配置
 ENV = 'production'

@ -5,7 +12,8 @@ ENV = 'production'
 VUE_APP_TITLE = MES系统

 # 芋道管理系统/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+

 # 根据服务器或域名修改
 # PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
--- a/public/static/videos/login.webm
+++ b/public/static/videos/login.webm
--- a/src/api/extend/processEquMaterialBom.js
+++ b/src/api/extend/processEquMaterialBom.js
@ -1,7 +1,7 @@
 /*
 * @Author: zhp
 * @Date: 2023-11-07 19:47:48
- * @LastEditTime: 2023-11-08 16:59:32
+ * @LastEditTime: 2023-11-16 17:49:23
 * @LastEditors: zhp
 * @Description:
 */
@ -12,7 +12,7 @@ export function processEquMaterialBomPage(data) {
  return request({
    url: '/extend/process-equ-material-bom/page',
    method: 'get',
-    data: data
+    params: data
  })
 }

--- a/src/api/extend/processEquValueBom.js
+++ b/src/api/extend/processEquValueBom.js
@ -1,18 +1,18 @@
 /*
 * @Author: zhp
 * @Date: 2023-11-09 09:37:14
- * @LastEditTime: 2023-11-09 14:20:02
+ * @LastEditTime: 2023-11-16 17:47:21
 * @LastEditors: zhp
 * @Description:
 */
 import request from '@/utils/request'

-// 获得能耗统计查询分页
+
 export function processEquValueBomPage(data) {
  return request({
    url: '/extend/process-equ-value-bom/page',
    method: 'get',
-    data: data
+    params: data
  })
 }

--- a/src/api/monitoring/statisticalData.js
+++ b/src/api/monitoring/statisticalData.js
@ -1,7 +1,7 @@
 /*
 * @Author: zhp
 * @Date: 2023-11-07 14:10:18
- * @LastEditTime: 2023-11-14 14:46:04
+ * @LastEditTime: 2023-11-16 17:49:52
 * @LastEditors: zhp
 * @Description:
 */
@ -12,7 +12,7 @@ export function getStatisticalDataPage(query) {
  return request({
    url: '/base/statistical-data/getStatisticData',
    method: 'get',
-    data: query
+    params: query
  })
 }

--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@ -6,6 +6,7 @@
@import './btn.scss';

 body {
+	// min-height: 1024px;
 	height: 100%;
 	-moz-osx-font-smoothing: grayscale;
 	-webkit-font-smoothing: antialiased;
--- a/src/assets/styles/login.scss
+++ b/src/assets/styles/login.scss
@ -94,8 +94,11 @@ $buttonHeight: $buttonH * 1px;
 		display: flex;

 		.pic {
+			flex: 3;
+			width: 1px;
+			min-width: 800px;
 			// 元素
-			width: $picWidth;
+			// width: $picWidth;
 			height: $picHeight;
 			background-image: url($picImage);
 			background-repeat: no-repeat;
@ -114,42 +117,64 @@ $buttonHeight: $buttonH * 1px;
 			}
 		}
 		.field {
-			// background: #ccc3;
 			position: relative;
-			padding-top: 196px;
-			flex: 1;
+			margin-top: 8%;
+			flex: 2;
+			// width: 800px;
 			display: flex;
 			flex-direction: column;
-			// justify-content: center;
 			align-items: center;
+
 			.pc-title {
 				width: 100%;
 				text-align: center;
 				clear: both;
 				position: relative;
 				top: -36px;
+				height: 128px;

-				// h3.title {
-				// 	position: relative;
-
-				// 	&::before {
-				// 		content: '';
-				// 		background: url($cnbmLogo) 100% / 100% no-repeat;
-				// 		height: 48px;
-				// 		width: 48px;
-				// 		position: absolute;
-				// 		left: 0px;
-				// 		top: 4px;
-				// 		display: inline-block;
-				// 	}
-				// }
+				.title {
+					margin: 0;
+					margin-left: 32px;
+					font-weight: 400;
+					user-select: none;
+					color: #000;
+					font-size: 36px;
+					line-height: 54px;
+					letter-spacing: 2px;
+				}
 			}
+
 			.mobile-title,
 			.mobile-switch {
 				display: none;
 			}
+
+			.form-cont {
+				// height: 560px;
+				flex: 1;
+				overflow: hidden;
+			}
+
+			.footer {
+				user-select: none;
+				// 元素
+				margin: 12px 0;
+				height: 16px;
+				line-height: 16px;
+				font-size: 12px;
+				color: #8c8c8c;
+
+				a,
+				a:hover,
+				a:active {
+					color: inherit;
+					text-decoration: none;
+				}
+			}
+
 			.form {
-				margin-top: 32px;
+				margin-top: 0;
 				box-sizing: border-box;
 				// width: $formWidth;
 				width: 100%;
@ -283,27 +308,22 @@ $buttonHeight: $buttonH * 1px;
 			line-height: 14px;
 		}
 	}
+}

-	.footer {
-		user-select: none;
-		// 元素
-		height: 16px;
-		line-height: 16px;
-		font-size: 12px;
-		color: #8c8c8c;
-		// 定位
-		position: absolute;
-		bottom: 30px;
-		a,
-		a:hover,
-		a:active {
-			color: inherit;
-			text-decoration: none;
+// - - - - - PC 最小尺寸设置
+@media screen and (min-width: 1920px) {
+	.container {
+		.content {
+
+			.field {
+				flex: initial;
+				width: 800px;
+			}
 		}
 	}
 }

-// - - - - - PC 最小尺寸设置
+
@media screen and (min-width: 599px) and (max-width: 1366px) {
 	.container {
 		min-width: 599px;
--- a/src/views/base/coreProductionLine/index.vue
+++ b/src/views/base/coreProductionLine/index.vue
@ -140,8 +140,8 @@ export default {
    getDataList() {
      this.dataListLoading = true;
      this.urlOptions.getDataListURL(this.listQuery).then(response => {
-        // this.tableData = response.data.list;
-				this.getStatus(response.data.list)
+        this.tableData = response.data.list;
+				// this.getStatus(response.data.list)
        this.listQuery.total = response.data.total;
        this.dataListLoading = false;
      });
@ -150,6 +150,7 @@ export default {
 			const ids = list.map((i) => {
 				return i.id;
 			});
+			console.log('111', ids)
 			getStatus(ids).then((response) => {
 				response.forEach((a) => {
 					list.forEach((b) => {
--- a/src/views/base/coreWorkOrder/allocation.vue
+++ b/src/views/base/coreWorkOrder/allocation.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2023-11-15 17:45:04
+ * @LastEditTime: 2023-11-16 09:14:35
 * @Description:
 -->
 <template>
@ -41,12 +41,12 @@
 					<el-table-column prop="priority" label="优先级" />
 					<el-table-column prop="planAssignmentQuantity" label="计划分配数量" >
 						<template slot-scope="scope">
-							<el-input v-model="scope.row.planAssignmentQuantity"></el-input>
+							<el-input v-model="scope.row.planAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input>
 						</template>
 					</el-table-column>
 					<el-table-column prop="actualAssignmentQuantity" label="实际分配数量">
 						<template slot-scope="scope">
-							<el-input v-model="scope.row.actualAssignmentQuantity"></el-input>
+							<el-input v-model="scope.row.actualAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input>
 						</template>
 					</el-table-column>
 					<el-table-column label="操作">
--- a/src/views/base/coreWorkOrder/detail.vue
+++ b/src/views/base/coreWorkOrder/detail.vue
@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-18 14:16:25
 * @LastEditors: DY
- * @LastEditTime: 2023-11-15 14:18:38
+ * @LastEditTime: 2023-11-16 13:45:13
 * @Description:
 -->
 <template>
@ -64,15 +64,15 @@
 			<div class="formContent">
 				<el-row :gutter="20">
 					<el-col :span="8">订单创建时间:
-						<span v-for="(item, index) in orderArray" :key="index" style="margin-right: 10px; white-space: normal">{{ item.createTime }}</span>
+						<span v-for="(item, index) in orderArray" :key="index" style="margin-right: 10px; white-space: pre-wrap">{{ parseTime(item.createTime) }}</span>
 					</el-col>
-					<el-col :span="8">计划开始时间:{{ dataForm.planStartTime }}</el-col>
-					<el-col :span="8">计划完成时间:{{ dataForm.planFinishTime }}</el-col>
+					<el-col :span="8">计划开始时间:{{ parseTime(dataForm.planStartTime) }}</el-col>
+					<el-col :span="8">计划完成时间:{{ parseTime(dataForm.planFinishTime) }}</el-col>
 				</el-row>
 				<el-row :gutter="20">
-					<el-col :span="8">预计结束时间:{{ dataForm.computeFinishTime }}</el-col>
-					<el-col :span="8">实际开始时间:{{ dataForm.startProduceTime }}</el-col>
-					<el-col :span="8">实际完成时间:{{ dataForm.finishProduceTime }}</el-col>
+					<el-col :span="8">预计结束时间:{{ parseTime(dataForm.computeFinishTime) }}</el-col>
+					<el-col :span="8">实际开始时间:{{ parseTime(dataForm.startProduceTime) }}</el-col>
+					<el-col :span="8">实际完成时间:{{ parseTime(dataForm.finishProduceTime) }}</el-col>
 				</el-row>
 				<el-row :gutter="20">
 					<el-col :span="8">工单状态:{{ fitlerS(dataForm.status) }}</el-col>
@ -147,6 +147,7 @@ import { orderList } from "@/api/base/orderManage";
 import { getProcessFlowList } from '@/api/base/orderManage'
 import SmallTitle from './SmallTitle';
 import { publicFormatter } from "@/utils/dict";
+import { parseTime } from '@/utils/ruoyi'

 const tableBtn = [
 	{
@ -233,7 +234,7 @@ export default {
 		this.getDict()
 	},
 	mounted() {
-		if (this.$route.query.woIdString) {
+		if (this.$route.query.woIdString && this.$route.query.woIdString !== 'undefined') {
 			const idList = this.$route.query.woIdString.split(',')
 			getCoreWOListById(idList).then(res => {
 				this.workOrderButton = res.data.map(work => {
--- a/src/views/base/coreWorkOrder/index.vue
+++ b/src/views/base/coreWorkOrder/index.vue
@ -348,20 +348,25 @@ export default {
 					id: val.data.id,
 					status: undefined
 				}
+				let opration = ''
 				if (val.type === 'active') {
 					param.status = 2
+					opration = '激活'
 				}
 				if (val.type === 'pause') {
 					param.status = 3
+					opration = '暂停'
 				}
 				if (val.type === 'nullify') {
 					param.status = 9
+					opration = '报废'
 				}
 				if (val.type === 'finish') {
 					param.status = 4
+					opration = '完成'
 				}
 				console.log('22',val)
-				this.$confirm(`确定对${'[工单名称=' + val.data.name + ']'}进行${val.type}操作?`, "提示", {
+				this.$confirm(`确定${opration}${'"工单' + val.data.name + '"'}?`, "提示", {
 					confirmButtonText: "确定",
 					cancelButtonText: "取消",
 					type: "warning",
@ -369,7 +374,7 @@ export default {
        .then(() => {
 					statusChange(param).then(({ data }) => {
 						this.$message({
-							message: '操作成功！',
+							message: '操作成功！工单状态稍后将会更新！',
 							type: 'success',
 							duration: 1500,
 							onClose: () => {
--- a/src/views/base/custom/index.vue
+++ b/src/views/base/custom/index.vue
@ -202,7 +202,7 @@ export default {
    }
  },
  created() {
-    this.init()
+    // this.init()
    // console.log('aaaaaa')
    // this.otherPaper()
  },
@ -227,64 +227,67 @@ export default {
    changeMode() {
      // hiprintTemplate.clear()
      // console.log(this.modelData)
-      const { mode } = this
-      const provider = providers[mode]
-      hiprint.init({
-        providers: [provider.f]
-      })
+      this.$nextTick(() => {
+        const { mode } = this
+        const provider = providers[mode]
+        hiprint.init({
+          providers: [provider.f]
+        })

-      // $('#hiprint-printTemplate').empty()
-      // console.log(JSON.parse(this.modelData))
-      hiprint.setConfig()
-      // 替换配置
-      hiprint.setConfig({
-        movingDistance: 2.5,
-        text: {
-          supportOptions: [
-            {
-              name: 'styler',
-              hidden: true
-            },
-            {
-              name: 'formatter',
-              hidden: true
-            }
-          ]
+        // $('#hiprint-printTemplate').empty()
+        // console.log(JSON.parse(this.modelData))
+        hiprint.setConfig()
+        // 替换配置
+        hiprint.setConfig({
+          movingDistance: 2.5,
+          text: {
+            supportOptions: [
+              {
+                name: 'styler',
+                hidden: true
+              },
+              {
+                name: 'formatter',
+                hidden: true
+              }
+            ]
+          }
+        })
+
+        // console.log(this.modelData)
+        // console.log($('#hiprint-printTemplate').empty())
+        if (this.modelData != {}) {
+          console.log(this.modelData);
+          $('.hiprintEpContainer').empty()
+          hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value)
+          $('.hiprint-printTemplate').empty()
+          hiprintTemplate = new hiprint.PrintTemplate({
+            template: JSON.parse(this.modelData),
+            settingContainer: '#PrintElementOptionSetting',
+            paginationContainer: '.hiprint-printPagination'
+          })
+        } else {
+          $('.hiprintEpContainer').empty()
+          console.log(this.modelData);
+          hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value)
+          $('.hiprint-printTemplate').empty()
+          // const templates = this.$ls.get('KEY_TEMPLATES', {})
+          const template = provider.value
+          // console.log(template)
+          hiprintTemplate = new hiprint.PrintTemplate({
+            template: template,
+            settingContainer: '#PrintElementOptionSetting',
+            paginationContainer: '.hiprint-printPagination'
+          })
        }
+        hiprintTemplate.design('#hiprint-printTemplate')
+        // console.log(hiprintTemplate)
+        console.log(hiprintTemplate);
+        // hiprintTemplate.design('#hiprint-printTemplate', { grid: true })
+        // 获取当前放大比例, 当zoom时传true 才会有
+        this.scaleValue = hiprintTemplate.editingPanel.scale || 1
+        // this.scaleValue = hiprintTemplate.editingPanel.scale || 1
      })
-
-      // console.log(this.modelData)
-      // console.log($('#hiprint-printTemplate').empty())
-      if (this.modelData) {
-        // console.log(this.modelData);
-        $('.hiprintEpContainer').empty()
-        hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value)
-        $('.hiprint-printTemplate').empty()
-        hiprintTemplate = new hiprint.PrintTemplate({
-          template: JSON.parse(this.modelData),
-          settingContainer: '#PrintElementOptionSetting',
-          paginationContainer: '.hiprint-printPagination'
-        })
-      } else {
-        $('.hiprintEpContainer').empty()
-        hiprint.PrintElementTypeManager.build('.hiprintEpContainer', provider.value)
-        $('.hiprint-printTemplate').empty()
-        // const templates = this.$ls.get('KEY_TEMPLATES', {})
-        const template = provider.value
-        // console.log(template)
-        hiprintTemplate = new hiprint.PrintTemplate({
-          template: template,
-          settingContainer: '#PrintElementOptionSetting',
-          paginationContainer: '.hiprint-printPagination'
-        })
-      }
-      // hiprintTemplate.design('#hiprint-printTemplate')
-      // console.log(hiprintTemplate)
-      console.log(hiprintTemplate);
-      hiprintTemplate.design('#hiprint-printTemplate', { grid: true })
-      // 获取当前放大比例, 当zoom时传true 才会有
-      this.scaleValue = hiprintTemplate.editingPanel.scale || 1
-      // this.scaleValue = hiprintTemplate.editingPanel.scale || 1
    },
    /**
     * 设置纸张大小
--- a/src/views/core/analysis/yieldAnalysis/index.vue
+++ b/src/views/core/analysis/yieldAnalysis/index.vue
@ -80,7 +80,7 @@ export default {
 					type: 'datePicker',
 					label: '时间',
 					dateType: 'month',
-					format: 'yyyy-MM-dd',
+					format: 'yyyy-MM',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
--- a/src/views/extend/processEquMaterialBom/index.vue
+++ b/src/views/extend/processEquMaterialBom/index.vue
@ -174,7 +174,7 @@ export default {
 					this.listQuery.pageSize = 10;
          this.listQuery.equipmentId = val.equipmentId ? val.equipmentId : undefined;
          this.listQuery.name = val.name ? val.name : undefined;
-          this.listQuery.name = val.name ? val.name : undefined;
+          this.listQuery.code = val.code ? val.code : undefined;
 					this.getDataList();
 					break;
 				case 'reset':
--- a/src/views/extend/processEquValueBom/index.vue
+++ b/src/views/extend/processEquValueBom/index.vue
@ -96,7 +96,7 @@ export default {
        },
        {
          type: 'input',
-          label: '物料配方名称',
+          label: '参数配方名称',
          // selectOptions: [],
          // labelField: 'name',
          // valueField: 'id',
@ -104,7 +104,7 @@ export default {
        },
        {
          type: 'input',
-          label: '物料配方编码',
+          label: '参数配方编码',
          // selectOptions: [],
          // labelField: 'name',
          // valueField: 'id',
@ -174,7 +174,7 @@ export default {
 					this.listQuery.pageSize = 10;
          this.listQuery.equipmentId = val.equipmentId ? val.equipmentId : undefined;
          this.listQuery.name = val.name ? val.name : undefined;
-          this.listQuery.name = val.name ? val.name : undefined;
+          this.listQuery.code = val.code ? val.code : undefined;
 					this.getDataList();
 					break;
 				case 'reset':
--- a/src/views/login.vue
+++ b/src/views/login.vue
@ -44,7 +44,7 @@
 								border-radius: 100%;
 								background: #26b9de;
 							"></span>
-						产线生产监控系统
+						MES
 					</p>
 				</div>
 				<video
@ -67,18 +67,7 @@
 					<h3 class="title">中建材智能自动化研究院有限公司</h3>
 				</h2>
 				<h2 class="pc-title" style="">
-					<h3
-						class="title"
-						style="
-							margin: 0;
-							margin-left: 32px;
-							font-weight: 400;
-							user-select: none;
-							color: #000;
-							font-size: 36px;
-							line-height: 54px;
-							letter-spacing: 2px;
-						">
+					<h3 class="title" style="">
 						<img
 							src="../assets/logo/cnbm.png"
 							alt="cnbm_logo"
@ -103,7 +92,7 @@
 							line-height: 54px;
 							letter-spacing: 2px;
 						">
-						产线生产监控系统
+						MES
 					</h3>
 				</h2>

@ -219,12 +208,14 @@
 							</div>

 							<!-- 下方的登录按钮 -->
-							<el-form-item id="button-form-item" style="width: 100%; margin-top: 32px">
+							<el-form-item
+								id="button-form-item"
+								style="width: 100%; margin-top: 32px">
 								<el-button
 									:loading="loading"
 									size="medium"
 									type="primary"
-									style="width: 100%; height: 66px; font-size: 18px;"
+									style="width: 100%; height: 66px; font-size: 18px"
 									@click.native.prevent="getCode">
 									<span v-if="!loading">登 录</span>
 									<span v-else>登 录 中...</span>
@ -358,6 +349,7 @@ export default {
 		};
 	},
 	created() {
+		document.body.style['min-height'] = '1024px';
 		// 租户开关
 		this.tenantEnable = getTenantEnable();
 		if (this.tenantEnable) {
@ -377,6 +369,9 @@ export default {
 			: undefined;
 		this.getCookie();
 	},
+	destroyed() {
+		document.body.style['min-height'] = 'unset';
+	},
 	methods: {
 		getCode() {
 			// 情况一，未开启：则直接登录
--- a/src/views/order/base/orderManage/index.vue
+++ b/src/views/order/base/orderManage/index.vue
@ -397,7 +397,7 @@ export default {
          this.workIssueTitle = '绑定工单'
          this.addWorkOrdervisible = true
          this.$nextTick(() => {
-            this.$refs.addWorkOrder.init(val.data.id, 'bind')
+            this.$refs.addWorkOrder.init(val.data, 'bind')
          })
          break
        case 'complete':
--- a/src/views/quality/base/qualityInspectionDet/index.vue
+++ b/src/views/quality/base/qualityInspectionDet/index.vue
@ -42,7 +42,7 @@
 			<DialogForm
 				v-if="open"
 				ref="form"
-				:dataForm="form"
+				v-model="form"
 				:rows="[
 					[
 						{
--- a/src/views/quality/base/qualityInspectionType/index.vue
+++ b/src/views/quality/base/qualityInspectionType/index.vue
@ -40,7 +40,7 @@
 			<DialogForm
 				v-if="open"
 				ref="form"
-				:dataForm="form"
+				v-model="form"
 				:rows="[
 					[
 						{
@ -208,7 +208,11 @@ export default {
 				name: null,
 			},
 			// 表单参数
-			form: {},
+      form: {
+        name: null,
+        code: undefined,
+        remark:undefined
+      },
 		};
 	},
 	// watch: {
--- a/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
+++ b/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
@ -246,7 +246,7 @@ export default {
 		// 获取工段列表
 		async getWorksectionList(plId) {
 			const response = await this.$axios(
-				'/base/workshop-section/listByParentId',
+				'/base/core-workshop-section/listByParentId',
 				{
 					params: {
 						id: plId,
--- a/src/views/quality/monitoring/qualityRecentHours/index.vue
+++ b/src/views/quality/monitoring/qualityRecentHours/index.vue
@ -13,9 +13,8 @@
 		<!-- <pre><code v-html="jsondemo"></code></pre> -->

 		<el-skeleton v-if="initing" :rows="6" animated />
-		<div v-else :class="{ 'no-data-bg': !list || list.length == 0 }">
+		<div v-else >
 			<base-table
-				v-if="list && list.length > 0"
 				:table-props="tableProps"
 				:page="queryParams.pageNo"
 				:limit="queryParams.pageSize"
--- a/src/views/quality/monitoring/statisticalData/index.vue
+++ b/src/views/quality/monitoring/statisticalData/index.vue
@ -71,7 +71,10 @@ export default {
          placeholder: '请选择工单号',
          param: 'workOrderIdList',
          selectOptions: [],
-          multiple:true,
+          multiple: true,
+          labelField: 'name',
+          valueField: 'id',
+          defaultSelect: []
        },
 				{
 					type: 'select',
@ -91,8 +94,8 @@ export default {
 					label: '时间段',
 					dateType: 'daterange', // datetimerange
 					// format: 'yyyy-MM-dd HH:mm:ss',
-					format: 'yyyy-MM-dd',
-          valueFormat: 'timestamp',
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
@ -246,7 +249,11 @@ export default {
  },
  mounted() {
    if (this.$route.query.woIdString) {
-      this.queryParams.workOrderIdList = this.$route.query.woIdString
+      console.log(this.$route.query.woIdString);
+      this.queryParams.workOrderIdList = [this.$route.query.woIdString]
+      // let arr =[]
+      this.searchBarFormConfig[0].defaultSelect = [this.$route.query.woIdString]
+      console.log(this.searchBarFormConfig[0].defaultSelect);
    }
    // if (this.$route.params.startTime && this.$route.params.endTime) {
    //   this.searchBarFormConfig[0].defaultSelect = [
@ -301,7 +308,8 @@ export default {
      this.getDict()
    },
 		/** 查询列表 */
-		async getDataList() {
+    async getDataList() {
+      console.log(this.queryParams);
 			this.loading = true;
 			// 执行查询
      const {
--- a/src/views/report/jmreport/index.vue
+++ b/src/views/report/jmreport/index.vue
@ -1,13 +1,13 @@
 <!--
 * @Author: zhp
 * @Date: 2023-10-17 09:26:38
- * @LastEditTime: 2023-10-30 14:53:34
+ * @LastEditTime: 2023-11-16 18:52:00
 * @LastEditors: zhp
 * @Description:
 -->
 <template>
  <div>
-    <doc-alert title="报表设计器" url="https://doc.iocoder.cn/report/" />
+    <!-- <doc-alert title="报表设计器" url="https://doc.iocoder.cn/report/" /> -->
    <i-frame :src="url" />
  </div>
 </template>
@ -17,6 +17,7 @@ import {getAccessToken} from "@/utils/auth";
 export default {
  name: "JimuReport",
  components: { iFrame },
+
  data() {
    return {
      url: process.env.VUE_APP_BASE_API + "/jmreport/list?token=" + getAccessToken(),
--- a/src/views/system/area/index.vue
+++ b/src/views/system/area/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="地区 & IP" url="https://doc.iocoder.cn/area-and-ip/" />
+    <!-- <doc-alert title="地区 & IP" url="https://doc.iocoder.cn/area-and-ip/" /> -->
    <!-- 操作工具栏 -->
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
--- a/src/views/system/errorCode/index.vue
+++ b/src/views/system/errorCode/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="异常处理（错误码）" url="https://doc.iocoder.cn/exception/" />
+    <!-- <doc-alert title="异常处理（错误码）" url="https://doc.iocoder.cn/exception/" /> -->
    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
      <el-form-item label="错误码类型" prop="type">
--- a/src/views/system/loginlog/index.vue
+++ b/src/views/system/loginlog/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="系统日志" url="https://doc.iocoder.cn/system-log/" />
+    <!-- <doc-alert title="系统日志" url="https://doc.iocoder.cn/system-log/" /> -->
    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="登录地址" prop="userIp">
--- a/src/views/system/mail/account/index.vue
+++ b/src/views/system/mail/account/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="邮件配置" url="https://doc.iocoder.cn/mail" />
+    <!-- <doc-alert title="邮件配置" url="https://doc.iocoder.cn/mail" /> -->

    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
--- a/src/views/system/mail/log/index.vue
+++ b/src/views/system/mail/log/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="邮件配置" url="https://doc.iocoder.cn/mail" />
+    <!-- <doc-alert title="邮件配置" url="https://doc.iocoder.cn/mail" /> -->

    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
--- a/src/views/system/mail/template/index.vue
+++ b/src/views/system/mail/template/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="邮件配置" url="https://doc.iocoder.cn/mail" />
+    <!-- <doc-alert title="邮件配置" url="https://doc.iocoder.cn/mail" /> -->

    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@ -1,7 +1,7 @@
 <template>
  <div class="app-container">
-    <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
-    <doc-alert title="菜单路由" url="https://doc.iocoder.cn/vue2/route/" />
+    <!-- <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
+    <doc-alert title="菜单路由" url="https://doc.iocoder.cn/vue2/route/" /> -->
    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
      <el-form-item label="菜单名称" prop="name">
--- a/src/views/system/notify/message/index.vue
+++ b/src/views/system/notify/message/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" />
+    <!-- <doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" /> -->
    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="用户编号" prop="userId">
--- a/src/views/system/notify/my/index.vue
+++ b/src/views/system/notify/my/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" />
+    <!-- <doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" /> -->

    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
--- a/src/views/system/notify/template/index.vue
+++ b/src/views/system/notify/template/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" />
+    <!-- <doc-alert title="站内信配置" url="https://doc.iocoder.cn/notify/" /> -->

    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
--- a/src/views/system/oauth2/client/index.vue
+++ b/src/views/system/oauth2/client/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="OAuth 2.0（SSO 单点登录)" url="https://doc.iocoder.cn/oauth2/" />
+    <!-- <doc-alert title="OAuth 2.0（SSO 单点登录)" url="https://doc.iocoder.cn/oauth2/" /> -->

    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
--- a/src/views/system/oauth2/token/index.vue
+++ b/src/views/system/oauth2/token/index.vue
@ -1,7 +1,7 @@
 <template>
  <div class="app-container">
-    <doc-alert title="OAuth 2.0（SSO 单点登录)" url="https://doc.iocoder.cn/oauth2/" />
-    <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" />
+    <!-- <doc-alert title="OAuth 2.0（SSO 单点登录)" url="https://doc.iocoder.cn/oauth2/" />
+    <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" /> -->

    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
--- a/src/views/system/operatelog/index.vue
+++ b/src/views/system/operatelog/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="系统日志" url="https://doc.iocoder.cn/system-log/" />
+    <!-- <doc-alert title="系统日志" url="https://doc.iocoder.cn/system-log/" /> -->
    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="系统模块" prop="title">
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@ -1,7 +1,7 @@
 <template>
  <div class="app-container">
-    <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
-    <doc-alert title="数据权限" url="https://doc.iocoder.cn/data-permission" />
+    <!-- <doc-alert title="功能权限" url="https://doc.iocoder.cn/resource-permission" />
+    <doc-alert title="数据权限" url="https://doc.iocoder.cn/data-permission" /> -->
    <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
      <el-form-item label="角色名称" prop="name">
        <el-input v-model="queryParams.name" placeholder="请输入角色名称" clearable size="small" style="width: 240px"
--- a/src/views/system/sensitiveWord/index.vue
+++ b/src/views/system/sensitiveWord/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="敏感词" url="https://doc.iocoder.cn/sensitive-word" />
+    <!-- <doc-alert title="敏感词" url="https://doc.iocoder.cn/sensitive-word" /> -->
    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="敏感词" prop="name">
--- a/src/views/system/sms/channel/index.vue
+++ b/src/views/system/sms/channel/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="短信配置" url="https://doc.iocoder.cn/sms/" />
+    <!-- <doc-alert title="短信配置" url="https://doc.iocoder.cn/sms/" /> -->
    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="短信签名" prop="signature">
--- a/src/views/system/sms/log/index.vue
+++ b/src/views/system/sms/log/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="短信配置" url="https://doc.iocoder.cn/sms/" />
+    <!-- <doc-alert title="短信配置" url="https://doc.iocoder.cn/sms/" /> -->
    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
      <el-form-item label="手机号" prop="mobile">
--- a/src/views/system/sms/template/index.vue
+++ b/src/views/system/sms/template/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="短信配置" url="https://doc.iocoder.cn/sms/" />
+    <!-- <doc-alert title="短信配置" url="https://doc.iocoder.cn/sms/" /> -->
    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
      <el-form-item label="短信类型" prop="type">
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="SaaS 多租户" url="https://doc.iocoder.cn/saas-tenant/" />
+    <!-- <doc-alert title="SaaS 多租户" url="https://doc.iocoder.cn/saas-tenant/" /> -->
    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="租户名" prop="name">
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="app-container">
-    <doc-alert title="SaaS 多租户" url="https://doc.iocoder.cn/saas-tenant/" />
+    <!-- <doc-alert title="SaaS 多租户" url="https://doc.iocoder.cn/saas-tenant/" /> -->
    <!-- 搜索工作栏 -->
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="套餐名" prop="name">
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
Author	SHA1	Message	Date
‘937886381’	7523f98f84	Merge branch 'projects/mes-test' into projects/mes-zhp	2023-11-16 18:54:43 +08:00
‘937886381’	b349432eaa	修改bug	2023-11-16 18:52:55 +08:00
g7hoo	4393c0e0e8	Merge pull request 'projects/mes-lb' (#88 ) from projects/mes-lb into projects/mes-test Reviewed-on: #88	2023-11-16 17:31:03 +08:00
lb	42177846e8	Merge branch 'projects/mes-test' into projects/mes-lb	2023-11-16 17:25:39 +08:00
lb	c5b5de7a78	update	2023-11-16 17:23:58 +08:00
lb	0884159dd7	update login	2023-11-16 17:16:37 +08:00
juzi	8a819b84b6	Merge pull request 'projects/mes-zjl' (#87 ) from projects/mes-zjl into projects/mes-test Reviewed-on: #87	2023-11-16 16:54:45 +08:00
juzi	d37c5881a5	2	2023-11-16 16:53:35 +08:00
juzi	2b0579dc70	merge test	2023-11-16 16:13:36 +08:00
juzi	6a10afd04e	1	2023-11-16 16:12:05 +08:00
hellody	fb967fb825	Merge pull request 'projects/mes-dy' (#86 ) from projects/mes-dy into projects/mes-test Reviewed-on: #86	2023-11-16 14:09:07 +08:00
helloDy	25d1ac8d90	merge	2023-11-16 14:07:50 +08:00
helloDy	3667b98da9	bug	2023-11-16 13:57:21 +08:00
g7hoo	d3c289f11e	Merge pull request 'projects/mes-lb' (#85 ) from projects/mes-lb into projects/mes-test Reviewed-on: #85	2023-11-16 13:55:22 +08:00
lb	bbdf0a75f0	update system	2023-11-16 13:47:18 +08:00
lb	26658accfc	Merge branch 'projects/mes-test' into projects/mes-lb	2023-11-16 10:57:20 +08:00
高天泽	31033dd7e2	Merge pull request 'projects/mes-zhp' (#84 ) from projects/mes-zhp into projects/mes-test Reviewed-on: #84	2023-11-16 10:20:53 +08:00