mt-fe-group/mt-yd-ui
12
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

lb #1

Merged
gtz217 merged 128 commits from lb into develop 2022-09-20 14:53:17 +08:00
Conversation 0 Commits 128 Files Changed 118 +79 -76
33 changed files with 79 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3df2939fb4 - Show all commits

3
public/index.html
View File

@ -10,6 +10,7 @@
window.SITE_CONFIG['version'] = 'v5.0.0'; window.SITE_CONFIG['version'] = 'v5.0.0';
window.SITE_CONFIG['nodeEnv'] = '<%= process.env.VUE_APP_NODE_ENV %>'; window.SITE_CONFIG['nodeEnv'] = '<%= process.env.VUE_APP_NODE_ENV %>';
window.SITE_CONFIG['apiURL'] = ''; // api请求地址 window.SITE_CONFIG['apiURL'] = ''; // api请求地址
window.SITE_CONFIG['projURL'] = '/yd-monitor'; // api请求地址
window.SITE_CONFIG['storeState'] = {}; // vuex本地储存初始化状态（用于不刷新页面的情况下，也能重置初始化项目中所有状态） window.SITE_CONFIG['storeState'] = {}; // vuex本地储存初始化状态（用于不刷新页面的情况下，也能重置初始化项目中所有状态）
window.SITE_CONFIG['contentTabDefault'] = { // 内容标签页默认属性对象 window.SITE_CONFIG['contentTabDefault'] = { // 内容标签页默认属性对象
'name': '', // 名称, 由 this.$route.name 自动赋值（默认，名称 === 路由名称 === 路由路径） 'name': '', // 名称, 由 this.$route.name 自动赋值（默认，名称 === 路由名称 === 路由路径）
@ -30,7 +31,7 @@
<!-- 开发环境 --> <!-- 开发环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
<script> <script>
window.SITE_CONFIG['apiURL'] = 'http://192.168.1.65:8080/yd-monitor'; window.SITE_CONFIG['apiURL'] = 'http://192.168.1.65:8080';
</script> </script>
<% } %> <% } %>
<!-- 集成测试环境 --> <!-- 集成测试环境 -->

32
src/mixins/view-module.js
View File

@ -1,7 +1,7 @@
import Cookies from 'js-cookie' import Cookies from 'js-cookie'
import qs from 'qs' import qs from 'qs'
export default { export default {
data () { data() {
/* eslint-disable */ /* eslint-disable */
return { return {
// 设置属性 // 设置属性
@ -29,22 +29,24 @@ export default {
} }
/* eslint-enable */ /* eslint-enable */
}, },
created () { created() {
if (this.mixinViewModuleOptions.createdIsNeed) { if (this.mixinViewModuleOptions.createdIsNeed) {
this.query() this.query()
} }
}, },
activated () { activated() {
if (this.mixinViewModuleOptions.activatedIsNeed) { if (this.mixinViewModuleOptions.activatedIsNeed) {
this.query() this.query()
} }
}, },
methods: { methods: {
// 获取数据列表 // 获取数据列表
query () { query() {
this.dataListLoading = true this.dataListLoading = true
this.$http.get( this.$http.get(
this.mixinViewModuleOptions.getDataListURL, this.$http.adornUrl(
this.mixinViewModuleOptions.getDataListURL
),
{ {
params: { params: {
order: this.order, order: this.order,
@ -68,11 +70,11 @@ export default {
}) })
}, },
// 多选 // 多选
dataListSelectionChangeHandle (val) { dataListSelectionChangeHandle(val) {
this.dataListSelections = val this.dataListSelections = val
}, },
// 排序 // 排序
dataListSortChangeHandle (data) { dataListSortChangeHandle(data) {
if (!data.order || !data.prop) { if (!data.order || !data.prop) {
this.order = '' this.order = ''
this.orderField = '' this.orderField = ''
@ -83,13 +85,13 @@ export default {
this.query() this.query()
}, },
// 分页, 每页条数 // 分页, 每页条数
pageSizeChangeHandle (val) { pageSizeChangeHandle(val) {
this.page = 1 this.page = 1
this.limit = val this.limit = val
this.query() this.query()
}, },
// 分页, 当前页 // 分页, 当前页
pageCurrentChangeHandle (val) { pageCurrentChangeHandle(val) {
this.page = val this.page = val
this.query() this.query()
}, },
@ -98,7 +100,7 @@ export default {
this.query() this.query()
}, },
// 新增 / 修改 // 新增 / 修改
addOrUpdateHandle (id) { addOrUpdateHandle(id) {
this.addOrUpdateVisible = true this.addOrUpdateVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addOrUpdate.dataForm.id = id this.$refs.addOrUpdate.dataForm.id = id
@ -106,7 +108,7 @@ export default {
}) })
}, },
// 关闭当前窗口 // 关闭当前窗口
closeCurrentTab (data) { closeCurrentTab(data) {
var tabName = this.$store.state.contentTabsActiveName var tabName = this.$store.state.contentTabsActiveName
this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName) this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName)
if (this.$store.state.contentTabs.length <= 0) { if (this.$store.state.contentTabs.length <= 0) {
@ -118,7 +120,7 @@ export default {
} }
}, },
// 删除 // 删除
deleteHandle (id) { deleteHandle(id) {
if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) { if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) {
return this.$message({ return this.$message({
message: this.$t('prompt.deleteBatch'), message: this.$t('prompt.deleteBatch'),
@ -148,11 +150,11 @@ export default {
this.query() this.query()
} }
}) })
}).catch(() => {}) }).catch(() => { })
}).catch(() => {}) }).catch(() => { })
}, },
// 导出 // 导出
exportHandle () { exportHandle() {
var params = qs.stringify({ var params = qs.stringify({
'token': Cookies.get('token'), 'token': Cookies.get('token'),
...this.dataForm ...this.dataForm

4
src/router/index.js
View File

@ -92,7 +92,7 @@ router.beforeEach((to, from, next) => {
return next() return next()
} }
// 获取字典列表, 添加并全局变量保存 // 获取字典列表, 添加并全局变量保存
http.get('/sys/dict/type/all').then(({ data: res }) => { http.get(http.adornUrl('/sys/dict/type/all')).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return return
} }
@ -101,7 +101,7 @@ router.beforeEach((to, from, next) => {
// console.log("catch /sys/dict/type/all", err) // console.log("catch /sys/dict/type/all", err)
}) })
// 获取菜单列表, 添加并全局变量保存 // 获取菜单列表, 添加并全局变量保存
http.get('/sys/menu/nav').then(({ data: res }) => { http.get(http.adornUrl('/sys/menu/nav')).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
Vue.prototype.$message.error(res.msg) Vue.prototype.$message.error(res.msg)
return next({ name: 'login' }) return next({ name: 'login' })

2
src/utils/request.js
View File

@ -68,7 +68,7 @@ http.interceptors.response.use(response => {
*/ */
http.adornUrl = (actionName) => { http.adornUrl = (actionName) => {
// 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截! // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截!
return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl) + actionName return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.projURL) + actionName
} }
/** /**

2
src/views/main-navbar.vue
View File

@ -89,7 +89,7 @@ export default {
cancelButtonText: this.$t('cancel'), cancelButtonText: this.$t('cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$http.post('/doLogout').then(({ data: res }) => { this.$http.post(this.$http.adornUrl('/doLogout')).then(({ data: res }) => {
if (res.code !== 200) { if (res.code !== 200) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }

4
src/views/modules/code/equipmenFile.vue
View File

@ -187,8 +187,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/equipmenGroup.vue
View File

@ -169,8 +169,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/equipmenattr.vue
View File

@ -163,8 +163,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/equipment.vue
View File

@ -251,8 +251,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/equipmentAlarmLog.vue
View File

@ -169,8 +169,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/equipmentGroupAlarm.vue
View File

@ -199,8 +199,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/equipmentPlc.vue
View File

@ -217,8 +217,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/equipmentPlcConnect.vue
View File

@ -163,8 +163,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/equipmentPlcParam.vue
View File

@ -247,8 +247,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/equipmentQuantity.vue
View File

@ -193,8 +193,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/equipmentStatusLog.vue
View File

@ -187,8 +187,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/equipmentType.vue
View File

@ -181,8 +181,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/equipmentTypeFile.vue
View File

@ -187,8 +187,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

6
src/views/modules/code/factory.vue
View File

@ -172,7 +172,7 @@
getDataList () { getDataList () {
this.dataListLoading = true this.dataListLoading = true
this.$http({ this.$http({
url: this.$http.adornUrl('/monitoring/factory/list'), url: this.$http.adornUrl('/monitoring/factory/page'),
method: 'get', method: 'get',
params: this.$http.adornParams({ params: this.$http.adornParams({
'page': this.pageIndex, 'page': this.pageIndex,
@ -181,8 +181,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.totalCount
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/producArrt.vue
View File

@ -187,8 +187,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/product.vue
View File

@ -205,8 +205,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/productionLine.vue
View File

@ -193,8 +193,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/productionLineRecSch.vue
View File

@ -133,8 +133,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/qualityInspectionDet.vue
View File

@ -163,8 +163,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/qualityInspectionRecord.vue
View File

@ -193,8 +193,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/qualityInspectionType.vue
View File

@ -157,8 +157,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/reportSheet.vue
View File

@ -193,8 +193,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/reportSheetCategory.vue
View File

@ -175,8 +175,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/sysfile.vue
View File

@ -169,8 +169,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/sysfileType.vue
View File

@ -157,8 +157,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/workShopSection.vue
View File

@ -187,8 +187,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

4
src/views/modules/code/workShopSectionEquipment.vue
View File

@ -163,8 +163,8 @@
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.dataList = data.page.list this.dataList = data.list
this.totalPage = data.page.totalCount this.totalPage = data.total
} else { } else {
this.dataList = [] this.dataList = []
this.totalPage = 0 this.totalPage = 0

2
src/views/pages/login.vue
View File

@ -98,7 +98,7 @@ export default {
if (!valid) { if (!valid) {
return false return false
} }
this.$http.post('/login', this.dataForm).then(({ data: res }) => { this.$http.post(this.$http.adornUrl('/login'), this.dataForm).then(({ data: res }) => {
if (res.code !== 200) { if (res.code !== 200) {
// this.getCaptcha() // this.getCaptcha()
return this.$message.error(res.msg) return this.$message.error(res.msg)