修改上海等字段去除

src/layout/components/Navbar.vue

@@ -114,7 +114,7 @@ export default {
                     this.$store.dispatch('LogOut').then(() => {
                         location.href =
                             process.env.VUE_APP_ENV === 'production'
-                                ? '/hd-realname/index'
+                                ? '/gs-real-name/index'
                                 : '/index'
                     })
                 })

src/router/index.js

@@ -266,5 +266,5 @@ export default new Router({
     mode: 'history', // 去掉url中的#
     scrollBehavior: () => ({ y: 0 }),
     routes: constantRoutes,
-    base: process.env.VUE_APP_ENV === 'production' ? '/hd-realname' : '',
+    base: process.env.VUE_APP_ENV === 'production' ? '/gs-real-name' : '',
 })

src/utils/request.js

@@ -199,7 +199,7 @@ service.interceptors.response.use(
                             // location.href = '/index'
                             location.href =
                                 process.env.VUE_APP_ENV === 'production'
-                                    ? '/hd-realname/index'
+                                    ? '/gs-real-name/index'
                                     : '/index'
                         })
                     })

src/utils/request_formdata.js

@@ -221,7 +221,7 @@ service.interceptors.response.use(
                             // location.href = '/index'
                             location.href =
                                 process.env.VUE_APP_ENV === 'production'
-                                    ? '/hd-realname/index'
+                                    ? '/gs-real-name/index'
                                     : '/index'
                         })
                     })

src/views/basic-manage/project-manage/lot-project/add-or-edit-form.vue

@@ -109,7 +109,7 @@
                 </el-col>
             </el-row>
             <el-row>
-                <el-col :span="12">
+                <!-- <el-col :span="12">
                     <el-form-item label="是否上海项目" prop="isShanghai">
                         <el-radio-group
                             size="medium"
@@ -120,7 +120,7 @@
                             <el-radio-button :label="0">否</el-radio-button>
                         </el-radio-group>
                     </el-form-item>
-                </el-col>
+                </el-col> -->
                 <el-col :span="12">
                     <el-form-item label="工程状态" prop="proStatus">
                         <el-radio-group
@@ -137,8 +137,7 @@
                         </el-radio-group>
                     </el-form-item>
                 </el-col>
-            </el-row>
+
-            <el-row>
                 <el-col :span="12">
                     <el-form-item label="工程地址" prop="proAddress">
                         <el-input
@@ -150,6 +149,8 @@
                         />
                     </el-form-item>
                 </el-col>
+            </el-row>
+            <el-row>
                 <el-col :span="12">
                     <el-form-item label="计划开工时间" prop="startTime">
                         <el-date-picker
@@ -161,17 +162,6 @@
                         />
                     </el-form-item>
                 </el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="12">
-                    <el-form-item label="项目部经度" prop="lon">
-                        <el-input
-                            clearable
-                            placeholder="请输入项目部经度"
-                            v-model="addOrEditForm.lon"
-                        />
-                    </el-form-item>
-                </el-col>
                 <el-col :span="12">
                     <el-form-item label="计划竣工时间" prop="endTime">
                         <el-date-picker
@@ -185,6 +175,15 @@
                 </el-col>
             </el-row>
             <el-row>
+                <el-col :span="12">
+                    <el-form-item label="项目部经度" prop="lon">
+                        <el-input
+                            clearable
+                            placeholder="请输入项目部经度"
+                            v-model="addOrEditForm.lon"
+                        />
+                    </el-form-item>
+                </el-col>
                 <el-col :span="12">
                     <el-form-item label="项目部纬度" prop="lat">
                         <el-input
@@ -195,6 +194,7 @@
                     </el-form-item>
                 </el-col>
             </el-row>
+            <el-row> </el-row>
         </el-form>
     </div>
 </template>

src/views/construction-person/attendance-manage/attendance-machine/config.js

@@ -42,7 +42,7 @@ export const columnsList = [
     { t_props: 'proName', t_label: '工程名称' },
     { t_props: 'subName', t_label: '分包名称' },
     { t_props: 'teamName', t_label: '班组名称' },
-    { t_slot: 'isShanghai', t_label: '工程类型' },
+    // { t_slot: 'isShanghai', t_label: '工程类型' },
     {
         t_label: '状态',
         t_slot: 'onLine',

src/views/construction-person/entry-and-exit-manage/person-entry/add-or-edit-form.vue

@@ -1659,20 +1659,20 @@ export default {
 
             console.log(res, 'res身份证人员是否有入场工程')
 
-            if (
+            // if (
-                res &&
+            //     res &&
-                Object.keys(res).length > 0 &&
+            //     Object.keys(res).length > 0 &&
-                res.isShanghai == 1 &&
+            //     res.isShanghai == 1 &&
-                this.formType == 1
+            //     this.formType == 1
-            ) {
+            // ) {
-                this.$modal.msgError(
+            //     this.$modal.msgError(
-                    '当前人员已经入场上海工程，请前往上海多工程设置模块进行设置,正在跳转...',
+            //         '当前人员已经入场上海工程，请前往上海多工程设置模块进行设置,正在跳转...',
-                )
+            //     )
 
-                setTimeout(() => {
+            //     setTimeout(() => {
-                    this.$emit('onOpenShanghaiProSetting', res.idNumber)
+            //         this.$emit('onOpenShanghaiProSetting', res.idNumber)
-                }, 1000)
+            //     }, 1000)
-            }
+            // }
             if (
                 res &&
                 Object.keys(res).length > 0 &&
@@ -1778,7 +1778,7 @@ export default {
         // 处理下载身份证读卡器驱动
         onHandleDownloadDriver() {
             window.open(
-                window.origin + '/hd-realname' + '/ZKIDROnline-Driven.zip',
+                window.origin + '/gs-real-name' + '/ZKIDROnline-Driven.zip',
             )
         },
 

src/views/construction-person/entry-and-exit-manage/person-entry/index.vue

@@ -53,14 +53,14 @@
                 >
                     模板下载
                 </el-button>
-                <el-button
+                <!-- <el-button
                     size="mini"
                     type="success"
                     icon="el-icon-setting"
                     @click="onHandleShanghaiPersonMultiEngineSetting()"
                 >
                     上海人员多工程设置
-                </el-button>
+                </el-button> -->
             </template>
 
             <!-- 出入场状态 -->
@@ -317,7 +317,7 @@ export default {
             // 判断是否为测试环境
             if (process.env.VUE_APP_ENV === 'production') {
                 window.open(
-                    window.origin + '/hd-realname' + '/人员入场-模版.xlsx',
+                    window.origin + '/gs-real-name' + '/人员入场-模版.xlsx',
                 )
             } else {
                 window.open(window.origin + '/人员入场-模版.xlsx')

src/views/construction-person/red-green-light-mange/dishonesty-person/index.vue

@@ -478,7 +478,7 @@ export default {
             // 判断是否为测试环境
             if (process.env.VUE_APP_ENV === 'production') {
                 window.open(
-                    window.origin + '/hd-realname' + '/失信人员-模板.xlsx',
+                    window.origin + '/gs-real-name' + '/失信人员-模板.xlsx',
                 )
             } else {
                 window.open(window.origin + '/失信人员-模板.xlsx')