From 7af40104d36eb85f25737c10e60464e46422073c Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Fri, 19 Jul 2024 14:46:44 +0800
Subject: [PATCH] 应用信息页面完成（上报没写）

---
 package.json                        |   1 +
 src/assets/scss/common.scss         |  17 +++++++++++------
 src/assets/style/common.scss        |   7 ++++---
 src/components/InfoForm/index.vue   |  14 +++++++++-----
 src/components/Pagination/index.vue |  14 ++++++++++++--
 src/lang/en.js                      | 253 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/lang/index.js                   |  50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/lang/zh.js                      | 253 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/lang/zhtw.js                    | 254 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main.js                         |   3 +++
 src/mixins/info.js                  |   1 -
 src/views/baseSystemInfo/index.vue  | 389 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------
 src/views/systemPage/InfoList.vue   |   9 ---------
 13 files changed, 1111 insertions(+), 154 deletions(-)
 create mode 100644 src/lang/en.js
 create mode 100644 src/lang/index.js
 create mode 100644 src/lang/zh.js
 create mode 100644 src/lang/zhtw.js

diff --git a/package.json b/package.json
index 19039c5..86b35ab 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "sass-loader": "^14.2.1",
     "style-loader": "^4.0.0",
     "vue": "^2.6.14",
+    "vue-i18n": "^7.3.2",
     "vue-router": "^2.8.1",
     "vuex": "^3.6.2"
   },
diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index 4e90fa9..5b2c4b2 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -30,11 +30,11 @@
   width: 100%;
   display: flex;
   position: relative;
-  background: #EBEEF5;
+  background: unset;
 
   .NCC-common-layout-left {
     width: 220px;
-    background-color: #fff;
+    // background-color: #fff;
     flex-shrink: 0;
     height: 100%;
     display: flex;
@@ -85,7 +85,7 @@
   .NCC-common-layout-main {
     flex: 1;
     padding: 0 0 10px;
-    background-color: #fff;
+    // background-color: #fff;
     height: 100%;
     overflow: hidden;
 
@@ -96,10 +96,10 @@
 }
 
 .NCC-common-search-box {
-  background: #fff;
+  // background: #fff;
   flex-shrink: 0;
   margin-bottom: 10px;
-  padding: 15px 10px 0;
+  // padding: 15px 10px 0;
   position: relative;
 
   .el-form-item {
@@ -129,7 +129,8 @@
   .NCC-common-search-box-right {
     position: absolute;
     right: 10px;
-    top: 15px;
+    // top: 15px;
+    top: 0px;
   }
 }
 
@@ -211,6 +212,10 @@
   .sort-caret.descending {
     bottom: 1px !important;
   }
+  .btn_dialog {
+    display: inline-block; 
+    margin-right: 10px;
+  }
 }
 
 .NCC-table-delBtn {
diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss
index f28f0fa..d7b1244 100644
--- a/src/assets/style/common.scss
+++ b/src/assets/style/common.scss
@@ -30,6 +30,9 @@ body,
   -webkit-border-radius: 6px
 }
 
+.common-info-box {
+  height: calc(100vh - 200px);
+}
 .item-box {
   width: 100%;
   border-radius: 10px;
@@ -60,6 +63,4 @@ a {
  text-decoration: none
 
 } 
-.common-info-box {
-  height: calc(100vh - 200px);
-}
+
diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue
index 56675c5..783fd56 100644
--- a/src/components/InfoForm/index.vue
+++ b/src/components/InfoForm/index.vue
@@ -4,7 +4,7 @@
       <slot></slot>
     </div>
     <el-dialog
-      :title="`${type == 'add' ? '新增' : '编辑'}信息`"
+      :title="`${type == 'add' ? '新增' : '修改'}信息`"
       :close-on-click-modal="false"
       :visible.sync="visible"
       lock-scroll
@@ -79,7 +79,7 @@
                   v-for="v in systemTypeOptions"
                   :key="v.Id"
                   :label="v.Id"
-                  @change="initSystemClassList"
+                  @change="handleSystemTypeChange"
                   >{{ v.FullName }}</el-radio
                 >
               </el-radio-group>
@@ -344,7 +344,7 @@ export default {
       this.companyInfo = data;
       this.isShowCompanyInfo = true;
     },
-   
+
     // 文件上传--------------------
     httpRequest(file) {
       uploader({
@@ -355,7 +355,7 @@ export default {
       });
     },
     // 文件上传--------------------
-   
+
     reset() {
       for (let key in this.infoForm) {
         this.infoForm[key] = undefined;
@@ -389,6 +389,10 @@ export default {
       await this.companyChange(data.companyId);
       this.$forceUpdate();
     },
+    handleSystemTypeChange(val) {
+      this.query.systemClass = "";
+      this.initSystemClassList(val);
+    },
     async confirm() {
       this.$refs["infoForm"].validate((valid) => {
         if (valid) {
@@ -472,4 +476,4 @@ export default {
   }
 }
 </style>
-@/api/baseData/area@/api/baseData/company
\ No newline at end of file
+@/api/baseData/area@/api/baseData/company
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 56f5a6b..1a9d453 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -105,8 +105,18 @@ export default {
 
 <style scoped>
 .pagination-container {
-  background: #fff;
-  padding: 32px 16px;
+  background: unset;
+  color: #fff;
+  padding: 0px 16px;
+}
+.el-pagination {
+  float: right;
+}
+:deep(.el-pagination__total) {
+  color: #fff;
+}
+:deep(.el-pagination__jump) {
+  color: #fff;
 }
 .pagination-container.hidden {
   display: none;
diff --git a/src/lang/en.js b/src/lang/en.js
new file mode 100644
index 0000000..65e5817
--- /dev/null
+++ b/src/lang/en.js
@@ -0,0 +1,253 @@
+export default {
+  route: {
+    "home": "Home",
+    "dashboard": "Dashboard",
+    "onlineDev": "OnlineDev",
+    "onlineDev-webDesign": "WebDesign",
+    "onlineDev-appDesign": "APPDesign",
+    "onlineDev-dataReport": "DataReport",
+    "onlineDev-dataScreen": "DataScreen",
+    "onlineDev-visualPortal": "VisualPortal",
+    "generator": "Generator",
+    "generator-webForm": "WebForm",
+    "generator-appForm": "AppForm",
+    "generator-flowForm": "FlowForm",
+    "system": "System",
+    "system-sysConfig": "SysConfig",
+    "system-notice": "Notice",
+    "system-task": "Task",
+    "system-cache": "CacheManage",
+    "system-log": "Log",
+    "system-monitor": "Monitor",
+    "system-icons": "Icons",
+    "system-language": "Language",
+    "system-menu": "Menu",
+    "system-area": "Area",
+    "system-billRule": "BillRule",
+    "systemData": "SystemData",
+    "systemData-dataSource": "DataSource",
+    "systemData-dataModel": "DataModel",
+    "systemData-dataSync": "DataSync",
+    "systemData-dataBackup": "DataBackup",
+    "systemData-dataInterface": "DataInterface",
+    "systemData-dictionary": "Dictionary",
+    "systemData-map": "Map",
+    "weChat": "WeChat",
+    "weChat-mpConfig": "MPConfig",
+    "weChat-mpMenu": "MPMenu",
+    "weChat-mpUser": "MPUser",
+    "weChat-mpMessage": "MPMessage",
+    "weChat-mpMaterial": "MPMaterial",
+    "weChat-qyhConfig": "QYHConfig",
+    "weChat-qyDepartment": "QYDepartment",
+    "weChat-qyUser": "QYUser",
+    "weChat-qyMessage": "QYMessage",
+    "permission": "Permission",
+    "permission-organize": "Organize",
+    "permission-department": "Department",
+    "permission-position": "Position",
+    "permission-user": "User",
+    "permission-role": "Role",
+    "permission-authorize": "Authorize",
+    "permission-userOnline": "UserOnline",
+    "workFlow": "WorkFlow",
+    "workFlow-flowEngine": "FlowEngine",
+    "workFlow-flowLaunch": "FlowLaunch",
+    "workFlow-flowTodo": "FlowTodo",
+    "workFlow-flowDone": "FlowDone",
+    "workFlow-flowCirculate": "FlowCirculate",
+    "workFlow-entrust": "Entrust",
+    "workFlow-flowMonitor": "FlowMonitor",
+    "extend-graphDemo": "Graph Demo",
+    "extend-graphDemo-echartsBar": "E-Bar",
+    "extend-graphDemo-echartsPie": "E-Pie",
+    "extend-graphDemo-echartsBarAcross": "E-BarAcross",
+    "extend-graphDemo-echartsGauge": "E-Gauge",
+    "extend-graphDemo-echartsLineArea": "E-LineArea",
+    "extend-graphDemo-echartsScatter": "E-Scatter",
+    "extend-graphDemo-echartsCandlestick": "E-Candlestick",
+    "extend-graphDemo-echartsLineBar": "E-LineBar",
+    "extend-graphDemo-echartsTree": "E-Tree",
+    "extend-graphDemo-echartsFunnel": "E-Funnel",
+    "extend-graphDemo-highchartsScatter": "H-Scatter",
+    "extend-graphDemo-highchartsWordcloud": "H-Wordcloud",
+    "extend-graphDemo-highchartsLine": "H-Line",
+    "extend-graphDemo-highchartsArea": "H-Area",
+    "extend-graphDemo-highchartsGauge": "H-Gauge",
+    "extend-graphDemo-highchartsBellcurve": "H-Bellcurve",
+    "extend-graphDemo-highchartsFunnel": "H-Funnel",
+    "extend-graphDemo-highchartsBullet": "H-Bullet",
+    "extend-graphDemo-highchartsColumn": "H-Column",
+    "extend-graphDemo-highchartsPie": "H-Pie",
+    "extend-tableDemo": "Table Demo",
+    "extend-tableDemo-commonTable": "CommonTable",
+    "extend-tableDemo-statisticsTable": "StatisticsTable",
+    "extend-tableDemo-lockTable": "LockTable",
+    "extend-tableDemo-groupingTable": "GroupingTable",
+    "extend-tableDemo-redactTable": "RedactTable",
+    "extend-tableDemo-complexHeader": "ComplexHeader",
+    "extend-tableDemo-mergeTable": "MergeTable",
+    "extend-tableDemo-printTable": "PrintTable",
+    "extend-tableDemo-extension": "Extension",
+    "extend-tableDemo-treeTable": "TreeTable",
+    "extend-tableDemo-postilTable": "PostilTable",
+    "extend-tableDemo-tableTree": "TableTree",
+    "extend-tableDemo-signTable": "SignTable",
+    "extend-formDemo": "Form Demo",
+    "extend-formDemo-verifyForm": "VerifyForm",
+    "extend-formDemo-verifyForm1": "VerifyForm1",
+    "extend-formDemo-fieldForm1": "FieldForm1",
+    "extend-formDemo-fieldForm2": "FieldForm2",
+    "extend-formDemo-fieldForm3": "FieldForm3",
+    "extend-formDemo-fieldForm4": "FieldForm4",
+    "extend-formDemo-fieldForm5": "FieldForm5",
+    "extend-formDemo-fieldForm6": "FieldForm6",
+    "extend": "Extend",
+    "extend-bigData": "BigData",
+    "extend-importAndExport": "ImportAndExport",
+    "extend-signet": "Signet",
+    "extend-signature": 'Signature',
+    "extend-schedule": "Schedule",
+    "extend-email": "Email",
+    "extend-document": "Document",
+    "extend-documentPreview": "DocumentPreview",
+    "extend-barCode": "BarCode",
+    "extend-printData": "PrintData",
+    "extend-map": "Map",
+    "extend-order": "Order",
+    "extend-projectGantt": "ProjectGantt",
+    "moreMenu": "More...",
+    "dataReport": "DataReport Demo",
+    "reportBI": "ReportBI Demo",
+  },
+  navbar: {
+    profile: 'Profile',
+    feedback: 'Feedback',
+    about: 'About',
+    lockScreen: 'Lock Screen',
+    documentation: 'Documentation',
+    logOut: 'Log Out',
+    notice: 'Notice',
+    chat: 'Chat',
+    setting: 'Setting'
+  },
+  login: {
+    title: 'Account Password Login',
+    scanTitle: 'APP Scan Login',
+    codeTitle: 'Verification Code Login',
+    logIn: 'Login',
+    username: 'Username / Mobile Number',
+    password: 'Password',
+    rule: 'Sub Account: mobile@account example:18577778888@101001',
+    version: 'V',
+    upper: 'Caps locked',
+    scanTip: 'APP Scan code login',
+    accountTip: 'Please enter the account number',
+    passwordTip: 'Please enter your password',
+    mobile: 'Please enter mobile number',
+    rightMobile: 'Please enter the correct mobile number',
+    smsCode: 'Please enter the verification code',
+    getCode: 'Get code',
+    reSend: 'Resend',
+    company: 'Please enter company name',
+    contacts: 'Please enter contact'
+  },
+  tagsView: {
+    refresh: 'Refresh',
+    close: 'Close',
+    closeOthers: 'Close Others',
+    closeAll: 'Close All'
+  },
+  settings: {
+    mode: 'NavigationMode',
+    classic: 'Classic',
+    functional: 'Functional',
+    plain: 'Plain',
+    blend: 'Blend',
+    lightOrDark: 'Light&Dark',
+    dark: 'Dark',
+    lightWhite: 'Light',
+    theme: 'ThemeColor',
+    blue: 'Blue',
+    purple: 'Purple',
+    azure: 'Azure',
+    ocean: 'Ocean',
+    green: 'Green',
+    yellow: 'Yellow',
+    orange: 'Orange',
+    red: 'Red',
+    otherSet: 'OtherSettings',
+    tagsView: 'Open Tags-View',
+    tagsViewIcon: 'Show Tags-View Icon',
+    language: 'Show Language Select',
+    search: 'Show Search',
+    cache: 'Cache Page'
+  },
+  common: {
+    addBtn: 'Add',
+    editBtn: 'Edit',
+    delBtn: 'Del',
+    moreBtn: 'More',
+    search: 'Search',
+    reset: 'Reset',
+    refresh: 'Refresh',
+    columnSettings: 'Column Settings',
+    fullScreen: 'Full Screen',
+    outFullScreen: 'Out Full Screen',
+    confirmButton: 'Ok',
+    cancelButton: 'Cancel',
+    delTip: 'This operation will permanently delete the data. Do you want to continue?',
+    loadingText: 'Data Loading',
+    noData: 'No Data',
+    noPerTip: 'Permission Denied',
+    tipTitle: 'Tips',
+    prev: 'Prev',
+    next: 'Next',
+    keyWord: 'Keyword',
+    enterKeyword: 'Please Enter',
+    organization: 'Organization'
+  },
+  Organize: {
+    addCompany: 'Add Company',
+    editCompany: 'Edit Company'
+  },
+  department: {
+    addDepartment: 'Add Department',
+    editDepartment: 'Edit Department',
+  },
+  position: {
+    newPost: 'New Position',
+    editPost: 'Edit Position',
+    postMember: 'Post Member',
+    postPermission: 'Post Permission'
+  },
+  user: {
+    addUser: 'Add User',
+    editUser: 'Edit User',
+    resetPassword: 'Reset Password',
+    userPermission: 'User Permission'
+  },
+  role: {
+    addRole: 'Add Role',
+    editRole: 'Edit Role',
+    roleMember: 'Role Member',
+    rolePermission: 'Role Permission'
+  },
+  authorize: {
+    operation: 'Operation',
+    checkAll: 'Check All',
+    deselectAll: 'Deselect All',
+    expandAll: 'Expand All',
+    foldAll: 'Fold All',
+    menuPermission: 'Menu Permission',
+    buttonPermission: 'Button Permission',
+    listPermission: 'List Permission',
+    formPermission: 'Form Permission',
+    dataPermission: 'Data Permission',
+    selectRoles: 'Select Role',
+  },
+  userOnline: {
+    cancelAccountTip: 'Do you want to cancel the account?',
+    forcedOffline: 'Offline'
+  }
+}
\ No newline at end of file
diff --git a/src/lang/index.js b/src/lang/index.js
new file mode 100644
index 0000000..3bd173b
--- /dev/null
+++ b/src/lang/index.js
@@ -0,0 +1,50 @@
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
+import ncc from '@/utils/ncc'
+import elementEnLocale from 'element-ui/lib/locale/lang/en' // element-ui lang
+import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN' // element-ui lang
+import elementZhTWLocale from 'element-ui/lib/locale/lang/zh-TW' // element-ui lang
+import enLocale from './en'
+import zhLocale from './zh'
+import zhtwLocale from './zhtw'
+
+Vue.use(VueI18n)
+
+const messages = {
+  zh: {
+    ...zhLocale,
+    ...elementZhLocale
+  },
+  en: {
+    ...enLocale,
+    ...elementEnLocale
+  },
+  zhtw: {
+    ...zhtwLocale,
+    ...elementZhTWLocale
+  }
+}
+export function getLanguage() {
+  const chooseLanguage = ncc.storageGet('language')
+  if (chooseLanguage) return chooseLanguage
+
+  // if has not choose language
+  const language = (navigator.language || navigator.browserLanguage).toLowerCase()
+  if (language.indexOf('tw') > -1) return 'zhtw'
+  const locales = Object.keys(messages)
+  for (const locale of locales) {
+    if (language.indexOf(locale) > -1) {
+      return locale
+    }
+  }
+  return 'zh'
+}
+const i18n = new VueI18n({
+  // options: zh | zhtw | en
+  locale: getLanguage(),
+  silentTranslationWarn: true,
+  // set locale messages
+  messages
+})
+
+export default i18n
\ No newline at end of file
diff --git a/src/lang/zh.js b/src/lang/zh.js
new file mode 100644
index 0000000..c0e75e5
--- /dev/null
+++ b/src/lang/zh.js
@@ -0,0 +1,253 @@
+export default {
+  route: {
+    "home": "首页",
+    "dashboard": "门户展示",
+    "onlineDev": "在线开发",
+    "onlineDev-webDesign": "功能设计",
+    "onlineDev-appDesign": "移动设计",
+    "onlineDev-dataReport": "报表设计",
+    "onlineDev-dataScreen": "大屏设计",
+    "onlineDev-visualPortal": "门户设计",
+    "generator": "代码生成",
+    "generator-webForm": "功能表单",
+    "generator-appForm": "移动表单",
+    "generator-flowForm": "流程表单",
+    "system": "系统管理",
+    "system-sysConfig": "系统配置",
+    "system-notice": "系统公告",
+    "system-task": "系统调度",
+    "system-cache": "系统缓存",
+    "system-log": "系统日志",
+    "system-monitor": "系统监控",
+    "system-icons": "系统图标",
+    "system-language": "翻译管理",
+    "system-menu": "系统菜单",
+    "system-area": "行政区划",
+    "system-billRule": "单据模板",
+    "systemData": "数据应用",
+    "systemData-dataSource": "数据连接",
+    "systemData-dataModel": "数据建模",
+    "systemData-dataSync": "数据同步",
+    "systemData-dataBackup": "数据备份",
+    "systemData-dataInterface": "数据接口",
+    "systemData-dictionary": "数据字典",
+    "systemData-map": "数据地图",
+    "weChat": "微信配置",
+    "weChat-mpConfig": "公众号配置",
+    "weChat-mpMenu": "公众号菜单",
+    "weChat-mpUser": "公众号用户",
+    "weChat-mpMessage": "公众号消息",
+    "weChat-mpMaterial": "公众号素材",
+    "weChat-qyhConfig": "企业号配置",
+    "weChat-qyDepartment": "企业号组织",
+    "weChat-qyUser": "企业号用户",
+    "weChat-qyMessage": "企业号消息",
+    "permission": "系统权限",
+    "permission-organize": "组织管理",
+    "permission-department": "部门管理",
+    "permission-position": "岗位管理",
+    "permission-user": "用户管理",
+    "permission-role": "角色管理",
+    "permission-authorize": "权限管理",
+    "permission-userOnline": "在线用户",
+    "workFlow": "工作流程",
+    "workFlow-flowEngine": "流程设计",
+    "workFlow-flowLaunch": "我发起的",
+    "workFlow-flowTodo": "待办事宜",
+    "workFlow-flowDone": "已办事宜",
+    "workFlow-flowCirculate": "抄送事宜",
+    "workFlow-entrust": "流程委托",
+    "workFlow-flowMonitor": "流程监控",
+    "extend-graphDemo": "图表示例",
+    "extend-graphDemo-echartsBar": "E-柱状图",
+    "extend-graphDemo-echartsPie": "E-饼状图",
+    "extend-graphDemo-echartsBarAcross": "E-横状条形图",
+    "extend-graphDemo-echartsGauge": "E-仪表图",
+    "extend-graphDemo-echartsLineArea": "E-线形图",
+    "extend-graphDemo-echartsScatter": "E-散点图",
+    "extend-graphDemo-echartsCandlestick": "E-K线图",
+    "extend-graphDemo-echartsLineBar": "E-折柱混合图",
+    "extend-graphDemo-echartsTree": "E-树形图",
+    "extend-graphDemo-echartsFunnel": "E-漏斗图",
+    "extend-graphDemo-highchartsScatter": "H-散点图",
+    "extend-graphDemo-highchartsWordcloud": "H-词云图",
+    "extend-graphDemo-highchartsLine": "H-线性图",
+    "extend-graphDemo-highchartsArea": "H-面积图",
+    "extend-graphDemo-highchartsGauge": "H-仪表图",
+    "extend-graphDemo-highchartsBellcurve": "H-贝尔曲线",
+    "extend-graphDemo-highchartsFunnel": "H-漏斗图",
+    "extend-graphDemo-highchartsBullet": "H-子弹图",
+    "extend-graphDemo-highchartsColumn": "H-柱状图",
+    "extend-graphDemo-highchartsPie": "H-饼状图",
+    "extend-tableDemo": "表格示例",
+    "extend-tableDemo-commonTable": "普通表格",
+    "extend-tableDemo-statisticsTable": "表格统计",
+    "extend-tableDemo-lockTable": "表格锁定",
+    "extend-tableDemo-groupingTable": "表格分组",
+    "extend-tableDemo-redactTable": "表格编辑",
+    "extend-tableDemo-complexHeader": "复杂表头",
+    "extend-tableDemo-mergeTable": "表格合并",
+    "extend-tableDemo-printTable": "表格打印",
+    "extend-tableDemo-extension": "延伸扩展",
+    "extend-tableDemo-treeTable": "树形表格",
+    "extend-tableDemo-postilTable": "表格批注",
+    "extend-tableDemo-tableTree": "表格树形",
+    "extend-tableDemo-signTable": "表格标记",
+    "extend-formDemo": "表单示例",
+    "extend-formDemo-verifyForm": "表单验证",
+    "extend-formDemo-verifyForm1": "表单验证1",
+    "extend-formDemo-fieldForm1": "表单字段1",
+    "extend-formDemo-fieldForm2": "表单字段2",
+    "extend-formDemo-fieldForm3": "表单字段3",
+    "extend-formDemo-fieldForm4": "表单字段4",
+    "extend-formDemo-fieldForm5": "表单字段5",
+    "extend-formDemo-fieldForm6": "表单字段6",
+    "extend": "扩展应用",
+    "extend-bigData": "百万数据",
+    "extend-importAndExport": "导入导出",
+    "extend-signet": "电子签章",
+    "extend-signature": '电子签名',
+    "extend-schedule": "日程安排",
+    "extend-email": "邮件收发",
+    "extend-document": "知识管理",
+    "extend-documentPreview": "文档预览",
+    "extend-barCode": "条码示例",
+    "extend-printData": "打印示例",
+    "extend-map": "地图示例",
+    "extend-order": "订单管理",
+    "extend-projectGantt": "项目管理",
+    "moreMenu": "更多...",
+    "dataReport": "报表示例",
+    "reportBI": "大屏示例",
+  },
+  navbar: {
+    profile: '个人信息',
+    feedback: '反馈问题',
+    about: '关于平台',
+    lockScreen: '锁住屏幕',
+    documentation: '帮助文档',
+    logOut: '退出系统',
+    notice: '消息',
+    chat: '聊天',
+    setting: '设置'
+  },
+  login: {
+    title: '账户密码登录',
+    scanTitle: 'APP扫码登录',
+    codeTitle: '手机验证登录',
+    logIn: '登录',
+    username: '请输入用户名/手机号',
+    password: '请输入密码',
+    rule: '子账户规则：手机号@账户 例：18577778888@101001',
+    version: '版本',
+    upper: '大写已锁定',
+    scanTip: 'APP扫码登录',
+    accountTip: '请输入账号',
+    passwordTip: '请输入密码',
+    mobile: '请输入手机号',
+    rightMobile: '请输入正确的手机号',
+    smsCode: '请输入验证码',
+    getCode: '获取验证码',
+    reSend: '重新发送',
+    company: '请输入公司名',
+    contacts: '请输入联系人'
+  },
+  tagsView: {
+    refresh: '刷新',
+    close: '关闭',
+    closeOthers: '关闭其它',
+    closeAll: '关闭所有'
+  },
+  settings: {
+    mode: '导航模式',
+    classic: '侧边导航',
+    functional: '顶部导航',
+    plain: '简约导航',
+    blend: '混合导航',
+    lightOrDark: '颜色区块',
+    dark: '暗黑模式',
+    lightWhite: '亮白模式',
+    theme: '主题颜色',
+    blue: '经典蓝',
+    purple: '玫紫',
+    azure: '湛蓝',
+    ocean: '海洋',
+    green: '生机',
+    yellow: '丰收',
+    orange: '阳橙',
+    red: '热情',
+    otherSet: '其他设置',
+    tagsView: '多页签开启模式',
+    tagsViewIcon: '多页签显示图标',
+    language: '显示多语言选择',
+    search: '显示页面搜索框',
+    cache: '多页签缓存页面'
+  },
+  common: {
+    addBtn: '新建',
+    editBtn: '编辑',
+    delBtn: '删除',
+    moreBtn: '更多',
+    search: '查询',
+    reset: '重置',
+    refresh: '刷新',
+    columnSettings: '列设置',
+    fullScreen: '全屏',
+    outFullScreen: '退出全屏',
+    confirmButton: '确 定',
+    cancelButton: '取 消',
+    delTip: '此操作将永久删除该数据, 是否继续？',
+    loadingText: '数据加载中',
+    noData: '暂无数据',
+    noPerTip: '暂无权限',
+    tipTitle: '提示',
+    prev: '上一步',
+    next: '下一步',
+    keyWord: '关键词',
+    enterKeyword: '请输入关键词查询',
+    organization: '组织机构'
+  },
+  Organize: {
+    addCompany: '新建公司',
+    editCompany: '编辑公司'
+  },
+  department: {
+    addDepartment: '新建部门',
+    editDepartment: '编辑部门',
+  },
+  position: {
+    newPost: '新建岗位',
+    editPost: '编辑岗位',
+    postMember: '岗位成员',
+    postPermission: '岗位权限'
+  },
+  user: {
+    addUser: '新建用户',
+    editUser: '编辑用户',
+    resetPassword: '重置密码',
+    userPermission: '用户权限'
+  },
+  role: {
+    addRole: '新建角色',
+    editRole: '编辑角色',
+    roleMember: '角色成员',
+    rolePermission: '角色权限'
+  },
+  authorize: {
+    operation: '操作',
+    checkAll: '全部勾选',
+    deselectAll: '取消全选',
+    expandAll: '展开所有',
+    foldAll: '折叠所有',
+    menuPermission: '菜单权限',
+    buttonPermission: '按钮权限',
+    listPermission: '列表权限',
+    formPermission: '表单权限',
+    dataPermission: '数据权限',
+    selectRoles: '选择角色',
+  },
+  userOnline: {
+    cancelAccountTip: '确定要注销该账号?',
+    forcedOffline: '强制下线'
+  }
+}
\ No newline at end of file
diff --git a/src/lang/zhtw.js b/src/lang/zhtw.js
new file mode 100644
index 0000000..f9fb484
--- /dev/null
+++ b/src/lang/zhtw.js
@@ -0,0 +1,254 @@
+export default {
+  route: {
+    "home": "首頁",
+    "dashboard": "門戶展示",
+    "onlineDev": "在線開發",
+    "onlineDev-webDesign": "功能設計",
+    "onlineDev-appDesign": "移動設計",
+    "onlineDev-dataReport": "報表設計",
+    "onlineDev-dataScreen": "大屏設計",
+    "onlineDev-visualPortal": "門戶設計",
+    "generator": "代碼生成",
+    "generator-webForm": "功能表單",
+    "generator-appForm": "移動表單",
+    "generator-flowForm": "流程表單",
+    "system": "系統管理",
+    "system-sysConfig": "系統配置",
+    "system-notice": "系統公告",
+    "system-task": "系統調度",
+    "system-cache": "系統緩存",
+    "system-log": "系統日誌",
+    "system-monitor": "系統監控",
+    "system-icons": "系統圖標",
+    "system-language": "翻譯管理",
+    "system-menu": "菜單管理",
+    "system-area": "行政區劃",
+    "system-billRule": "單據模板",
+    "systemData": "數據應用",
+    "systemData-dataSource": "數據連接",
+    "systemData-dataModel": "數據建模",
+    "systemData-dataSync": "數據同步",
+    "systemData-dataBackup": "數據備份",
+    "systemData-dataInterface": "數據接口",
+    "systemData-dictionary": "數據字典",
+    "systemData-map": "數據地圖",
+    "weChat": "微信配置",
+    "weChat-mpConfig": "公眾號配置",
+    "weChat-mpMenu": "公眾號菜單",
+    "weChat-mpUser": "公眾號用戶",
+    "weChat-mpMessage": "公眾號消息",
+    "weChat-mpMaterial": "公眾號素材",
+    "weChat-qyhConfig": "企業號配置",
+    "weChat-qyDepartment": "企業號組織",
+    "weChat-qyUser": "企業號用戶",
+    "weChat-qyMessage": "企業號消息",
+    "permission": "系統權限",
+    "permission-organize": "組織管理",
+    "permission-department": "部門管理",
+    "permission-position": "崗位管理",
+    "permission-user": "用戶管理",
+    "permission-role": "角色管理",
+    "permission-authorize": "權限管理",
+    "permission-userOnline": "在線用戶",
+    "workFlow": "工作流程",
+    "workFlow-flowEngine": "流程設計",
+    "workFlow-flowLaunch": "我發起的",
+    "workFlow-flowTodo": "待辦事宜",
+    "workFlow-flowDone": "已辦事宜",
+    "workFlow-flowCirculate": "抄送事宜",
+    "workFlow-entrust": "流程委托",
+    "workFlow-flowMonitor": "流程監控",
+    "extend-graphDemo": "圖表示例",
+    "extend-graphDemo-echartsBar": "E-柱狀圖",
+    "extend-graphDemo-echartsPie": "E-餅狀圖",
+    "extend-graphDemo-echartsBarAcross": "E-橫狀條形圖",
+    "extend-graphDemo-echartsGauge": "E-儀表圖",
+    "extend-graphDemo-echartsLineArea": "E-線形圖",
+    "extend-graphDemo-echartsScatter": "E-散點圖",
+    "extend-graphDemo-echartsCandlestick": "E-K線圖",
+    "extend-graphDemo-echartsLineBar": "E-折柱混合圖",
+    "extend-graphDemo-echartsTree": "E-樹形圖",
+    "extend-graphDemo-echartsFunnel": "E-漏鬥圖",
+    "extend-graphDemo-highchartsScatter": "H-散點圖",
+    "extend-graphDemo-highchartsWordcloud": "H-詞雲圖",
+    "extend-graphDemo-highchartsLine": "H-線性圖",
+    "extend-graphDemo-highchartsArea": "H-面積圖",
+    "extend-graphDemo-highchartsGauge": "H-儀表圖",
+    "extend-graphDemo-highchartsBellcurve": "H-貝爾曲線",
+    "extend-graphDemo-highchartsFunnel": "H-漏鬥圖",
+    "extend-graphDemo-highchartsBullet": "H-子彈圖",
+    "extend-graphDemo-highchartsColumn": "H-柱狀圖",
+    "extend-graphDemo-highchartsPie": "H-餅狀圖",
+    "extend-tableDemo": "表格示例",
+    "extend-tableDemo-commonTable": "普通表格",
+    "extend-tableDemo-statisticsTable": "表格統計",
+    "extend-tableDemo-lockTable": "表格鎖定",
+    "extend-tableDemo-groupingTable": "表格分組",
+    "extend-tableDemo-redactTable": "表格編輯",
+    "extend-tableDemo-complexHeader": "復雜表頭",
+    "extend-tableDemo-mergeTable": "表格合並",
+    "extend-tableDemo-printTable": "表格打印",
+    "extend-tableDemo-extension": "延伸擴展",
+    "extend-tableDemo-treeTable": "樹形表格",
+    "extend-tableDemo-postilTable": "表格批註",
+    "extend-tableDemo-tableTree": "表格樹形",
+    "extend-tableDemo-signTable": "表格標記",
+    "extend-formDemo": "表單示例",
+    "extend-formDemo-verifyForm": "表單驗證",
+    "extend-formDemo-verifyForm1": "表單驗證1",
+    "extend-formDemo-fieldForm1": "表單字段1",
+    "extend-formDemo-fieldForm2": "表單字段2",
+    "extend-formDemo-fieldForm3": "表單字段3",
+    "extend-formDemo-fieldForm4": "表單字段4",
+    "extend-formDemo-fieldForm5": "表單字段5",
+    "extend-formDemo-fieldForm6": "表單字段6",
+    "extend": "擴展應用",
+    "extend-bigData": "百萬數據",
+    "extend-importAndExport": "導入導出",
+    "extend-signet": "電子簽章",
+    "extend-signature": '電子簽名',
+    "extend-schedule": "日程安排",
+    "extend-email": "郵件收發",
+    "extend-document": "知識管理",
+    "extend-documentPreview": "文檔預覽",
+    "extend-barCode": "條碼示例",
+    "extend-printData": "打印示例",
+    "extend-map": "地圖示例",
+    "extend-order": "訂單管理",
+    "extend-projectGantt": "項目管理",
+    "moreMenu": "更多...",
+    "dataReport": "報表示例",
+    "reportBI": "大屏示例",
+  },
+  navbar: {
+    profile: '個人信息',
+    feedback: '反饋問題',
+    about: '關於平臺',
+    lockScreen: '鎖住屏幕',
+    documentation: '幫助文檔',
+    logOut: '退出系統',
+    notice: '消息',
+    chat: '聊天',
+    setting: '設置'
+  },
+  login: {
+    title: '賬戶密碼登錄',
+    scanTitle: 'APP掃碼登錄',
+    codeTitle: '手機驗證登錄',
+    logIn: '登錄',
+    username: '請輸入用戶名/手機號',
+    password: '請輸入密碼',
+    rule: '子賬戶規則：手機號@賬戶 例：18577778888@101001',
+    version: '版本',
+    upper: '大寫已鎖定',
+    scanTip: 'APP掃碼登錄',
+    accountTip: '請輸入賬號',
+    passwordTip: '請輸入密碼',
+    mobile: '請輸入手機號',
+    rightMobile: '請輸入正確的手機號',
+    smsCode: '請輸入驗證碼',
+    getCode: '獲取驗證碼',
+    reSend: '重新發送',
+    company: '請輸入公司名',
+    contacts: '請輸入聯系人'
+  },
+  tagsView: {
+    refresh: '刷新',
+    close: '關閉',
+    closeOthers: '關閉其它',
+    closeAll: '關閉所有'
+  },
+  settings: {
+    mode: '導航模式',
+    classic: '側邊導航',
+    functional: '頂部導航',
+    plain: '簡約導航',
+    blend: '混合導航',
+    lightOrDark: '顏色區塊',
+    dark: '暗黑模式',
+    lightWhite: '亮白模式',
+    theme: '主題顏色',
+    blue: '經典藍',
+    purple: '玫紫',
+    azure: '湛藍',
+    ocean: '海洋',
+    green: '生機',
+    yellow: '豐收',
+    orange: '陽橙',
+    red: '熱情',
+    otherSet: '其他設置',
+    tagsView: '多頁簽開啟模式',
+    tagsViewIcon: '多頁簽顯示圖標',
+    language: '顯示多語言選擇',
+    search: '顯示頁面搜索框',
+    cache: '多頁簽緩存頁面'
+  },
+  common: {
+    addBtn: '新建',
+    editBtn: '編輯',
+    delBtn: '刪除',
+    moreBtn: '更多',
+    search: '查詢',
+    reset: '重置',
+    refresh: '刷新',
+    columnSettings: '列設置',
+    fullScreen: '全屏',
+    outFullScreen: '退出全屏',
+    confirmButton: '確 定',
+    cancelButton: '取 消',
+    delTip: '此操作將永久刪除該數據, 是否繼續？',
+    loadingText: '數據加載中',
+    noData: '暫無數據',
+    noPerTip: '暫無權限',
+    tipTitle: '提示',
+    prev: '上壹步',
+    next: '下壹步',
+    keyWord: '關鍵詞',
+    enterKeyword: '請輸入關鍵詞查詢',
+    organization: '組織機構'
+  },
+  Organize: {
+    addCompany: '新建公司',
+    editCompany: '編輯公司'
+  },
+  department: {
+    addDepartment: '新建部門',
+    editDepartment: '編輯部門',
+
+  },
+  position: {
+    newPost: '新建崗位',
+    editPost: '編輯崗位',
+    postMember: '崗位成員',
+    postPermission: '崗位權限'
+  },
+  user: {
+    addUser: '新建用戶',
+    editUser: '編輯用戶',
+    resetPassword: '重置密碼',
+    userPermission: '用戶權限'
+  },
+  role: {
+    addRole: '新建角色',
+    editRole: '編輯角色',
+    roleMember: '角色成員',
+    rolePermission: '角色權限',
+  },
+  authorize: {
+    operation: '操作',
+    checkAll: '全部勾選',
+    deselectAll: '取消全選',
+    expandAll: '展開所有',
+    foldAll: '折疊所有',
+    menuPermission: '菜單權限',
+    buttonPermission: '按鈕權限',
+    listPermission: '列表權限',
+    formPermission: '表單權限',
+    dataPermission: '數據權限',
+    selectRoles: '選擇角色',
+  },
+  userOnline: {
+    cancelAccountTip: '確定要註銷該賬號?',
+    forcedOffline: '強制下線'
+  }
+}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 353ccb5..73b796c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,12 +18,14 @@ import store from './store'
 import './permission'
 import moment from "moment";
 import './assets/scss/common.scss'
+import i18n from './lang' // internationalization
 
 
 Vue.config.productionTip = false
 Vue.prototype.$m = moment
 Vue.use(ElementUI, {
   size: ncc.storageGet('size') || 'small', // set element-ui default size
+  i18n: (key, value) => i18n.t(key, value)
 });
 // 批量引入组件
 import components from './components'
@@ -59,5 +61,6 @@ Vue.directive('loadMore', {
 new Vue({
   router,
   store,
+  i18n,
   render: h => h(App),
 }).$mount('#app')
diff --git a/src/mixins/info.js b/src/mixins/info.js
index 8e4f6a5..ea1d43f 100644
--- a/src/mixins/info.js
+++ b/src/mixins/info.js
@@ -12,7 +12,6 @@ export default {
         async initSystemTypeList() {
             let list = this.$store.state.meta.system;
             !list && (list = await this.$store.dispatch('getTypeListByCode', 'system'));
-            console.log(list, '11');
             this.systemTypeOptions = list;
         },
         async initAreaTypeList() {
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index c7458ca..1c575fb 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -1,136 +1,269 @@
 <template>
-	<!-- 应用信息 -->
-	<div class="SystemInfo">
-	  <div class="common-info-box">
-		<div class="item-title">系统信息列表</div>
-		<div class="item-body">
-		  <template>
-			<el-table
-			  :data="infoDataList"
-			  style="width: 100%"
-			  stripe
-			  v-loading="loading"
-			>
-			  <el-table-column
-				type="index"
-				width="50"
-				label="序号"
-			  ></el-table-column>
-			  <el-table-column
-				prop="CompanyName"
-				label="主体企业"
-				show-overflow-tooltip
-			  />
-			  <el-table-column
-				prop="SystemName"
-				label="系统名称"
-				show-overflow-tooltip
-			  />
-			  <el-table-column
-				prop="ContactUser"
-				label="联系人"
-				show-overflow-tooltip
-			  />
-			  <el-table-column
-				prop="ContactPhone"
-				label="联系电话"
-				show-overflow-tooltip
-			  />
-			  <el-table-column label="操作">
-				<template scope="scope">
-				  <infoForm
-					style="display: inline-block; margin-right: 5px"
-					type="edit"
-					:systemId="scope.row.Id"
-				  >
-					<el-button type="primary" size="small">修改</el-button>
-				  </infoForm>
-				  <InfoEditRecord
-					style="display: inline-block"
-					:systemId="scope.row.Id"
-				  >
-					<el-button type="success" size="small">查看记录</el-button>
-				  </InfoEditRecord>
-				</template>
-			  </el-table-column>
-			</el-table>
-		  </template>
-		</div>
-	  </div>
-	</div>
-  </template>
-  
-  <script>
-  import { getInfoList } from "@/api/baseData/info";
-  export default {
-	name: "SystemInfo",
-	data() {
-	  return {
-		loading: true,
-		listquery: {
-		  keyword: this.$route.query.keyword,
-		  pageIndex: 1,
-		  pageSize: 10,
-		  sort: "desc",
-		  sidx: "",
-		},
-		total: 0,
-		infoDataList: [],
-	  };
+  <!-- 应用信息 -->
+  <div class="SystemInfo item-box common-info-box">
+    <div class="item-title">应用信息</div>
+    <div class="item-body">
+      <div class="NCC-common-layout">
+        <div class="NCC-common-layout-center">
+          <el-row class="NCC-common-search-box" :gutter="5">
+            <el-form @submit.native.prevent size="mini">
+              <el-col :span="5">
+                <el-form-item label="">
+                  <el-input v-model="query.keyword" placeholder="请输入应用名称、企业名称进行查询" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="3">
+                <el-form-item label="">
+                  <el-select v-model="query.systemType" placeholder="请选择应用类型" clearable @change="handleSystemTypeChange">
+                    <el-option
+                      v-for="(item) in systemTypeOptions"
+                      :key="item.Id"
+                      :label="item.FullName"
+                      :value="item.Id"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="3">
+                <el-form-item label="">
+					<el-select
+                    v-model="query.proId"
+                    placeholder="请选择应用分类"
+					:disabled="!query.systemType"
+                    clearable
+                  >
+                    <el-option
+                      v-for="(item) in systemClassOptions"
+                      :key="item.Id"
+                      :label="item.ClassName"
+                      :value="item.Id"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+			  <el-col :span="4">
+                <el-form-item label="">
+                  <el-input
+                    v-model="query.contactUser"
+                    placeholder="请输入联系人"
+                  />
+                </el-form-item>
+              </el-col>
+			  <el-col :span="4">
+                <el-form-item label="">
+                  <el-input
+                    v-model="query.contactPhone"
+                    placeholder="请输入联系电话"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="2">
+                <el-form-item>
+                  <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    @click="search()"
+                    >搜索</el-button
+                  >
+                </el-form-item>
+              </el-col>
+            </el-form>
+            <div class="NCC-common-search-box-right">
+              <el-button type="success" icon="el-icon-upload2" size="mini">导入</el-button>
+              <el-button type="primary" icon="el-icon-download" size="mini">导出</el-button>
+            </div>
+          </el-row>
+          <div class="NCC-common-layout-main NCC-flex-main">
+			<NCC-table v-loading="loading" :data="infoDataList">
+				<el-table-column prop="companyName" label="主体企业" align="center" />
+				<el-table-column prop="systemName" label="应用名称" align="center" />
+				<el-table-column prop="systemType" label="应用类型" align="center" />
+				<el-table-column prop="systemClass" label="应用分类" align="center" />
+				<el-table-column prop="contactUser" label="联系人" align="center" />
+				<el-table-column prop="contactPhone" label="联系电话" align="center" />
+                <el-table-column prop="areaName" label="所属区域" align="center" />
+                <el-table-column label="操作" width="200">
+					<!-- 查看，修改，归属地变更，上报 -->
+					<template slot-scope="scope">
+						<infoForm class="btn_dialog" type="edit" :systemId="scope.row.Id">
+							<el-button size="mini" type="text">修改</el-button>
+            			</infoForm>
+            			<InfoEditRecord class="btn_dialog" :systemId="scope.row.Id">
+							<el-button size="mini" type="text">查看</el-button>
+            			</InfoEditRecord>
+            		  <el-button size="mini" type="text" @click="toChangeArea(scope.row)">归属地变更</el-button>
+            		  <el-button size="mini" type="text" @click="toDetail(scope.row)">上报</el-button>
+            		</template>
+            	</el-table-column>
+			</NCC-table>
+            <pagination :total="total" :page.sync="listQuery.pageIndex" :limit.sync="listQuery.pageSize" @pagination="initList" />
+		  </div>
+        </div>
+		<el-dialog
+		  	title="归属地变更"
+		  	:visible.sync="areaChangeVisible"
+		  	width="50%">
+		  	<el-form
+     		  :model="areaForm"
+     		  :rules="areaRules"
+     		  ref="areaForm"
+     		  size="small"
+     		  label-width="100px"
+			  v-loading="areaDialogLoading"
+     		>
+			 <el-form-item label="所属区县" prop="areaId">
+			 <el-radio-group
+			   v-model="areaForm.areaId"
+			   placeholder="请选择所属区县"
+			   style="line-height: 22px"
+			 >
+			   <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{
+				 v.fullName
+			   }}</el-radio>
+			 </el-radio-group>
+		   </el-form-item>
+		</el-form>
+
+		  
+		  <span slot="footer" class="dialog-footer">
+		    <el-button @click="areaChangeVisible = false">取 消</el-button>
+		    <el-button type="primary" @click="areaSubmit">确 定</el-button>
+		  </span>
+		</el-dialog>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getInfoList } from "@/api/baseData/info";
+import { updataSystem } from "@/api/baseData/info";
+import infoMixin from "@/mixins/info";
+export default {
+  name: "SystemInfo",
+  mixins: [infoMixin],
+  data() {
+    return {
+      loading: false,
+	  query: {
+		keyword: '',
+        systemType: "",
+        systemClass: "",
+        contactUser: "",
+        contactPhone: "",
 	},
-	created() {
-	  // this.initList();
+      listQuery: {
+        pageIndex: 1,
+        pageSize: 10,
+        sort: "desc",
+        sidx: "",
+      },
+      total: 0,
+      infoDataList: [],
+
+	//   归属地变更
+	areaChangeVisible: false,
+	areaDialogLoading: false,
+	areaForm: {
+		areaId: ''
 	},
-	mounted() {
-	  console.log(this.$route.path, "path");
+	areaRules: {
+		areaId: {
+          required: true,
+          message: "请输入所属区县",
+          trigger: "change",
+        },
 	},
-	watch: {
-	  $route: {
-		handler: function (route) {
-		  this.listquery.keyword = route.query.keyword;
-		  this.initList();
-		},
-		immediate: true,
-	  },
+	activeSystemId: '',
+    };
+  },
+  created() {
+	this.initList();
+	this.initSystemTypeList();
+  },
+  mounted() {
+  },
+  watch: {
+    // $route: {
+    //   handler: function (route) {
+    //     this.query.keyword = route.query.keyword || '';
+    //     this.initList();
+    //   },
+    //   immediate: true,
+    // },
+  },
+  methods: {
+	handleSystemTypeChange(val) {
+		this.query.systemClass = '';
+		this.initSystemClassList(val)
 	},
-	methods: {
-	  initList() {
-		getInfoList(this.listquery).then(({ data }) => {
-		  let list = [];
-		  data.list.forEach((v) => {
-			let obj = {
-			  CompanyName: v.compayInfo.CompanyName,
-			  SystemName: v.SysytemInfo.SystemName,
-			  ContactUser: v.compayInfo.ContactUser,
-			  ContactPhone: v.compayInfo.ContactPhone,
-			  Id: v.SysytemInfo.Id,
-			};
-			list.push(obj);
-		  });
-		  this.infoDataList = list;
-		  this.total = data.totalCount;
-		  this.loading = false;
-		});
-	  },
-	  getSystemUpdataList() {
-		getInfoList({
-		  id: "580628220576007429",
-		  pageIndex: 1,
-		  pageSize: 10,
-		}).then(({ data }) => {
-		  console.log(data);
-		});
-	  },
+	search() {
+		this.listQuery = {
+			pageIndex: 1,
+        	pageSize: 10,
+        	sort: "desc",
+        	sidx: "",
+		}
+		this.initList();
+	},
+    initList() {
+	  this.loading = true
+	  let query = {
+        ...this.listQuery,
+        ...this.query,
+      };
+      getInfoList(query).then(({ data }) => {
+        let list = [];
+        data.list.length && data.list.forEach((v) => {
+          let obj = {
+            companyName: v.compayInfo.CompanyName,
+            systemName: v.SysytemInfo.SystemName,
+            systemType: v.SysytemInfo.SystemType,
+            systemClass: v.SysytemInfo.SystemClass,
+            areaName: v.SysytemInfo.AreaName,
+            areaId: v.SysytemInfo.AreaId,
+            principalName: v.SysytemInfo.PrincipalName,
+            principalPhone: v.SysytemInfo.PrincipalPhone,
+            Id: v.SysytemInfo.Id,
+          };
+          list.push(obj);
+        });
+        this.infoDataList = list;
+        this.total = data.totalCount;
+        this.loading = false;
+      });
+    },
+	// 上报
+	toDetail(row) {
 	},
-  };
-  </script>
-  <style scoped lang="scss">
-  .item-box.info-box {
-	height: 70vh;
-	:deep(.el-table__body-wrapper.is-scrolling-none) {
-	  height: calc(100% - 47px);
-	  overflow-y: scroll;
+	async toChangeArea(row) {
+		this.areaChangeVisible = true;
+		this.areaDialogLoading = true;
+		this.areaForm.areaId = row.areaId;
+		this.activeSystemId = row.Id;
+		await this.initAreaTypeList();
+		this.areaDialogLoading = false;
+	},
+	areaSubmit() {
+		updataSystem({
+			id: this.activeSystemId,
+			areaId: this.areaForm.areaId,
+		}).then((res) => {
+			this.areaChangeVisible = false;
+			this.initList();
+		});
 	}
+  },
+};
+</script>
+<style scoped lang="scss">
+.common-info-box {
+  :deep(.el-table__body-wrapper.is-scrolling-none) {
+    height: calc(100% - 47px);
+    overflow-y: scroll;
+  }
+  .item-body {
+	height: calc(100% - 35px);
   }
-  </style>
-  
\ No newline at end of file
+}
+</style>
diff --git a/src/views/systemPage/InfoList.vue b/src/views/systemPage/InfoList.vue
index bc02f09..f84b22f 100644
--- a/src/views/systemPage/InfoList.vue
+++ b/src/views/systemPage/InfoList.vue
@@ -111,15 +111,6 @@ export default {
         this.loading = false;
       });
     },
-    getSystemUpdataList() {
-      getInfoList({
-        id: "580628220576007429",
-        pageIndex: 1,
-        pageSize: 10,
-      }).then(({ data }) => {
-        console.log(data);
-      });
-    },
   },
 };
 </script>
--
libgit2 0.21.4