diff --git a/public/js/config.js b/public/js/config.js
index bff9bf94..e9918cd1 100644
--- a/public/js/config.js
+++ b/public/js/config.js
@@ -1,4 +1,4 @@
-var COMPANY = ''; //通用
+// var COMPANY = ''; //通用
// var COMPANY='zhongjian'; //中建，和沃尔对接的插件版用这个企业
// var COMPANY='hezhan'; //合展-宿迁
// var COMPANY='nanchang'; //南昌地铁、衢州
@@ -14,7 +14,7 @@ var COMPANY = ''; //通用
// COMPANY = 'zjwj'//中建五局
// COMPANY = 'sccr'//四川成润
// COMPANY = 'pssh'//坪山沙湖项目
-// COMPANY = 'jlw'//金林湾
+COMPANY = 'jlw'//金林湾
// COMPANY = 'shzj'//上海张江
diff --git a/src/assets/js/api/jxjadmin.js b/src/assets/js/api/jxjadmin.js
index ada128a1..2e2e023a 100644
--- a/src/assets/js/api/jxjadmin.js
+++ b/src/assets/js/api/jxjadmin.js
@@ -36,6 +36,7 @@ export const addModuleApi = (data) => post('xmgl/baseModule/add', data)
export const deleteModuleApi = (data) => post('xmgl/baseModule/delete', data)
export const editModuleApi = (data) => post('xmgl/baseModule/edit', data)
export const getAllModuleApi = (data) => post('xmgl/baseModule/list', data)
+export const getAllModulePageApi = (data) => post('/xmgl/baseModule/page', data)
/**
* 菜单管理
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index a5d502b9..86d0a456 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -69,7 +69,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://58.250.210.9:9090' //深汕线上
// axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上
// axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上
- // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
+ axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
// axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址
// axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上
// axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
@@ -83,7 +83,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益
- axios.defaults.baseURL ='http://192.168.34.221:30002/' //郭圣雄本地
+ // axios.defaults.baseURL ='http://192.168.34.221:30002/' //郭圣雄本地
} else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = 'https://www.ceshi.com'
} else if (process.env.NODE_ENV == 'production') {
diff --git a/src/store/index.js b/src/store/index.js
index 0533f9d0..d54f0a33 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -105,10 +105,10 @@ export default new Vuex.Store({
// FILEURL: 'http://182.90.224.147:15551/image/',//四川成润（内部线上）
// UPLOADURL: 'http://118.121.198.147:23232/upload/image',//四川成润（正式）
// FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式）
- // UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾
- // FILEURL: 'http://121.196.214.246/api/image/',//金林湾
- UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地
- FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地
+ UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾
+ FILEURL: 'http://121.196.214.246/api/image/',//金林湾
+ // UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地
+ // FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地
// UPLOADURL: 'http://101.43.164.214:45011/upload/image',//上海优益
// FILEURL: 'http://101.43.164.214:45011/image/',//上海优益
diff --git a/src/views/jxjadmin/dictionaryManaged.vue b/src/views/jxjadmin/dictionaryManaged.vue
index 8f451fcb..e07196d6 100644
--- a/src/views/jxjadmin/dictionaryManaged.vue
+++ b/src/views/jxjadmin/dictionaryManaged.vue
@@ -154,7 +154,7 @@
@@ -311,6 +311,7 @@
diff --git a/src/views/jxjadmin/moduleMenuManage.vue b/src/views/jxjadmin/moduleMenuManage.vue
index 6b9729c0..436b26d5 100644
--- a/src/views/jxjadmin/moduleMenuManage.vue
+++ b/src/views/jxjadmin/moduleMenuManage.vue
@@ -1,9 +1,10 @@
+ 系统版本
+ 系统位置
+
+
{})
+ .catch(() => { })
},
deleteMenu(obj) {
console.log('删除', obj)
this.$confirm(
this.$t('message.personnelPosition.beaconManage.table.confirmText') +
- '【' +
- obj.menuName +
- '】?',
+ '【' +
+ obj.menuName +
+ '】?',
this.$t('message.personnelPosition.beaconManage.table.Tips'),
{
confirmButtonText: this.$t(
@@ -838,15 +856,15 @@ export default {
}
})
})
- .catch(() => {})
+ .catch(() => { })
},
deleteBtn(obj) {
console.log('删除', obj)
this.$confirm(
this.$t('message.personnelPosition.beaconManage.table.confirmText') +
- '【' +
- obj.actionName +
- '】?',
+ '【' +
+ obj.actionName +
+ '】?',
this.$t('message.personnelPosition.beaconManage.table.Tips'),
{
confirmButtonText: this.$t(
@@ -861,7 +879,7 @@ export default {
deleteBtnApi({ actionId: obj.actionId }).then((result) => {
if (result.success) {
this.$message.success(result.message)
- this.getMenuList()
+ this.getBtnList()
}
})
})
@@ -958,13 +976,16 @@ export default {
this.getList()
},
getList() {
- getAllModuleApi({
+ getAllModulePageApi({
moduleType: this.searchModuleType,
- styleType: this.searchStyleType
+ styleType: this.searchStyleType,
+ current: this.current,
+ size: this.size,
}).then((result) => {
if (result.success) {
- this.List = result.result
- // console.log("列表", result);
+ this.List = result.result.records
+ this.pageTotal=result.result.total
+ // console.log("列表", result);
}
})
},
@@ -1023,7 +1044,15 @@ export default {
actionName: '',
status: 1
}
- }
+ },
+ handleSizeChange2(value) {
+ this.size = value
+ this.getList()
+ },
+ handleCurrentChange2(value) {
+ this.current = value
+ this.getList()
+ },
}
}
diff --git a/src/views/jxjadmin/registerAudit.vue b/src/views/jxjadmin/registerAudit.vue
index ba914f6b..5a56e170 100644
--- a/src/views/jxjadmin/registerAudit.vue
+++ b/src/views/jxjadmin/registerAudit.vue
@@ -199,7 +199,7 @@
否
-
+
diff --git a/src/views/projectFront/highModulus/pointManage.vue b/src/views/projectFront/highModulus/pointManage.vue
index 78b380ea..bf61d683 100644
--- a/src/views/projectFront/highModulus/pointManage.vue
+++ b/src/views/projectFront/highModulus/pointManage.vue
@@ -133,7 +133,6 @@
prop="acquisitionInstrumentNumber"
>
@@ -347,7 +346,7 @@
v-if="scope.row.devOpType == 1 || scope.row.devOpType == 2"
placeholder="请输入"
v-model="scope.row.deviceSn"
- type="number"
+ @input="handleInput"
>
{{ scope.row.deviceSn }}
@@ -531,6 +530,13 @@ export default {
this.loadData()
},
methods: {
+ handleInput() {
+ this.devList.forEach(item => {
+ if (item.deviceSn != '') {
+ item.deviceSn = item.deviceSn.replace(/[\u4e00-\u9fa5]/g, '');
+ }
+ })
+ },
changeDate() {
if (this.daterange) {
this.filterForm.startTime = this.daterange[0]
diff --git a/src/views/projectFront/quality/material/makeAnAppointment.vue b/src/views/projectFront/quality/material/makeAnAppointment.vue
index af6f7e5d..7b6925ec 100644
--- a/src/views/projectFront/quality/material/makeAnAppointment.vue
+++ b/src/views/projectFront/quality/material/makeAnAppointment.vue
@@ -57,7 +57,7 @@
:before-close="handleClose">
-
+
@@ -100,7 +100,7 @@
+ :maxlength="8">
@@ -218,17 +218,6 @@ export default {
this.getListData()
},
methods: {
- //限制只能输入英文和数字
- handleInput(type) {
- if (type == 1) {
- // 使用正则表达式匹配只允许输入英文和数字
- this.form.licensePlate = this.form.licensePlate.replace(/[^a-zA-Z0-9]/g, '')
- } else {
- // 使用正则表达式匹配只允许输入英文和数字
- this.editForm.licensePlate = this.editForm.licensePlate.replace(/[^a-zA-Z0-9]/g, '')
- }
-
- },
getEquipmentList() {
getAllRefuelingRecordList({ projectSn: this.projectSn }).then(res => {
this.EquipmentList = res.result