.env.dev

@@ -1,8 +1,8 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2023-11-16 14:07:34
+ # @LastEditTime: 2023-11-16 08:52:02
- # @LastEditors: DY
+ # @LastEditors: zhp
  # @Description:
 ###
 # 开发环境配置

.env.prod

@@ -1,10 +1,3 @@
-###
- # @Author: zhp
- # @Date: 2023-11-07 19:11:40
- # @LastEditTime: 2023-11-16 16:40:59
- # @LastEditors: zhp
- # @Description:
-###
 # 生产环境配置
 ENV = 'production'
 
@@ -12,8 +5,7 @@ ENV = 'production'
 VUE_APP_TITLE = MES系统
 
 # 芋道管理系统/生产环境
-VUE_APP_BASE_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = '/prod-api'
-
 
 # 根据服务器或域名修改
 # PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'

src/api/extend/processEquMaterialBom.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zhp
  * @Date: 2023-11-07 19:47:48
- * @LastEditTime: 2023-11-16 17:49:23
+ * @LastEditTime: 2023-11-08 16:59:32
  * @LastEditors: zhp
  * @Description:
  */
@@ -12,7 +12,7 @@ export function processEquMaterialBomPage(data) {
   return request({
     url: '/extend/process-equ-material-bom/page',
     method: 'get',
-    params: data
+    data: data
   })
 }
 

src/api/extend/processEquValueBom.js

@@ -1,18 +1,18 @@
 /*
  * @Author: zhp
  * @Date: 2023-11-09 09:37:14
- * @LastEditTime: 2023-11-16 17:47:21
+ * @LastEditTime: 2023-11-09 14:20:02
  * @LastEditors: zhp
  * @Description:
  */
 import request from '@/utils/request'
 
-
+// 获得能耗统计查询分页
 export function processEquValueBomPage(data) {
   return request({
     url: '/extend/process-equ-value-bom/page',
     method: 'get',
-    params: data
+    data: data
   })
 }
 

src/api/monitoring/statisticalData.js

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

src/assets/styles/index.scss

@@ -6,7 +6,6 @@
 @import './btn.scss';
 
 body {
-	// min-height: 1024px;
 	height: 100%;
 	-moz-osx-font-smoothing: grayscale;
 	-webkit-font-smoothing: antialiased;

src/assets/styles/login.scss

@@ -94,11 +94,8 @@ $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;
@@ -117,64 +114,42 @@ $buttonHeight: $buttonH * 1px;
 			}
 		}
 		.field {
+			// background: #ccc3;
 			position: relative;
-			margin-top: 8%;
+			padding-top: 196px;
-			flex: 2;
+			flex: 1;
-			// 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;
 
-				.title {
+				// h3.title {
-					margin: 0;
+				// 	position: relative;
-					margin-left: 32px;
+
-					font-weight: 400;
+				// 	&::before {
-					user-select: none;
+				// 		content: '';
-					color: #000;
+				// 		background: url($cnbmLogo) 100% / 100% no-repeat;
-					font-size: 36px;
+				// 		height: 48px;
-					line-height: 54px;
+				// 		width: 48px;
-					letter-spacing: 2px;
+				// 		position: absolute;
-				}
+				// 		left: 0px;
+				// 		top: 4px;
+				// 		display: inline-block;
+				// 	}
+				// }
 			}
-
 			.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: 0;
+				margin-top: 32px;
 				box-sizing: border-box;
 				// width: $formWidth;
 				width: 100%;
@@ -308,22 +283,27 @@ $buttonHeight: $buttonH * 1px;
 			line-height: 14px;
 		}
 	}
-}
 
-// - - - - - PC 最小尺寸设置
+	.footer {
-@media screen and (min-width: 1920px) {
+		user-select: none;
-	.container {
+		// 元素
-		.content {
+		height: 16px;
-
+		line-height: 16px;
-			.field {
+		font-size: 12px;
-				flex: initial;
+		color: #8c8c8c;
-				width: 800px;
+		// 定位
-			}
+		position: absolute;
+		bottom: 30px;
+		a,
+		a:hover,
+		a:active {
+			color: inherit;
+			text-decoration: none;
 		}
 	}
 }
 
-
+// - - - - - PC 最小尺寸设置
 @media screen and (min-width: 599px) and (max-width: 1366px) {
 	.container {
 		min-width: 599px;

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.tableData = response.data.list;
-				// this.getStatus(response.data.list)
+				this.getStatus(response.data.list)
         this.listQuery.total = response.data.total;
         this.dataListLoading = false;
       });
@@ -150,7 +150,6 @@ export default {
 			const ids = list.map((i) => {
 				return i.id;
 			});
-			console.log('111', ids)
 			getStatus(ids).then((response) => {
 				response.forEach((a) => {
 					list.forEach((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-16 09:14:35
+ * @LastEditTime: 2023-11-15 17:45:04
  * @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" :disabled="scope.row.actualAssignmentQuantity"></el-input>
+							<el-input v-model="scope.row.planAssignmentQuantity"></el-input>
 						</template>
 					</el-table-column>
 					<el-table-column prop="actualAssignmentQuantity" label="实际分配数量">
 						<template slot-scope="scope">
-							<el-input v-model="scope.row.actualAssignmentQuantity" :disabled="scope.row.actualAssignmentQuantity"></el-input>
+							<el-input v-model="scope.row.actualAssignmentQuantity"></el-input>
 						</template>
 					</el-table-column>
 					<el-table-column label="操作">

src/views/base/coreWorkOrder/detail.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-11-18 14:16:25
  * @LastEditors: DY
- * @LastEditTime: 2023-11-16 13:45:13
+ * @LastEditTime: 2023-11-15 14:18:38
  * @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: pre-wrap">{{ parseTime(item.createTime) }}</span>
+						<span v-for="(item, index) in orderArray" :key="index" style="margin-right: 10px; white-space: normal">{{ item.createTime }}</span>
 					</el-col>
-					<el-col :span="8">计划开始时间:{{ parseTime(dataForm.planStartTime) }}</el-col>
+					<el-col :span="8">计划开始时间:{{ dataForm.planStartTime }}</el-col>
-					<el-col :span="8">计划完成时间:{{ parseTime(dataForm.planFinishTime) }}</el-col>
+					<el-col :span="8">计划完成时间:{{ dataForm.planFinishTime }}</el-col>
 				</el-row>
 				<el-row :gutter="20">
-					<el-col :span="8">预计结束时间:{{ parseTime(dataForm.computeFinishTime) }}</el-col>
+					<el-col :span="8">预计结束时间:{{ dataForm.computeFinishTime }}</el-col>
-					<el-col :span="8">实际开始时间:{{ parseTime(dataForm.startProduceTime) }}</el-col>
+					<el-col :span="8">实际开始时间:{{ dataForm.startProduceTime }}</el-col>
-					<el-col :span="8">实际完成时间:{{ parseTime(dataForm.finishProduceTime) }}</el-col>
+					<el-col :span="8">实际完成时间:{{ dataForm.finishProduceTime }}</el-col>
 				</el-row>
 				<el-row :gutter="20">
 					<el-col :span="8">工单状态:{{ fitlerS(dataForm.status) }}</el-col>
@@ -147,7 +147,6 @@ 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 = [
 	{
@@ -234,7 +233,7 @@ export default {
 		this.getDict()
 	},
 	mounted() {
-		if (this.$route.query.woIdString && this.$route.query.woIdString !== 'undefined') {
+		if (this.$route.query.woIdString) {
 			const idList = this.$route.query.woIdString.split(',')
 			getCoreWOListById(idList).then(res => {
 				this.workOrderButton = res.data.map(work => {

src/views/base/coreWorkOrder/index.vue

@@ -348,25 +348,20 @@ 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(`确定${opration}${'"工单' + val.data.name + '"'}?`, "提示", {
+				this.$confirm(`确定对${'[工单名称=' + val.data.name + ']'}进行${val.type}操作?`, "提示", {
 					confirmButtonText: "确定",
 					cancelButtonText: "取消",
 					type: "warning",
@@ -374,7 +369,7 @@ export default {
         .then(() => {
 					statusChange(param).then(({ data }) => {
 						this.$message({
-							message: '操作成功！工单状态稍后将会更新！',
+							message: '操作成功！',
 							type: 'success',
 							duration: 1500,
 							onClose: () => {

src/views/base/custom/index.vue

@@ -202,7 +202,7 @@ export default {
     }
   },
   created() {
-    // this.init()
+    this.init()
     // console.log('aaaaaa')
     // this.otherPaper()
   },
@@ -227,67 +227,64 @@ export default {
     changeMode() {
       // hiprintTemplate.clear()
       // console.log(this.modelData)
-      this.$nextTick(() => {
+      const { mode } = this
-        const { mode } = this
+      const provider = providers[mode]
-        const provider = providers[mode]
+      hiprint.init({
-        hiprint.init({
+        providers: [provider.f]
-          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
-              }
-            ]
-          }
-        })
-
-        // 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
       })
+
+      // $('#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()
+        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
     },
     /**
      * 设置纸张大小

src/views/core/analysis/yieldAnalysis/index.vue

@@ -80,7 +80,7 @@ export default {
 					type: 'datePicker',
 					label: '时间',
 					dateType: 'month',
-					format: 'yyyy-MM',
+					format: 'yyyy-MM-dd',
 					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',

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.code = val.code ? val.code : undefined;
+          this.listQuery.name = val.name ? val.name : undefined;
 					this.getDataList();
 					break;
 				case 'reset':

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.code = val.code ? val.code : undefined;
+          this.listQuery.name = val.name ? val.name : undefined;
 					this.getDataList();
 					break;
 				case 'reset':

src/views/login.vue

@@ -44,7 +44,7 @@
 								border-radius: 100%;
 								background: #26b9de;
 							"></span>
-						MES
+						产线生产监控系统
 					</p>
 				</div>
 				<video
@@ -67,7 +67,18 @@
 					<h3 class="title">中建材智能自动化研究院有限公司</h3>
 				</h2>
 				<h2 class="pc-title" style="">
-					<h3 class="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;
+						">
 						<img
 							src="../assets/logo/cnbm.png"
 							alt="cnbm_logo"
@@ -92,7 +103,7 @@
 							line-height: 54px;
 							letter-spacing: 2px;
 						">
-						MES
+						产线生产监控系统
 					</h3>
 				</h2>
 
@@ -208,14 +219,12 @@
 							</div>
 
 							<!-- 下方的登录按钮 -->
-							<el-form-item
+							<el-form-item id="button-form-item" style="width: 100%; margin-top: 32px">
-								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>
@@ -349,7 +358,6 @@ export default {
 		};
 	},
 	created() {
-		document.body.style['min-height'] = '1024px';
 		// 租户开关
 		this.tenantEnable = getTenantEnable();
 		if (this.tenantEnable) {
@@ -369,9 +377,6 @@ export default {
 			: undefined;
 		this.getCookie();
 	},
-	destroyed() {
-		document.body.style['min-height'] = 'unset';
-	},
 	methods: {
 		getCode() {
 			// 情况一，未开启：则直接登录

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, 'bind')
+            this.$refs.addWorkOrder.init(val.data.id, 'bind')
           })
           break
         case 'complete':

src/views/quality/base/qualityInspectionDet/index.vue

@@ -42,7 +42,7 @@
 			<DialogForm
 				v-if="open"
 				ref="form"
-				v-model="form"
+				:dataForm="form"
 				:rows="[
 					[
 						{

src/views/quality/base/qualityInspectionType/index.vue

@@ -40,7 +40,7 @@
 			<DialogForm
 				v-if="open"
 				ref="form"
-				v-model="form"
+				:dataForm="form"
 				:rows="[
 					[
 						{
@@ -208,11 +208,7 @@ export default {
 				name: null,
 			},
 			// 表单参数
-      form: {
+			form: {},
-        name: null,
-        code: undefined,
-        remark:undefined
-      },
 		};
 	},
 	// watch: {

src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue

@@ -246,7 +246,7 @@ export default {
 		// 获取工段列表
 		async getWorksectionList(plId) {
 			const response = await this.$axios(
-				'/base/core-workshop-section/listByParentId',
+				'/base/workshop-section/listByParentId',
 				{
 					params: {
 						id: plId,

src/views/quality/monitoring/qualityRecentHours/index.vue

@@ -13,8 +13,9 @@
 		<!-- <pre><code v-html="jsondemo"></code></pre> -->
 
 		<el-skeleton v-if="initing" :rows="6" animated />
-		<div v-else >
+		<div v-else :class="{ 'no-data-bg': !list || list.length == 0 }">
 			<base-table
+				v-if="list && list.length > 0"
 				:table-props="tableProps"
 				:page="queryParams.pageNo"
 				:limit="queryParams.pageSize"

src/views/quality/monitoring/statisticalData/index.vue

@@ -71,10 +71,7 @@ export default {
           placeholder: '请选择工单号',
           param: 'workOrderIdList',
           selectOptions: [],
-          multiple: true,
+          multiple:true,
-          labelField: 'name',
-          valueField: 'id',
-          defaultSelect: []
         },
 				{
 					type: 'select',
@@ -94,8 +91,8 @@ export default {
 					label: '时间段',
 					dateType: 'daterange', // datetimerange
 					// format: 'yyyy-MM-dd HH:mm:ss',
-          format: 'yyyy-MM-dd HH:mm:ss',
+					format: 'yyyy-MM-dd',
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'timestamp',
 					rangeSeparator: '-',
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',
@@ -249,11 +246,7 @@ export default {
   },
   mounted() {
     if (this.$route.query.woIdString) {
-      console.log(this.$route.query.woIdString);
+      this.queryParams.workOrderIdList = 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 = [
@@ -308,8 +301,7 @@ export default {
       this.getDict()
     },
 		/** 查询列表 */
-    async getDataList() {
+		async getDataList() {
-      console.log(this.queryParams);
 			this.loading = true;
 			// 执行查询
       const {

src/views/report/jmreport/index.vue

@@ -1,13 +1,13 @@
 <!--
  * @Author: zhp
  * @Date: 2023-10-17 09:26:38
- * @LastEditTime: 2023-11-16 18:52:00
+ * @LastEditTime: 2023-10-30 14:53:34
  * @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,7 +17,6 @@ import {getAccessToken} from "@/utils/auth";
 export default {
   name: "JimuReport",
   components: { iFrame },
-
   data() {
     return {
       url: process.env.VUE_APP_BASE_API + "/jmreport/list?token=" + getAccessToken(),

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">

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">

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">

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">

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">

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">

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/resource-permission" />
-    <doc-alert title="菜单路由" url="https://doc.iocoder.cn/vue2/route/" /> -->
+    <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">

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">

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">

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">

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">

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="OAuth 2.0（SSO 单点登录)" url="https://doc.iocoder.cn/oauth2/" />
-    <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" /> -->
+    <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" />
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">

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">

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/resource-permission" />
-    <doc-alert title="数据权限" url="https://doc.iocoder.cn/data-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"

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">

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">

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">

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">

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">

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">