.env.dev

@@ -9,7 +9,7 @@
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = 产线监控系统
+VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://192.168.1.49:48080'

.env.front

@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 页面标题
-VUE_APP_TITLE = 产线监控系统
+VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/本地环境
 VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'

.env.prod

@@ -2,7 +2,7 @@
 ENV = 'production'
 
 # 页面标题
-VUE_APP_TITLE = 产线监控系统
+VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/生产环境
 VUE_APP_BASE_API = '/prod-api'

.env.stage

@@ -1,7 +1,7 @@
 NODE_ENV = production
 
 # 页面标题
-VUE_APP_TITLE = 产线监控系统
+VUE_APP_TITLE = 芋道管理系统
 
 # 测试环境配置
 ENV = 'staging'

.env.static

@@ -4,7 +4,7 @@ NODE_ENV = development
 ENV = 'staging'
 
 # 页面标题
-VUE_APP_TITLE = 产线监控系统
+VUE_APP_TITLE = 芋道管理系统
 
 # 芋道管理系统/测试环境
 VUE_APP_BASE_API = 'http://127.0.0.1:48080'

src/layout/components/Navbar.vue

@@ -94,7 +94,7 @@ export default {
     async logout() {
       this.$modal.confirm('确定注销并退出系统吗？', '提示').then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = getPath('/');
+          location.href = getPath('/index');
         })
       }).catch(() => {});
     }

src/router/index.js

@@ -65,17 +65,16 @@ export const constantRoutes = [
     hidden: true
   },
   {
-    path: '/',
+    path: '',
     component: Layout,
-    redirect: 'core/base/factory',
+    redirect: 'index',
-    // children: [{
+    children: [{
-    //   path: 'index',
+        path: 'index',
-    //   redirect: 'core/base/factory',
+        component: (resolve) => require(['@/views/index'], resolve),
-    //   component: (resolve) => require(['@/views/index'], resolve),
+        name: '首页',
-    //   name: '首页',
+        meta: {title: '首页', icon: 'dashboard', affix: true}
-    //   meta: { title: '首页', icon: 'dashboard', affix: true }
+      }
-    // }
+    ]
-    // ]
   },
   {
     path: '/user',

src/views/base/equipmentPlcConnect/index.vue

@@ -144,7 +144,7 @@ export default {
 				},
 				{
 					type: 'select',
-					label: '编码',
+					label: 'PLC编码',
 					placeholder: '请选择编码',
 					param: 'plcId',
 					selectOptions: [],
@@ -184,9 +184,6 @@ export default {
 						labelKey: `plcTableName`,
 						url: '/base/equipment-plc/listAll',
 						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: {
-							filterable: true
-						}
 					},
 				],
 				[
@@ -196,9 +193,6 @@ export default {
 						prop: 'equipmentId',
 						url: '/base/equipment/page?pageNo=1&pageSize=99',
 						rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
-						bind: {
-							filterable: true
-						}
 					},
 				],
 			],
@@ -357,7 +351,11 @@ export default {
 		handleDelete(row) {
 			const id = row.id;
 			this.$modal
-				.confirm('是否删除该配置?')
+				.confirm(
+					'是否确认删除设备与实时采集关系表（一对多）编号为"' +
+						id +
+						'"的数据项?'
+				)
 				.then(function () {
 					return deleteEquipmentPlcConnect(id);
 				})

src/views/energy/analysis/qoqAnalysis/components/searchArea.vue

@@ -8,7 +8,6 @@
         :props="{ checkStrictly: true, value: 'id', label: 'name' }"
         popper-class="cascaderParent"
         size="small"
-        style="width: 250px;"
         clearable></el-cascader>
     </el-form-item>
     <el-form-item label="时间维度">
@@ -158,31 +157,7 @@ export default {
       this.$emit('submit', this.queryParams)
     },
     exportData() {
-      let name
+      this.$emit('exportD')
-      if (this.queryParams.objId) {
-        name = this.getObjName(this.objList, this.queryParams.objId)
-      } else {
-        this.$modal.msgWarning("对象不能为空")
-        return false
-      }
-      this.$emit('exportD', {name: name})
-    },
-    // 递归取对象name
-    getObjName(list, id) {
-      let _this = this
-      for (let i = 0; i < list.length; i++) {
-        let a = list[i]
-        if (a.id === id) {
-          return a.name
-        } else {
-          if (a.children && a.children.length > 0) {
-            let res = _this.getObjName(a.children, id)
-            if (res) {
-              return res
-            }
-          }
-        }
-      }
     },
     transformTime(timeStamp) {// 本月最后一天
       let year = moment(timeStamp).format('YYYY')

src/views/energy/analysis/qoqAnalysis/index.vue

@@ -83,10 +83,9 @@ export default {
       }
       this.chartData = this.list
     },
-    exportData(val) {
+    exportData() {
       if (this.list.length > 0) {
         var wb = XLSX.utils.table_to_book(document.querySelector(".qoq-out-table"))
-        let fileName = val.name + "环比分析.xlsx"
         var wbout = XLSX.write(wb, {
             bookType: "xlsx",
             bookSST: true,
@@ -95,7 +94,7 @@ export default {
         try {
             FileSaver.saveAs(
             new Blob([wbout], { type: "application/octet-stream" }),
-            fileName
+            "环比分析.xlsx"
             )
         } catch (e) {
             if (typeof console !== "undefined") console.log(e, wbout);

src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue

@@ -99,7 +99,7 @@ export default {
           if (res.code === 0) {
             this.form = res.data
             this.form.plcParamId = res.data.plcParamId || ''
-            this.form.limitType = this.form.limitType ? this.form.limitType + '' : ''
+            this.form.limitType = this.form.limitType + ''
             this.objIds = this.changeDetSelect(this.form.objectId, this.objList)
             if (this.form.type === 2) {
               this.getDetailList()

src/views/energy/monitoring/energyOverlimitLog/index.vue

@@ -46,7 +46,7 @@ const tableProps = [
     label: '监控模式'
   },
   {
-    prop: 'paramName',
+    prop: 'plcParamId',
     label: '监控参数'
   },
   {

vue.config.js

@@ -8,7 +8,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '中建材智能自动化研究院有限公司' // 网页标题
+const name = process.env.VUE_APP_TITLE || '芋道管理系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口