能源2-1

Reviewed-on: #134

.env.prod

@@ -15,14 +15,15 @@ VUE_APP_TITLE = MES系统
 VUE_APP_BASE_API = '/prod-api'
 
 # 积木报表指向地址
-VUE_APP_JIMU_API = 'http://10.70.2.2:8080'
+VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
 
 
 # 根据服务器或域名修改
-PUBLIC_PATH = 'http://10.70.2.32'
+# PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/'
+PUBLIC_PATH = 'http://192.168.0.33:8889/'
 
 # 二级部署路径
-# VUE_APP_APP_NAME ='yudao-admin'
+VUE_APP_APP_NAME ='yudao-admin'
 
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true

.env.stage

@@ -1,21 +1,16 @@
-# 生产环境配置
+NODE_ENV = production
-ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = MES系统
+VUE_APP_TITLE = 产线监控系统
 
-# 芋道管理系统/生产环境
+# 测试环境配置
-VUE_APP_BASE_API = '/prod-api'
+ENV = 'staging'
 
-# 积木报表指向地址
+# 芋道管理系统/测试环境
-VUE_APP_JIMU_API = 'http://192.168.0.33:48082'
+VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'
 
-
+# 静态资源地址
-# 根据服务器或域名修改
+PUBLIC_PATH = 'http://static.yudao.iocoder.cn/'
-PUBLIC_PATH = 'http://192.168.0.33:8889/'
-
-# 二级部署路径
-# VUE_APP_APP_NAME ='yudao-admin'
 
 # 多租户的开关
 VUE_APP_TENANT_ENABLE = true
@@ -25,3 +20,4 @@ VUE_APP_DOC_ENABLE = false
 
 # 百度统计
 VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
+

src/components/Verifition/Verify/VerifySlide.vue

@@ -360,7 +360,6 @@ export default {
         ts: Date.now(), // 现在的时间戳
       }
       reqGet(data).then(res => {
-        console.log(1)
         if (res.repCode === '0000') {
           this.backImgBase = res.repData.originalImageBase64
           this.blockBackImgBase = res.repData.jigsawImageBase64

src/mixins/lb/basicPageMixin.js

@@ -78,7 +78,6 @@ export default {
 			return this.http(this.infoUrl == '' ? this.infoPath : this.infoUrl, 'get', payload);
 		},
 		del(payload) {
-			debugger;
 			return this.http(this.deleteUrl == '' ? this.deletePath : this.deleteUrl, 'delete', payload);
 		},
 

src/router/index.js

@@ -104,7 +104,7 @@ export const constantRoutes = [
     // this generates a separate chunk (about.[hash].js) for this route
     // which is lazy-loaded when the route is visited.
     component: () => import(/* webpackChunkName: "about" */ '@/views/OperationalOverview/coldBoard.vue')
-  }, 
+  },
      {
     path: '/processingBoard',
     name: 'processingBoard',

src/views/choicePart/index.vue

@@ -1,324 +1,349 @@
 <template>
-  <div class="choicepart-container">
+	<div class="choicepart-container">
-    <navbar />
+		<navbar />
-    <div class="choicepart-wrapper">
+		<div class="choicepart-wrapper">
-      <div class="choicepart-box" id="choicepartBox" :style="'transform:scale('+scale+');width:1574px;height:538px;'" v-show="showItem">
+			<div
-      <div class="choicepart-line1">
+				class="choicepart-box"
-        <div
+				id="choicepartBox"
-          v-for="(item, index) in menuArr1"
+				:style="'transform:scale(' + scale + ');width:1574px;height:538px;'"
-          :key="index"
+				v-show="showItem">
-          class="choicepart-item"
+				<div class="choicepart-line1">
-          @click="handelClick(item, item.choicepart)"
+					<div
-          :style="{opacity: item.visible?1:0.4, pointerEvents:item.visible?'auto':'none'}"
+						v-for="(item, index) in menuArr1"
-        >
+						:key="index"
-          <div>
+						class="choicepart-item"
-            <img :src="require(`../../assets/images/choicepart/${item.name}.png`)" alt="">
+						@click="handelClick(item, item.choicepart)"
-          </div>
+						:style="{
-          <div class="choicepart-item-title">{{item.meta.title}}</div>
+							opacity: item.visible ? 1 : 0.4,
-        </div>
+							pointerEvents: item.visible ? 'auto' : 'none',
-      </div>
+						}">
-      <div class="choicepart-line2">
+						<div>
-        <div
+							<img
-          v-for="(item, index) in menuArr2"
+								:src="
-          :key="index"
+									require(`../../assets/images/choicepart/${item.name}.png`)
-          class="choicepart-item"
+								"
-          @click="handelClick(item, item.choicepart)"
+								alt="" />
-          :style="{opacity: item.visible?1:0.4, pointerEvents:item.visible?'auto':'none'}"
+						</div>
-        >
+						<div class="choicepart-item-title">{{ item.meta.title }}</div>
-          <div>
+					</div>
-            <img :src="require(`../../assets/images/choicepart/${item.name}.png`)" alt="">
+				</div>
-          </div>
+				<div class="choicepart-line2">
-          <div class="choicepart-item-title">{{item.meta.title}}</div>
+					<div
-        </div>
+						v-for="(item, index) in menuArr2"
-      </div>
+						:key="index"
-    </div>
+						class="choicepart-item"
-    </div>
+						@click="handelClick(item, item.choicepart)"
-    <div class="choicepart-footer">&copy; 中建材智能自动化研究院有限公司</div>
+						:style="{
-  </div>
+							opacity: item.visible ? 1 : 0.4,
+							pointerEvents: item.visible ? 'auto' : 'none',
+						}">
+						<div>
+							<img
+								:src="
+									require(`../../assets/images/choicepart/${item.name}.png`)
+								"
+								alt="" />
+						</div>
+						<div class="choicepart-item-title">{{ item.meta.title }}</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="choicepart-footer">&copy; 中建材智能自动化研究院有限公司</div>
+	</div>
 </template>
 <script>
-import Navbar from './components/Navbar'
+import Navbar from './components/Navbar';
-import { debounce } from '@/utils/debounce'
+import { debounce } from '@/utils/debounce';
 export default {
-  components: { Navbar },
+	components: { Navbar },
-  name: 'choicePart',
+	name: 'choicePart',
-  data() {
+	data() {
-    return {
+		return {
-      boxReset: '',
+			boxReset: '',
-      scale: 1,
+			scale: 1,
-      menuArr1: [
+			menuArr1: [
-        {
+				{
-          name: 'Core',
+					name: 'Core',
-          title: '基础核心',
+					title: '基础核心',
-          visible: false,
+					visible: false,
-          meta: {
+					meta: {
-            title: ''
+						title: '',
-          }
+					},
-        },
+				},
-        {
+				{
-          name: 'Order',
+					name: 'Order',
-          title: '订单管理',
+					title: '订单管理',
-          visible: false,
+					visible: false,
-          meta: {
+					meta: {
-            title: ''
+						title: '',
-          }
+					},
-        },
+				},
-        {
+				{
-          name: 'Equipment',
+					name: 'Equipment',
-          title: '设备管理',
+					title: '设备管理',
-          visible: false,
+					visible: false,
-          meta: {
+					meta: {
-            title: ''
+						title: '',
-          }
+					},
-        },
+				},
-        {
+				{
-          name: 'Group',
+					name: 'Group',
-          title: '班组管理',
+					title: '班组管理',
-          visible: false,
+					visible: false,
-          meta: {
+					meta: {
-            title: ''
+						title: '',
-          }
+					},
-        },
+				},
-        {
+				{
-          name: 'Quality',
+					name: 'Quality',
-          title: '质量管理',
+					title: '质量管理',
-          visible: false,
+					visible: false,
-          meta: {
+					meta: {
-            title: ''
+						title: '',
-          }
+					},
-        },
+				},
-        {
+				{
-          name: 'Warehouse',
+					name: 'Warehouse',
-          title: '仓库管理',
+					title: '仓库管理',
-          visible: false,
+					visible: false,
-          meta: {
+					meta: {
-            title: ''
+						title: '',
-          }
+					},
-        },
+				},
-        {
+				{
-          name: 'Energy',
+					name: 'Energy',
-          title: '能源管理',
+					title: '能源管理',
-          visible: false,
+					visible: false,
-          meta: {
+					meta: {
-            title: ''
+						title: '',
-          }
+					},
-        }
+				},
-      ],
+			],
-      menuArr2: [
+			menuArr2: [
-        {
+				{
-          name: 'Packaging',
+					name: 'Packaging',
-          title: '包装管理',
+					title: '包装管理',
-          visible: false,
+					visible: false,
-          meta: {
+					meta: {
-            title: ''
+						title: '',
-          }
+					},
-        },
+				},
-        {
+				{
-          name: 'Material',
+					name: 'Material',
-          title: '物料管理',
+					title: '物料管理',
-          visible: false,
+					visible: false,
-          meta: {
+					meta: {
-            title: ''
+						title: '',
-          }
+					},
-        },
+				},
-        {
+				{
-          name: 'Extend',
+					name: 'Extend',
-          title: '工艺管理',
+					title: '工艺管理',
-          visible: false,
+					visible: false,
-          meta: {
+					meta: {
-            title: ''
+						title: '',
-          }
+					},
-        },
+				},
-        {
+				{
-          name: 'Delivery',
+					name: 'Delivery',
-          title: '成品发货',
+					title: '成品发货',
-          visible: false,
+					visible: false,
-          meta: {
+					meta: {
-            title: ''
+						title: '',
-          }
+					},
-        },
+				},
-        {
+				{
-          name: 'Report',
+					name: 'Report',
-          title: '报表管理',
+					title: '报表管理',
-          visible: false,
+					visible: false,
-          meta: {
+					meta: {
-            title: ''
+						title: '',
-          }
+					},
-        },
+				},
-        {
+				{
-          name: 'System',
+					name: 'System',
-          title: '系统管理',
+					title: '系统管理',
-          visible: false,
+					visible: false,
-          meta: {
+					meta: {
-            title: ''
+						title: '',
-          }
+					},
-        }
+				},
-      ],
+				{
-      showItem: false
+					name: 'Devconfig',
-    }
+					title: '开发配置',
-  },
+					visible: false,
-  // computed:{
+					meta: {
-  //   ...mapGetters(['sidebarRouters'])
+						title: '',
-  // },
+					},
-  mounted() {
+				},
-    this.getMsg()
+			],
-    this.boxReset = debounce(() => {
+			showItem: false,
-      this.resetSize()
+		};
-    }, 300)
+	},
-    this.boxReset()
+	// computed:{
-    window.addEventListener('resize', () => {
+	//   ...mapGetters(['sidebarRouters'])
-      this.boxReset()
+	// },
-    })
+	mounted() {
-  },
+		this.getMsg();
-  methods: {
+		this.boxReset = debounce(() => {
-    getMsg() {
+			this.resetSize();
-      let menuList = this.$store.state.permission.sidebarRouters
+		}, 300);
-      console.log(menuList)
+		this.boxReset();
-      if (menuList.length > 0) {
+		window.addEventListener('resize', () => {
-        for (let i = 0; i < menuList.length; i ++) {
+			this.boxReset();
-          for (let k = 0; k < 7; k++) {
+		});
-            if (menuList[i].name === this.menuArr1[k].name) {
+	},
-              this.menuArr1[k].visible = true
+	methods: {
-              this.menuArr1[k].id = menuList[i].id
+		getMsg() {
-              this.menuArr1[k].choicepart = i
+			let menuList = this.$store.state.permission.sidebarRouters;
-              this.menuArr1[k].children = menuList[i].children
+			console.log(menuList);
-              this.menuArr1[k].meta = menuList[i].meta
+			if (menuList.length > 0) {
-            }
+				for (let i = 0; i < menuList.length; i++) {
-          }
+					for (let k = 0; k < 7; k++) {
-          for (let j = 0; j < 6; j++) {
+						if (menuList[i].name === this.menuArr1[k].name) {
-            if (menuList[i].name === this.menuArr2[j].name) {
+							this.menuArr1[k].visible = true;
-              this.menuArr2[j].visible = true
+							this.menuArr1[k].id = menuList[i].id;
-              this.menuArr2[j].id = menuList[i].id
+							this.menuArr1[k].choicepart = i;
-              this.menuArr2[j].choicepart = i
+							this.menuArr1[k].children = menuList[i].children;
-              this.menuArr2[j].children = menuList[i].children
+							this.menuArr1[k].meta = menuList[i].meta;
-              this.menuArr2[j].meta = menuList[i].meta
+						}
-            }
+					}
-          }
+					for (let j = 0; j < 7; j++) {
-        }
+						if (menuList[i].name === this.menuArr2[j].name) {
-      }
+							this.menuArr2[j].visible = true;
-      console.log(this.menuArr1)
+							this.menuArr2[j].id = menuList[i].id;
-      console.log(this.menuArr2)
+							this.menuArr2[j].choicepart = i;
-    },
+							this.menuArr2[j].children = menuList[i].children;
-    handelClick(item, index) {
+							this.menuArr2[j].meta = menuList[i].meta;
-      // this.$router.push({name: 'SystemUser'})
+						}
-      this.$store.dispatch('app/setChoicepart', index)
+					}
-      this.toRouter(item)
+				}
-      // if (item.meta.unuse) {
+			}
-      //   this.$message.warning(this.$t('暂无数据'))
+			console.log(this.menuArr1);
-      // } else {
+			console.log(this.menuArr2);
-      //   this.toRouter(item)
+		},
-      // }
+		handelClick(item, index) {
-    },
+			// this.$router.push({name: 'SystemUser'})
-    toRouter(item) {
+			this.$store.dispatch('app/setChoicepart', index);
-      console.log(item)
+			this.toRouter(item);
-      if (item.children) {
+			// if (item.meta.unuse) {
-        this.toRouter(item.children[0])
+			//   this.$message.warning(this.$t('暂无数据'))
-      } else {
+			// } else {
-        this.$router.push({ name: item.name })
+			//   this.toRouter(item)
-      }
+			// }
-    },
+		},
-    resetSize() {
+		toRouter(item) {
-      let _this = this
+			console.log(item);
-      _this.showItem = false
+			if (item.children) {
-      _this.loading = true
+				this.toRouter(item.children[0]);
-      let choicepartBox = document.querySelector('#choicepartBox')
+			} else {
-      let rw = parseFloat(window.innerWidth)
+				this.$router.push({ name: item.name });
-      let rh = parseFloat(window.innerHeight)
+			}
-      let bw = parseFloat(choicepartBox.style.width)
+		},
-      let bh = parseFloat(choicepartBox.style.height)
+		resetSize() {
-      let wx = 0.82/(bw / rw)
+			let _this = this;
-      let hx = 0.56/(bh / rh)
+			_this.showItem = false;
-      _this.scale = wx > hx ? hx : wx
+			_this.loading = true;
-      setTimeout(_this.showItemFun, 700)
+			let choicepartBox = document.querySelector('#choicepartBox');
-    },
+			let rw = parseFloat(window.innerWidth);
-    showItemFun() {
+			let rh = parseFloat(window.innerHeight);
-      this.loading = false
+			let bw = parseFloat(choicepartBox.style.width);
-      this.showItem = true
+			let bh = parseFloat(choicepartBox.style.height);
-    }
+			let wx = 0.82 / (bw / rw);
-  },
+			let hx = 0.56 / (bh / rh);
-  beforeDestroy() {
+			_this.scale = wx > hx ? hx : wx;
-    this.showItem = false
+			setTimeout(_this.showItemFun, 700);
-  }
+		},
-}
+		showItemFun() {
+			this.loading = false;
+			this.showItem = true;
+		},
+	},
+	beforeDestroy() {
+		this.showItem = false;
+	},
+};
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .choicepart-container {
-  position: relative;
+	position: relative;
-  width: 100%;
+	width: 100%;
-  height: 100%;
+	height: 100%;
-  background: url('../../assets/images/choicepart/choicepart-back.png') repeat;
+	background: url('../../assets/images/choicepart/choicepart-back.png') repeat;
-  background-size: 100% 100%;
+	background-size: 100% 100%;
-  .choicepart-wrapper {
+	.choicepart-wrapper {
-    width: 100vw;
+		width: 100vw;
-    height: calc(100vh - 94px);
+		height: calc(100vh - 94px);
-    display: flex;
+		display: flex;
-    justify-content: center;
+		justify-content: center;
-    align-items: center;
+		align-items: center;
-  }
+	}
-  .choicepart-box {
+	.choicepart-box {
-    // transition: all 0.3s linear;
+		// transition: all 0.3s linear;
-    .choicepart-line1 {
+		.choicepart-line1 {
-      width: 100%;
+			width: 100%;
-      margin-bottom: 80px;
+			margin-bottom: 80px;
-      display: flex;
+			display: flex;
-      flex-flow: row nowrap;
+			flex-flow: row nowrap;
-    }
+		}
-    .choicepart-line2 {
+		.choicepart-line2 {
-      width: 100%;
+			width: 100%;
-      display: flex;
+			display: flex;
-      flex-flow: row nowrap;
+			flex-flow: row nowrap;
-      justify-content: center;
+			justify-content: center;
-    }
+		}
-    .choicepart-item {
+		.choicepart-item {
-      width: 184px;
+			width: 184px;
-      height: 224px;
+			height: 224px;
-      background: url('../../assets/images/choicepart/choice-item-back.png') no-repeat;
+			background: url('../../assets/images/choicepart/choice-item-back.png')
-      background-size: 100% 100%;
+				no-repeat;
-      border-radius: 5px;
+			background-size: 100% 100%;
-      overflow: hidden;
+			border-radius: 5px;
-      cursor: pointer;
+			overflow: hidden;
-      position: relative;
+			cursor: pointer;
-      margin: 0 20px;
+			position: relative;
-      img {
+			margin: 0 20px;
-        width: 184px;
+			img {
-        height: 224px;
+				width: 184px;
-      }
+				height: 224px;
-      .choicepart-item-title {
+			}
-        overflow: hidden;
+			.choicepart-item-title {
-        padding: 0 10px;
+				overflow: hidden;
-        text-overflow: ellipsis;
+				padding: 0 10px;
-        white-space: nowrap;
+				text-overflow: ellipsis;
-        position: absolute;
+				white-space: nowrap;
-        bottom: 0;
+				position: absolute;
-        left: 2px;
+				bottom: 0;
-        right: 2px;
+				left: 2px;
-        text-align: center;
+				right: 2px;
-        color: #fff;
+				text-align: center;
-        font-size: 16px;
+				color: #fff;
-        line-height: 40px;
+				font-size: 16px;
-        height: 40px;
+				line-height: 40px;
-        letter-spacing: 2px;
+				height: 40px;
-        background-color: rgba($color: #0b58ff, $alpha: 0.45);
+				letter-spacing: 2px;
-      }
+				background-color: rgba($color: #0b58ff, $alpha: 0.45);
-    }
+			}
-    .choicepart-item:hover {
+		}
-      .choicepart-item-title {
+		.choicepart-item:hover {
-        background-color: rgba($color: #0b58ff, $alpha: 1);
+			.choicepart-item-title {
-      }
+				background-color: rgba($color: #0b58ff, $alpha: 1);
-    }
+			}
-  }
+		}
-  .choicepart-footer {
+	}
-    position: absolute;
+	.choicepart-footer {
-    width: 100%;
+		position: absolute;
-    color: #C7C7C7;
+		width: 100%;
-    user-select: none;
+		color: #c7c7c7;
-    font-size: 12px;
+		user-select: none;
-    letter-spacing: 1px;
+		font-size: 12px;
-    height: 30px;
+		letter-spacing: 1px;
-    display: grid;
+		height: 30px;
-    place-content: center;
+		display: grid;
-    bottom: 0;
+		place-content: center;
-    opacity: 0.5;
+		bottom: 0;
-  }
+		opacity: 0.5;
+	}
 }
-</style>
+</style>

src/views/equipment/base/alarm/Record/index.vue

@@ -94,7 +94,7 @@ export default {
 		return {
 			readOnly: false,
 			chosedLogId: false,
-			searchBarKeys: ['equipmentName', 'recordTime'],
+			searchBarKeys: ['equipmentName', 'createTime'],
 			tableBtn: [
 				// this.$auth.hasPermi('equipment:spare-parts-config:update')
 				// 	? {
@@ -124,11 +124,11 @@ export default {
 					label: '报警级别',
 					filter: publicFormatter(this.DICT_TYPE.EQU_ALARM_LEVEL),
 				},
-				{ prop: 'createTime', label: '报警时间', filter: timeFilter }, // 接口缺
+				{ prop: 'createTime', label: '报警时间', filter: timeFilter },
-				{ prop: 'alarmCode', label: '设备报警码' }, // 接口缺
+				{ prop: 'alarmCode', label: '设备报警码' },
 				{ prop: 'alarmContent', label: '报警内容' },
 				{ prop: 'opt1', label: '处理记录', name: '查看', subcomponent: btn },
-				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn }, // TODO: 是否换成按钮， 群里问
+				{ prop: 'opt2', label: '处理', name: '报警处理', subcomponent: btn },
 				// { prop: 'remark', label: '备注' },
 			],
 			searchBarFormConfig: [
@@ -145,8 +145,8 @@ export default {
 					dateType: 'daterange', // datetimerange
 					// format: 'yyyy-MM-dd HH:mm:ss',
 					format: 'yyyy-MM-dd',
-					valueFormat: 'timestamp',
+					// valueFormat: 'timestamp',
-					// valueFormat: 'yyyy-MM-dd HH:mm:ss',
+					valueFormat: 'yyyy-MM-dd HH:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始日期',
 					endPlaceholder: '结束日期',