调整企业管理页面

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'//上海张江
 
 

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)
 
 /**
  * 菜单管理

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') {

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',//金林湾
+    UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾
-    // FILEURL: 'http://121.196.214.246/api/image/',//金林湾
+    FILEURL: 'http://121.196.214.246/api/image/',//金林湾
-    UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地
+    // UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地
-    FILEURL: 'http://192.168.34.221:30002/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/',//上海优益
 

src/views/jxjadmin/dictionaryManaged.vue

@@ -154,7 +154,7 @@
             <el-input
               v-model="addEditForm.dictionaryEncoding"
               placeholder="请输入"
-              :disabled="title=='编辑字典'"
+              :disabled="title == '编辑字典'"
             ></el-input>
           </el-form-item>
           <el-form-item label="描述" prop="remarks">
@@ -311,6 +311,7 @@
           </el-form-item>
           <el-form-item label="描述" prop="remarks">
             <el-input
+              :maxlength="10"
               v-model="dataAddEditForm.remarks"
               placeholder="请输入"
             ></el-input>

src/views/jxjadmin/moduleMenuManage.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="fullHeight">
     <div class="searchBox whiteBlock">
+      系统版本
       <el-select
         size="medium"
-        style="margin-right: 20px"
+        style="margin-right: 20px; margin-left: 10px"
         v-model="searchStyleType"
         :placeholder="$t('message.alarmValueSet.placeholder_select')"
         @change="refresh"
@@ -16,9 +17,10 @@
         >
         </el-option>
       </el-select>
+      系统位置
       <el-select
         size="medium"
-        style="margin-right: 20px"
+        style="margin-right: 20px; margin-left: 10px"
         v-model="searchModuleType"
         :placeholder="$t('message.alarmValueSet.placeholder_select')"
         @change="refresh"
@@ -125,6 +127,17 @@
           </template>
         </el-table-column>
       </el-table>
+      <el-pagination
+        class="pagerBox"
+        @size-change="handleSizeChange2"
+        @current-change="handleCurrentChange2"
+        :current-page="current"
+        :page-sizes="$store.state.PAGESIZRS"
+        :page-size="size"
+        layout="total, sizes, prev, pager, next"
+        :total="Number(pageTotal)"
+        background
+      ></el-pagination>
     </div>
     <el-dialog
       @close="close"
@@ -336,6 +349,7 @@
           </template>
         </el-table-column>
       </el-table>
+     
     </el-dialog>
     <el-dialog
       @close="closeMenu"
@@ -591,7 +605,8 @@ import {
   deleteBtnApi,
   editBtnApi,
   getAllBtnApi,
-  getAllMenuByGroupApi
+  getAllMenuByGroupApi,
+  getAllModulePageApi,//分页查询
 } from '@/assets/js/api/jxjadmin'
 
 export default {
@@ -600,6 +615,9 @@ export default {
   },
   data() {
     return {
+      current: 1,
+      size: 10,
+      pageTotal: 0,
       Popup_title: {
         edit: '编辑模块',
         add: '新增模块'
@@ -707,7 +725,7 @@ export default {
         ]
       },
       btnList: [],
-      moudleTypeArr: ['企业模块', '项目后台', '企业后台', '项目看板'],
+      moudleTypeArr: ['企业前台', '项目后台', '企业后台', '项目看板'],
       searchModuleType: 2,
       styleTypeArr: [
         '普通项目级版本',
@@ -788,9 +806,9 @@ export default {
       console.log('删除', obj)
       this.$confirm(
         this.$t('message.personnelPosition.beaconManage.table.confirmText') +
-          '【' +
+        '【' +
-          obj.moduleName +
+        obj.moduleName +
-          '】?',
+        '】?',
         this.$t('message.personnelPosition.beaconManage.table.Tips'),
         {
           confirmButtonText: this.$t(
@@ -810,15 +828,15 @@ export default {
             }
           })
         })
-        .catch(() => {})
+        .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
+          this.List = result.result.records
-          //   console.log("列表", result);
+          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()
+    },
   }
 }
 </script>

src/views/jxjadmin/registerAudit.vue

@@ -199,7 +199,7 @@
               <el-radio :label="1">否</el-radio>
             </el-radio-group>
           </el-col>
-          <el-col :span="13" style="text-align: right">
+          <!-- <el-col :span="13" style="text-align: right">
             <span style="margin-right: 15px">是否启用移动考勤</span>
             <el-radio-group
               v-model="mobileAttendance"
@@ -209,7 +209,7 @@
               <el-radio :label="0">是</el-radio>
               <el-radio :label="1">否</el-radio>
             </el-radio-group>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row :gutter="24" style="margin-top: 20px">
           <el-col :span="16" style="margin: 7px 0px 0 0; width: 100%">

src/views/projectFront/highModulus/pointManage.vue

@@ -133,7 +133,6 @@
             prop="acquisitionInstrumentNumber"
           >
             <el-input
-              type="number"
               v-model="ruleForm.acquisitionInstrumentNumber"
               :placeholder="$t('message.highModulus.placeholderText')"
             ></el-input>
@@ -347,7 +346,7 @@
                 v-if="scope.row.devOpType == 1 || scope.row.devOpType == 2"
                 placeholder="请输入"
                 v-model="scope.row.deviceSn"
-                type="number"
+                @input="handleInput"
               ></el-input>
               <span v-else>{{ scope.row.deviceSn }}</span>
             </template>
@@ -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]

src/views/projectFront/quality/material/makeAnAppointment.vue

@@ -57,7 +57,7 @@
       :before-close="handleClose">
       <el-form ref="form" :model="form" label-width="150px" :rules="addEditRules">
         <el-form-item label="车牌号码：" prop="licensePlate">
-          <el-input v-model="form.licensePlate" style="width:350px" placeholder="请输入" @input="handleInput(1)" :maxlength="7"></el-input>
+          <el-input v-model="form.licensePlate" style="width:350px" placeholder="请输入"  :maxlength="8"></el-input>
         </el-form-item>
         <el-form-item label="发货单位：" prop="forwardingUnit">
           <el-select v-model="form.forwardingUnit" placeholder="请选择" style="width:350px">
@@ -100,7 +100,7 @@
       <el-form ref="editForm" :model="editForm" label-width="150px" :rules="addEditRules">
         <el-form-item label="车牌号码：" prop="licensePlate">
           <el-input v-model="editForm.licensePlate" style="width:350px" placeholder="请输入"
-            @input="handleInput(2)" :maxlength="7"></el-input>
+           :maxlength="8"></el-input>
         </el-form-item>
         <el-form-item label="发货单位：" prop="forwardingUnit">
           <el-select v-model="editForm.forwardingUnit" placeholder="请选择" style="width:350px">
@@ -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