Bladeren bron

注释掉部分不需要的代码

vothin 1 jaar geleden
bovenliggende
commit
b847b09fac
4 gewijzigde bestanden met toevoegingen van 149 en 148 verwijderingen
  1. 13 13
      src/router/index.js
  2. 3 3
      src/utils/domain.js
  3. 124 124
      src/views/ncs-orginazition/components/partInfoEdit.vue
  4. 9 8
      src/views/ncs-orginazition/index.vue

+ 13 - 13
src/router/index.js

@@ -790,19 +790,19 @@ export const adminRoutes = [
   //     }
   //   ]
   // },
-  {
-    path: '/mysql_backups',
-    component: Layout,
-    redirect: '/mysql_backups/index',
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/mysql-backups/index'),
-        name: 'mysql-backups-index',
-        meta: { title: i18n.t('zy20240205.dataBackup'), icon: 'el-icon-refresh', noCache: true }
-      }
-    ]
-  },
+  // {
+  //   path: '/mysql_backups',
+  //   component: Layout,
+  //   redirect: '/mysql_backups/index',
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       component: () => import('@/views/mysql-backups/index'),
+  //       name: 'mysql-backups-index',
+  //       meta: { title: i18n.t('zy20240205.dataBackup'), icon: 'el-icon-refresh', noCache: true }
+  //     }
+  //   ]
+  // },
   {
     path: '/device_frame',
     component: Layout,

+ 3 - 3
src/utils/domain.js

@@ -63,9 +63,9 @@ module.exports = {
 // docker push registry.cn-shenzhen.aliyuncs.com/wdkl/hp_ui:en1.83
 // docker run -idt -p 8008:80 --name ncs-ui --log-opt max-size=500m --log-opt max-file=1  -v /etc/localtime:/etc/localtime --restart always  registry.cn-shenzhen.aliyuncs.com/wdkl/hp_ui:en1.83
 // 西班牙语板
-// docker build -t   registry.cn-shenzhen.aliyuncs.com/wdkl/hp_ui:es1.100 .
-// docker push registry.cn-shenzhen.aliyuncs.com/wdkl/hp_ui:es1.100
-// docker run -idt -p 80:80 -e serverUrl=http://172.16.100.100:8005 -e DeviceUrl=http://172.16.100.100:8006  -e mediaUrl=http://172.16.100.100:8004 --name ncs-ui --log-opt max-size=500m --log-opt max-file=1  -v /etc/localtime:/etc/localtime --restart always  registry.cn-shenzhen.aliyuncs.com/wdkl/hp_ui:es1.100
+// docker build -t   registry.cn-shenzhen.aliyuncs.com/wdkl/hp_ui:es1.101 .
+// docker push registry.cn-shenzhen.aliyuncs.com/wdkl/hp_ui:es1.101
+// docker run -idt -p 8008:80 -e serverUrl=http://47.254.27.69:8005 -e DeviceUrl=http://47.254.27.69:8006  -e mediaUrl=http://47.254.27.69:8004 --name ncs-ui --log-opt max-size=500m --log-opt max-file=1  -v /etc/localtime:/etc/localtime --restart always  registry.cn-shenzhen.aliyuncs.com/wdkl/hp_ui:es1.101
 // 俄语板
 // docker build -t   registry.cn-shenzhen.aliyuncs.com/wdkl/hp_ui:ru1.92 .
 // docker push registry.cn-shenzhen.aliyuncs.com/wdkl/hp_ui:ru1.92

+ 124 - 124
src/views/ncs-orginazition/components/partInfoEdit.vue

@@ -484,11 +484,11 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="8">
-              <el-form-item :label="this.$t('partInfo.convenientServiceEnabled')">
-                <el-checkbox v-model="formmodel.convenient_service_enabled" :true-label="1" :false-label="0">{{ this.$t('action.enabled') }}</el-checkbox>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="8">-->
+<!--              <el-form-item :label="this.$t('partInfo.convenientServiceEnabled')">-->
+<!--                <el-checkbox v-model="formmodel.convenient_service_enabled" :true-label="1" :false-label="0">{{ this.$t('action.enabled') }}</el-checkbox>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
 
             <el-col :span="8">
               <el-form-item :label="this.$t('partInfo.ledServiceEnabled')">
@@ -529,114 +529,114 @@
               </el-form-item>
             </el-col>
 
-          <el-col :span="8">
-            <el-form-item :label="this.$t('partInfo.communicationModeMobile')" prop="communication_mode_mobile">
-              <el-radio-group v-model="formmodel.communication_mode_mobile">
-                <el-radio :label="1">{{ this.$t('partInfo.networkCall') }}</el-radio>
-                <el-radio :label="2">{{ this.$t('partInfo.mobileCall') }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          </el-row>
-          <el-row>
-            <el-form-item :label="this.$t('partInfo.customizeRoleCallFirst')" prop="customize_role_call_first">
-              <el-radio-group v-model="formmodel.customize_role_call_first">
-                <el-radio :label="0">{{ this.$t('partInfo.onDisplay') }}</el-radio>
-                <el-radio :label="item.role_id" :disabled="formmodel.customize_role_call_second===item.role_id ||
-                                                            formmodel.customize_role_call_third===item.role_id ||
-                                                            formmodel.customize_role_call_fourth===item.role_id ||
-                                                            formmodel.customize_role_call_fifth===item.role_id "
-                          v-for="(item,index) in partRoles" :key="index">{{item.role_name}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-row>
-
-          <el-row>
-            <el-form-item :label="this.$t('partInfo.customizeRoleCallSecond')" prop="customize_role_call_second">
-              <el-radio-group v-model="formmodel.customize_role_call_second">
-                <el-radio :label="0">{{ this.$t('partInfo.onDisplay') }}</el-radio>
-                 <el-radio :label="item.role_id" :disabled="formmodel.customize_role_call_first===item.role_id ||
-                                                            formmodel.customize_role_call_third===item.role_id ||
-                                                            formmodel.customize_role_call_fourth===item.role_id ||
-                                                            formmodel.customize_role_call_fifth===item.role_id "
-                           v-for="(item,index) in partRoles" :key="index">{{item.role_name}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-row>
-
-
-          <el-row>
-            <el-form-item :label="this.$t('partInfo.customizeRoleCallThird')" prop="customize_role_call_third">
-              <el-radio-group v-model="formmodel.customize_role_call_third">
-                <el-radio :label="0">{{ this.$t('partInfo.onDisplay') }}</el-radio>
-                 <el-radio :label="item.role_id" :disabled="formmodel.customize_role_call_first===item.role_id ||
-                                                            formmodel.customize_role_call_second===item.role_id ||
-                                                            formmodel.customize_role_call_fourth===item.role_id ||
-                                                            formmodel.customize_role_call_fifth===item.role_id "
-                           v-for="(item,index) in partRoles" :key="index">{{item.role_name}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-row>
-
-
-          <el-row>
-            <el-form-item :label="this.$t('partInfo.customizeRoleCallFourth')" prop="customize_role_call_fourth">
-              <el-radio-group v-model="formmodel.customize_role_call_fourth">
-                <el-radio :label="0">{{ this.$t('partInfo.onDisplay') }}</el-radio>
-                 <el-radio :label="item.role_id" :disabled="formmodel.customize_role_call_first===item.role_id ||
-                                                            formmodel.customize_role_call_second===item.role_id ||
-                                                            formmodel.customize_role_call_third===item.role_id ||
-                                                            formmodel.customize_role_call_fifth===item.role_id "
-                           v-for="(item,index) in partRoles" :key="index">{{item.role_name}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-row>
-
-
-          <el-row>
-            <el-form-item :label="this.$t('partInfo.customizeRoleCallFifth')" prop="customize_role_call_fifth">
-              <el-radio-group v-model="formmodel.customize_role_call_fifth">
-                <el-radio :label="0">{{ this.$t('partInfo.onDisplay') }}</el-radio>
-                 <el-radio :label="item.role_id" :disabled="formmodel.customize_role_call_first===item.role_id ||
-                                                            formmodel.customize_role_call_second===item.role_id ||
-                                                            formmodel.customize_role_call_third===item.role_id ||
-                                                            formmodel.customize_role_call_fourth===item.role_id "
-                           v-for="(item,index) in partRoles" :key="index">{{item.role_name}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-row>
-
-          <el-row>
             <el-col :span="8">
-              <el-form-item :label="this.$t('partInfo.customizeHospitalCallFirst')">
-                <el-input v-model="formmodel.customize_hospital_call_first_name" :label="this.$t('partInfo.customizeHospitalCallFirstName')" :maxlength="15" :placeholder="this.$t('partInfo.inputName')">
-                  <el-select v-model="formmodel.customize_hospital_call_first" filterable slot="prepend" :placeholder="this.$t('action.choice')">
-                    <el-option v-for="(item,index) in otherHostDevice" :key="index" :label="item.name" :value="item.id" />
-                  </el-select>
-                </el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-              <el-form-item :label="this.$t('partInfo.customizeHospitalCallSecond')">
-                <el-input v-model="formmodel.customize_hospital_call_second_name" :label="this.$t('partInfo.customizeHospitalCallSecondName')" :maxlength="15" :placeholder="this.$t('partInfo.inputName')">
-                  <el-select v-model="formmodel.customize_hospital_call_second" filterable slot="prepend" :placeholder="this.$t('action.choice')">
-                    <el-option v-for="(item,index) in otherHostDevice" :key="index" :label="item.name" :value="item.id" />
-                  </el-select>
-                </el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-              <el-form-item :label="this.$t('partInfo.customizeHospitalCallThird')">
-                <el-input v-model="formmodel.customize_hospital_call_third_name" :label="this.$t('partInfo.customizeHospitalCallThirdName')" :maxlength="15" :placeholder="this.$t('partInfo.inputName')">
-                  <el-select v-model="formmodel.customize_hospital_call_third" filterable slot="prepend" :placeholder="this.$t('action.choice')">
-                    <el-option v-for="(item,index) in otherHostDevice" :key="index" :label="item.name" :value="item.id" />
-                  </el-select>
-                </el-input>
+              <el-form-item :label="this.$t('partInfo.communicationModeMobile')" prop="communication_mode_mobile">
+                <el-radio-group v-model="formmodel.communication_mode_mobile">
+                  <el-radio :label="1">{{ this.$t('partInfo.networkCall') }}</el-radio>
+                  <el-radio :label="2">{{ this.$t('partInfo.mobileCall') }}</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
+<!--          <el-row>-->
+<!--            <el-form-item :label="this.$t('partInfo.customizeRoleCallFirst')" prop="customize_role_call_first">-->
+<!--              <el-radio-group v-model="formmodel.customize_role_call_first">-->
+<!--                <el-radio :label="0">{{ this.$t('partInfo.onDisplay') }}</el-radio>-->
+<!--                <el-radio :label="item.role_id" :disabled="formmodel.customize_role_call_second===item.role_id ||-->
+<!--                                                            formmodel.customize_role_call_third===item.role_id ||-->
+<!--                                                            formmodel.customize_role_call_fourth===item.role_id ||-->
+<!--                                                            formmodel.customize_role_call_fifth===item.role_id "-->
+<!--                          v-for="(item,index) in partRoles" :key="index">{{item.role_name}}</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--          </el-row>-->
+
+<!--          <el-row>-->
+<!--            <el-form-item :label="this.$t('partInfo.customizeRoleCallSecond')" prop="customize_role_call_second">-->
+<!--              <el-radio-group v-model="formmodel.customize_role_call_second">-->
+<!--                <el-radio :label="0">{{ this.$t('partInfo.onDisplay') }}</el-radio>-->
+<!--                 <el-radio :label="item.role_id" :disabled="formmodel.customize_role_call_first===item.role_id ||-->
+<!--                                                            formmodel.customize_role_call_third===item.role_id ||-->
+<!--                                                            formmodel.customize_role_call_fourth===item.role_id ||-->
+<!--                                                            formmodel.customize_role_call_fifth===item.role_id "-->
+<!--                           v-for="(item,index) in partRoles" :key="index">{{item.role_name}}</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--          </el-row>-->
+
+
+<!--          <el-row>-->
+<!--            <el-form-item :label="this.$t('partInfo.customizeRoleCallThird')" prop="customize_role_call_third">-->
+<!--              <el-radio-group v-model="formmodel.customize_role_call_third">-->
+<!--                <el-radio :label="0">{{ this.$t('partInfo.onDisplay') }}</el-radio>-->
+<!--                 <el-radio :label="item.role_id" :disabled="formmodel.customize_role_call_first===item.role_id ||-->
+<!--                                                            formmodel.customize_role_call_second===item.role_id ||-->
+<!--                                                            formmodel.customize_role_call_fourth===item.role_id ||-->
+<!--                                                            formmodel.customize_role_call_fifth===item.role_id "-->
+<!--                           v-for="(item,index) in partRoles" :key="index">{{item.role_name}}</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--          </el-row>-->
+
+
+<!--          <el-row>-->
+<!--            <el-form-item :label="this.$t('partInfo.customizeRoleCallFourth')" prop="customize_role_call_fourth">-->
+<!--              <el-radio-group v-model="formmodel.customize_role_call_fourth">-->
+<!--                <el-radio :label="0">{{ this.$t('partInfo.onDisplay') }}</el-radio>-->
+<!--                 <el-radio :label="item.role_id" :disabled="formmodel.customize_role_call_first===item.role_id ||-->
+<!--                                                            formmodel.customize_role_call_second===item.role_id ||-->
+<!--                                                            formmodel.customize_role_call_third===item.role_id ||-->
+<!--                                                            formmodel.customize_role_call_fifth===item.role_id "-->
+<!--                           v-for="(item,index) in partRoles" :key="index">{{item.role_name}}</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--          </el-row>-->
+
+
+<!--          <el-row>-->
+<!--            <el-form-item :label="this.$t('partInfo.customizeRoleCallFifth')" prop="customize_role_call_fifth">-->
+<!--              <el-radio-group v-model="formmodel.customize_role_call_fifth">-->
+<!--                <el-radio :label="0">{{ this.$t('partInfo.onDisplay') }}</el-radio>-->
+<!--                 <el-radio :label="item.role_id" :disabled="formmodel.customize_role_call_first===item.role_id ||-->
+<!--                                                            formmodel.customize_role_call_second===item.role_id ||-->
+<!--                                                            formmodel.customize_role_call_third===item.role_id ||-->
+<!--                                                            formmodel.customize_role_call_fourth===item.role_id "-->
+<!--                           v-for="(item,index) in partRoles" :key="index">{{item.role_name}}</el-radio>-->
+<!--              </el-radio-group>-->
+<!--            </el-form-item>-->
+<!--          </el-row>-->
+
+<!--          <el-row>-->
+<!--            <el-col :span="8">-->
+<!--              <el-form-item :label="this.$t('partInfo.customizeHospitalCallFirst')">-->
+<!--                <el-input v-model="formmodel.customize_hospital_call_first_name" :label="this.$t('partInfo.customizeHospitalCallFirstName')" :maxlength="15" :placeholder="this.$t('partInfo.inputName')">-->
+<!--                  <el-select v-model="formmodel.customize_hospital_call_first" filterable slot="prepend" :placeholder="this.$t('action.choice')">-->
+<!--                    <el-option v-for="(item,index) in otherHostDevice" :key="index" :label="item.name" :value="item.id" />-->
+<!--                  </el-select>-->
+<!--                </el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+
+<!--            <el-col :span="8">-->
+<!--              <el-form-item :label="this.$t('partInfo.customizeHospitalCallSecond')">-->
+<!--                <el-input v-model="formmodel.customize_hospital_call_second_name" :label="this.$t('partInfo.customizeHospitalCallSecondName')" :maxlength="15" :placeholder="this.$t('partInfo.inputName')">-->
+<!--                  <el-select v-model="formmodel.customize_hospital_call_second" filterable slot="prepend" :placeholder="this.$t('action.choice')">-->
+<!--                    <el-option v-for="(item,index) in otherHostDevice" :key="index" :label="item.name" :value="item.id" />-->
+<!--                  </el-select>-->
+<!--                </el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+
+<!--            <el-col :span="8">-->
+<!--              <el-form-item :label="this.$t('partInfo.customizeHospitalCallThird')">-->
+<!--                <el-input v-model="formmodel.customize_hospital_call_third_name" :label="this.$t('partInfo.customizeHospitalCallThirdName')" :maxlength="15" :placeholder="this.$t('partInfo.inputName')">-->
+<!--                  <el-select v-model="formmodel.customize_hospital_call_third" filterable slot="prepend" :placeholder="this.$t('action.choice')">-->
+<!--                    <el-option v-for="(item,index) in otherHostDevice" :key="index" :label="item.name" :value="item.id" />-->
+<!--                  </el-select>-->
+<!--                </el-input>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
 
           <el-row>
             <el-col :span="8">
@@ -777,21 +777,21 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="8" v-if="isShow">
-              <el-form-item :label="this.$t('action.excelUpload')">
-                <el-upload
-                    class="excel-uploader"
-                    :action="`${excelUploadUrl}`"
-                    :show-file-list="false"
-                    :on-success="excelUploaded"
-                    :before-upload="handleExcelBefore"
-                    :limit="1"
-                >
-                  <el-button size="small" type="primary">{{ this.$t('action.uploadFile') }}</el-button>
-                </el-upload>
-                <el-link :href="excelUploadDemo" type="primary" target="_blank" icon="el-icon-download" :underline="false">excel表格模板</el-link>
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="8" v-if="isShow">-->
+<!--              <el-form-item :label="this.$t('action.excelUpload')">-->
+<!--                <el-upload-->
+<!--                    class="excel-uploader"-->
+<!--                    :action="`${excelUploadUrl}`"-->
+<!--                    :show-file-list="false"-->
+<!--                    :on-success="excelUploaded"-->
+<!--                    :before-upload="handleExcelBefore"-->
+<!--                    :limit="1"-->
+<!--                >-->
+<!--                  <el-button size="small" type="primary">{{ this.$t('action.uploadFile') }}</el-button>-->
+<!--                </el-upload>-->
+<!--                <el-link :href="excelUploadDemo" type="primary" target="_blank" icon="el-icon-download" :underline="false">excel表格模板</el-link>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
           </el-row>
 
 

+ 9 - 8
src/views/ncs-orginazition/index.vue

@@ -21,7 +21,7 @@
         </div>
         <div class="toolbar-btns">
           <el-button type="primary" size="mini" @click="createOrginazition">{{ this.$t('partInfo.organizationAdd') }}</el-button>
-          <el-button type="s" size="mini" :disabled="isDisabled" @click="initializeSystem">{{ this.$t('partInfo.initializeSystem') }}</el-button>
+<!--          <el-button type="s" size="mini" :disabled="isDisabled" @click="initializeSystem">{{ this.$t('partInfo.initializeSystem') }}</el-button>-->
         </div>
       </div>
       <el-pagination
@@ -221,13 +221,14 @@ export default {
                 buttonType: 'primary',
                 buttonSize: 'mini'
               },
+              // {
+              //   onClick: param.data['shop_type'] === '5' ? this.deviceBind : this.synchroDevice,
+              //   label: param.data['shop_type'] === '5' ? this.$t('action.deviceFrame') : this.$t('action.synchroDevice'),
+              //   buttonType: param.data['shop_type'] === '5' ? 'success' : 'warning',
+              //   buttonSize: 'mini',
+              //   // disabled: param.data['shop_type'] !== '5'
+              // },
               {
-                onClick: param.data['shop_type'] === '5' ? this.deviceBind : this.synchroDevice,
-                label: param.data['shop_type'] === '5' ? this.$t('action.deviceFrame') : this.$t('action.synchroDevice'),
-                buttonType: param.data['shop_type'] === '5' ? 'success' : 'warning',
-                buttonSize: 'mini',
-                // disabled: param.data['shop_type'] !== '5'
-              },{
                 onClick: this.deleteSingle,
                 label: this.$t('action.delete'),
                 buttonType: 'danger',
@@ -239,7 +240,7 @@ export default {
         filter: false,
         pinned: 'right',
         lockPinned: true,
-        minWidth: this.$i18n.locale === 'zh' ? 230 : 330,
+        minWidth: 200,
         resizable: false,
         sortable: false },