Jeremy 2 years ago
parent
commit
4c91b1b443

+ 5 - 5
VinnoManagementSystem/src/components/admin/selectAdmin.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="$t('admin.AssignAdmin')"
+    :title="$t('admin.assignAdmin')"
     v-model="visible"
     :width="800"
     destroy-on-close
@@ -13,7 +13,7 @@
             <el-input
               v-model="search.KeyWord"
               clearable
-              :placeholder="$t('admin.PleaseInputAdminName')"
+              :placeholder="$t('admin.pleaseInputAdminName')"
             >
             </el-input>
             <el-button type="primary" icon="el-icon-search" @click="upsearch">{{
@@ -41,15 +41,15 @@
             </template>
           </el-table-column>
           <el-table-column
-            :label="$t('admin.AccountName')"
+            :label="$t('admin.accountName')"
             prop="AdminName"
           ></el-table-column>
           <el-table-column
-            :label="$t('admin.FullName')"
+            :label="$t('admin.fullName')"
             prop="FullName"
           ></el-table-column>
           <el-table-column
-            :label="$t('admin.RoleName')"
+            :label="$t('admin.roleName')"
             prop="DefaultRoleName"
           ></el-table-column>
         </scTable>

+ 36 - 35
VinnoManagementSystem/src/locales/lang/en.js

@@ -67,6 +67,7 @@ export default {
 		authorityNameRequire: "Please input authority name",
 		uniqueCodeRequire: "Please input unique code",
 		frontAuthority: "Front Authority",
+		selectItem: "Please select the menu on the left to operate",
 	},
 	dialogBox: {
 		confirmWarningText:"Confirm whether to ",
@@ -96,11 +97,11 @@ export default {
 		description: "Description"
 	},
 	admin: {
-		AssignAdmin: "Assign Admin",
-		PleaseInputAdminName: "Please input name",
-		AccountName: "Account Name",
-		FullName: "User Name",
-		RoleName: "Role Name",
+		assignAdmin: "Assign Admin",
+		pleaseInputAdminName: "Please input name",
+		accountName: "Account Name",
+		fullName: "User Name",
+		roleName: "Role Name",
 		adminQueryTypeOption0: "Account Name",
 		adminQueryTypeOption1: "User Name",
 		adminRoleQuery: "Admin Role",
@@ -112,36 +113,36 @@ export default {
 		assignRole: "assign Role"
 	},
 	organization: {
-		OrganizationName: "Organization Name",
-		OrganizationLogo: "Organization Logo",
-		OrganizationState: "Audit State",
-		OrganizationState0: "WaitAudit",
-		OrganizationState1: "Audited",
-		OrganizationState2: "Rejected",
-		WaitAudit: "WaitAudit",
-		Audited: "Audited",
-		Rejected: "Rejected",
-		CountryName: "Country",
-		ProvinceName: "Province",
-		CityName: "City",
-		PatientType: "Patient Type",
-		PatientType0: "Person",
-		PatientType1: "Animal",
-		AdminFullName: "Admin Name",
-		DirectorName: "Organization Director",
-		QueryType0: "Organization Name",
-		QueryType1: "Admin Name",
-		AssignAdmin: "Assign Admin",
-		ConfirmDelete: "Are You Sure To Del This Organization ?",
-		ConfirmDelete2: "There has users or devices in the current organization. Are you sure to delete this Organization?",
-		FrontOrganization: "Front Organization",
-		ApproveOrgMsg: "Are You Sure To Approve This Organization?",
-		OrgNameRequire: "Please input Organization Name",
-		PatientTypeRequire: "Please choose patient type",
-		UploadLogo: "Upload Logo",
-		SetDirector: "Set Director",
-		Setting0: "Patient Setting",
-		Setting1: "Exam Setting",
+		organizationName: "Organization Name",
+		organizationLogo: "Organization Logo",
+		organizationState: "Audit State",
+		organizationState0: "WaitAudit",
+		organizationState1: "Audited",
+		organizationState2: "Rejected",
+		waitAudit: "WaitAudit",
+		audited: "Audited",
+		rejected: "Rejected",
+		countryName: "Country",
+		provinceName: "Province",
+		cityName: "City",
+		patientType: "Patient Type",
+		patientType0: "Person",
+		patientType1: "Animal",
+		adminFullName: "Admin Name",
+		directorName: "Organization Director",
+		queryType0: "Organization Name",
+		queryType1: "Admin Name",
+		assignAdmin: "Assign Admin",
+		confirmDelete: "Are You Sure To Del This Organization ?",
+		confirmDelete2: "There has users or devices in the current organization. Are you sure to delete this Organization?",
+		frontOrganization: "Front Organization",
+		approveOrgMsg: "Are You Sure To Approve This Organization?",
+		orgNameRequire: "Please input Organization Name",
+		patientTypeRequire: "Please choose patient type",
+		uploadLogo: "Upload Logo",
+		setDirector: "Set Director",
+		setting0: "Patient Setting",
+		setting1: "Exam Setting",
 	},
 	menu: {		
 		home: "Home Page",

+ 36 - 35
VinnoManagementSystem/src/locales/lang/zh-cn.js

@@ -94,13 +94,14 @@ export default {
 		authorityNameRequire: "请输入权限名称",
 		uniqueCodeRequire: "请输入权限唯一码",
 		frontAuthority: "上级权限",
+		selectItem: "请选择左侧菜单后操作",
 	},
 	admin: {
-		AssignAdmin: "分配管理员",
-		PleaseInputAdminName: "请输入管理员姓名",
-		AccountName: "用户名",
-		FullName: "用户姓名",
-		RoleName: "角色名称",
+		assignAdmin: "分配管理员",
+		pleaseInputAdminName: "请输入管理员姓名",
+		accountName: "用户名",
+		fullName: "用户姓名",
+		roleName: "角色名称",
 		adminQueryTypeOption0: "用户名",
 		adminQueryTypeOption1: "姓名",
 		adminRoleQuery: "管理员角色",
@@ -112,36 +113,36 @@ export default {
 		assignRole: "分配角色"
 	},
 	organization: {
-		OrganizationName: "机构名称",
-		OrganizationLogo: "机构Logo",
-		OrganizationState: "审核状态",
-		OrganizationState0: "待审核",
-		OrganizationState1: "已审核",
-		OrganizationState2: "已驳回",
-		WaitAudit: "待审核",
-		Audited: "已审核",
-		Rejected: "已驳回",
-		CountryName: "国家地区",
-		ProvinceName: "省份",
-		CityName: "城市",
-		PatientType: "服务对象",
-		PatientType0: "人用",
-		PatientType1: "兽用",
-		AdminFullName: "所属管理员",
-		DirectorName: "机构负责人",
-		QueryType0: "机构名称",
-		QueryType1: "所属管理员",
-		AssignAdmin: "分配管理员",
-		ConfirmDelete: "确定删除该组织吗?",
-		ConfirmDelete2: "当前机构存在绑定用户或设备,确定删除吗?",
-		FrontOrganization: "上级机构",
-		ApproveOrgMsg: "该机构是否审核通过?",
-		OrgNameRequire: "请输入机构名称",
-		PatientTypeRequire: "请选择服务对象",
-		UploadLogo: "上传Logo",
-		SetDirector: "编辑负责人",
-		Setting0: "病人配置",
-		Setting1: "检查配置",
+		organizationName: "机构名称",
+		organizationLogo: "机构Logo",
+		organizationState: "审核状态",
+		organizationState0: "待审核",
+		organizationState1: "已审核",
+		organizationState2: "已驳回",
+		waitAudit: "待审核",
+		audited: "已审核",
+		rejected: "已驳回",
+		countryName: "国家地区",
+		provinceName: "省份",
+		cityName: "城市",
+		patientType: "服务对象",
+		patientType0: "人用",
+		patientType1: "兽用",
+		adminFullName: "所属管理员",
+		directorName: "机构负责人",
+		queryType0: "机构名称",
+		queryType1: "所属管理员",
+		assignAdmin: "分配管理员",
+		confirmDelete: "确定删除该组织吗?",
+		confirmDelete2: "当前机构存在绑定用户或设备,确定删除吗?",
+		frontOrganization: "上级机构",
+		approveOrgMsg: "该机构是否审核通过?",
+		orgNameRequire: "请输入机构名称",
+		patientTypeRequire: "请选择服务对象",
+		uploadLogo: "上传Logo",
+		setDirector: "编辑负责人",
+		setting0: "病人配置",
+		setting1: "检查配置",
 	},
 	menu: {
 		home: "首页",

+ 2 - 2
VinnoManagementSystem/src/views/adminManage/adminList.vue

@@ -67,11 +67,11 @@
       >
         <el-table-column type="selection" width="50"></el-table-column>
         <el-table-column
-          :label="$t('admin.AccountName')"
+          :label="$t('admin.accountName')"
           prop="AdminName"
         ></el-table-column>
         <el-table-column
-          :label="$t('admin.FullName')"
+          :label="$t('admin.fullName')"
           prop="FullName"
         ></el-table-column>
         <el-table-column

+ 5 - 5
VinnoManagementSystem/src/views/adminManage/saveAdmin.vue

@@ -13,11 +13,11 @@
       label-width="150px"
       label-position="left"
     >
-      <el-form-item :label="$t('admin.AccountName')" prop="AdminName">
+      <el-form-item :label="$t('admin.accountName')" prop="AdminName">
         <el-input
           v-model="form.AdminName"
           clearable
-          :placeholder="$t('admin.AccountName')"
+          :placeholder="$t('admin.accountName')"
           style="width: 60%"
         ></el-input>
       </el-form-item>
@@ -37,11 +37,11 @@
           style="width: 60%"
         ></el-input>
       </el-form-item>
-      <el-form-item :label="$t('admin.FullName')">
+      <el-form-item :label="$t('admin.fullName')">
         <el-input
           v-model="form.AdminFullName"
           clearable
-          :placeholder="$t('admin.FullName')"
+          :placeholder="$t('admin.fullName')"
           style="width: 60%"
         ></el-input>
       </el-form-item>
@@ -98,7 +98,7 @@ export default {
         AdminName: [
           {
             required: true,
-            message: this.$t("admin.AccountName"),
+            message: this.$t("admin.accountName"),
             trigger: "blur",
           },
         ],

+ 21 - 21
VinnoManagementSystem/src/views/organizationManage/organizationList.vue

@@ -17,7 +17,7 @@
           icon="el-icon-share"
           :disabled="selection.length == 0"
           @click="table_saveAdmin"
-          >{{ $t("organization.AssignAdmin") }}</el-button
+          >{{ $t("organization.assignAdmin") }}</el-button
         >
       </div>
       <div class="right-panel">
@@ -38,7 +38,7 @@
                 <el-option
                   v-for="item in queryTypes"
                   :key="item"
-                  :label="$t('organization.QueryType' + item)"
+                  :label="$t('organization.queryType' + item)"
                   :value="item"
                 />
               </el-select>
@@ -49,7 +49,7 @@
             v-model="search.State"
             clearable
             style="width: 200px"
-            :placeholder="$t('organization.OrganizationState')"
+            :placeholder="$t('organization.organizationState')"
             class="filter-item"
           >
             <el-option
@@ -77,11 +77,11 @@
       >
         <el-table-column type="selection" width="50"></el-table-column>
         <el-table-column
-          :label="$t('organization.OrganizationName')"
+          :label="$t('organization.organizationName')"
           prop="OrganizationName"
         ></el-table-column>
         <el-table-column
-          :label="$t('organization.OrganizationLogo')"
+          :label="$t('organization.organizationLogo')"
           prop="LogoUrl"
         >
           <template #default="scope">
@@ -93,43 +93,43 @@
           </template>
         </el-table-column>
         <el-table-column
-          :label="$t('organization.OrganizationState')"
+          :label="$t('organization.organizationState')"
           prop="State"
         >
           <template #default="scope">
             <span>{{
-              $t("organization.OrganizationState" + scope.row.State)
+              $t("organization.organizationState" + scope.row.State)
             }}</span>
           </template>
         </el-table-column>
         <el-table-column
-          :label="$t('organization.CountryName')"
+          :label="$t('organization.countryName')"
           prop="CountryName"
         ></el-table-column>
         <el-table-column
-          :label="$t('organization.ProvinceName')"
+          :label="$t('organization.provinceName')"
           prop="ProvinceName"
         ></el-table-column>
         <el-table-column
-          :label="$t('organization.CityName')"
+          :label="$t('organization.cityName')"
           prop="CityName"
         ></el-table-column>
         <el-table-column
-          :label="$t('organization.PatientType')"
+          :label="$t('organization.patientType')"
           prop="PatientType"
         >
           <template #default="scope">
             <span>{{
-              $t("organization.PatientType" + scope.row.PatientType)
+              $t("organization.patientType" + scope.row.PatientType)
             }}</span>
           </template>
         </el-table-column>
         <el-table-column
-          :label="$t('organization.AdminFullName')"
+          :label="$t('organization.adminFullName')"
           prop="AdminFullName"
         ></el-table-column>
         <el-table-column
-          :label="$t('organization.DirectorName')"
+          :label="$t('organization.directorName')"
           prop="DirectorName"
         ></el-table-column>
         <el-table-column :label="$t('createTime')" prop="CreateTime">
@@ -183,13 +183,13 @@
               <template #dropdown>
                 <el-dropdown-menu>
                   <el-dropdown-item @click="table_saveUser(scope.row)">{{
-                    $t("organization.SetDirector")
+                    $t("organization.setDirector")
                   }}</el-dropdown-item>
                   <el-dropdown-item @click="table_Setting(scope.row, 0)">{{
-                    $t("organization.Setting0")
+                    $t("organization.setting0")
                   }}</el-dropdown-item>
                   <el-dropdown-item @click="table_Setting(scope.row, 1)">{{
-                    $t("organization.Setting1")
+                    $t("organization.setting1")
                   }}</el-dropdown-item>
                 </el-dropdown-menu>
               </template>
@@ -254,7 +254,7 @@ export default {
       queryTypes: ["0", "1"],
       stateTypes: ["WaitAudit", "Audited", "Rejected"],
       selection: [],
-      confirmDel: this.$t("organization.ConfirmDelete"),
+      confirmDel: this.$t("organization.confirmDelete"),
       organizationCode: "",
     };
   },
@@ -345,7 +345,7 @@ export default {
     },
     //审核
     table_audit(row) {
-      this.$confirm(this.$t("organization.ApproveOrgMsg"), this.$t("audit"), {
+      this.$confirm(this.$t("organization.approveOrgMsg"), this.$t("audit"), {
         distinguishCancelAndClose: true,
         confirmButtonText: this.$t("audited"),
         cancelButtonText: this.$t("rejected"),
@@ -387,12 +387,12 @@ export default {
     },
     //删除前验证
     async changeTitle(row) {
-      this.confirmDel = this.$t("organization.ConfirmDelete");
+      this.confirmDel = this.$t("organization.confirmDelete");
       var res = await this.$API.wing.post("OrganizationBindQueryResult", {
         OrganizationCode: row.OrganizationCode,
       });
       if (res.BindDeviceNum > 0 || res.BindUserNum > 0) {
-        this.confirmDel = this.$t("organization.ConfirmDelete2");
+        this.confirmDel = this.$t("organization.confirmDelete2");
       }
     },
     //表格选择后回调事件

+ 13 - 13
VinnoManagementSystem/src/views/organizationManage/saveOrganization.vue

@@ -13,38 +13,38 @@
       label-width="100px"
       label-position="right"
     >
-      <el-form-item :label="$t('organization.OrganizationLogo')" prop="LogoUrl">
+      <el-form-item :label="$t('organization.organizationLogo')" prop="LogoUrl">
         <sc-upload
           v-model="form.LogoUrl"
-          :title="$t('organization.UploadLogo')"
+          :title="$t('organization.uploadLogo')"
           :width="90"
           :height="90"
         ></sc-upload>
       </el-form-item>
       <el-form-item
-        :label="$t('organization.OrganizationName')"
+        :label="$t('organization.organizationName')"
         prop="OrganizationName"
       >
         <el-input
           v-model="form.OrganizationName"
           clearable
-          :placeholder="$t('organization.OrgNameRequire')"
+          :placeholder="$t('organization.orgNameRequire')"
         ></el-input>
       </el-form-item>
-      <el-form-item :label="$t('organization.PatientType')" prop="PatientType">
+      <el-form-item :label="$t('organization.patientType')" prop="PatientType">
         <el-select v-model="form.PatientType" style="width: 100%">
           <el-option
-            :label="$t('organization.PatientType0')"
+            :label="$t('organization.patientType0')"
             :value="0"
           ></el-option>
           <el-option
-            :label="$t('organization.PatientType1')"
+            :label="$t('organization.patientType1')"
             :value="1"
           ></el-option>
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('organization.CountryName')" prop="CountryCode">
+      <el-form-item :label="$t('organization.countryName')" prop="CountryCode">
         <el-select
           v-model="form.CountryCode"
           @change="changeCountry"
@@ -60,7 +60,7 @@
       </el-form-item>
 
       <el-form-item
-        :label="$t('organization.ProvinceName')"
+        :label="$t('organization.provinceName')"
         prop="ProvinceCode"
       >
         <el-select
@@ -78,7 +78,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item :label="$t('organization.CityName')" prop="CityCode">
+      <el-form-item :label="$t('organization.cityName')" prop="CityCode">
         <el-select
           v-model="form.CityCode"
           @change="changeCity"
@@ -95,7 +95,7 @@
       </el-form-item>
 
       <el-form-item
-        :label="$t('organization.FrontOrganization')"
+        :label="$t('organization.frontOrganization')"
         prop="ParentCode"
       >
         <el-select v-model="form.ParentCode" clearable style="width: 100%">
@@ -129,14 +129,14 @@ export default {
         OrganizationName: [
           {
             required: true,
-            message: this.$t("organization.OrgNameRequire"),
+            message: this.$t("organization.orgNameRequire"),
             trigger: "blur",
           },
         ],
         PatientType: [
           {
             required: true,
-            message: this.$t("organization.PatientTypeRequire"),
+            message: this.$t("organization.patientTypeRequire"),
             trigger: "blur",
           },
         ],

+ 2 - 2
VinnoManagementSystem/src/views/organizationManage/saveSetting.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="$t('organization.Setting' + settingType)"
+    :title="$t('organization.setting' + settingType)"
     v-model="visible"
     :width="800"
     destroy-on-close
@@ -17,7 +17,7 @@
         <el-input v-model="form.SettingVersion" disabled></el-input>
       </el-form-item>
       <el-form-item
-        :label="$t('organization.Setting' + settingType)"
+        :label="$t('organization.setting' + settingType)"
         prop="SettingJson"
       >
         <el-input

+ 1 - 1
VinnoManagementSystem/src/views/userManage/saveAuthority.vue

@@ -1,6 +1,6 @@
 <template>
   <el-empty
-    description="请选择左侧菜单后操作"
+    :description="$t('user.selectItem')"
     :image-size="100"
     v-if="!form.MenuId"
   ></el-empty>