rev:优化一体机接口

acs2/nladmin-ui/src/api/acs/device/region.js

@@ -0,0 +1,27 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/region',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/region/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/region',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del }

acs2/nladmin-ui/src/i18n/langs/Korean.js

@@ -24,6 +24,7 @@ import dict from './dict/zh'
 import angle from './angle/zh'
 import regional from './regional/zh'
 import stage from './stage/zh'
+import region from './region/zh'
 
 export default {
   ...koLocale,
@@ -51,6 +52,7 @@ export default {
   ...dict,
   ...angle,
   ...regional,
-  ...stage
+  ...stage,
+  ...region
 }
 

acs2/nladmin-ui/src/i18n/langs/chinese.js

@@ -24,6 +24,7 @@ import dict from './dict/zh'
 import angle from './angle/zh'
 import regional from './regional/zh'
 import stage from './stage/zh'
+import region from './region/zh'
 
 export default {
   ...zhLocale,
@@ -51,6 +52,7 @@ export default {
   ...dict,
   ...angle,
   ...regional,
-  ...stage
+  ...stage,
+  ...region
 }
 

acs2/nladmin-ui/src/i18n/langs/english.js

@@ -24,6 +24,7 @@ import dict from './dict/en'
 import angle from './angle/en'
 import regional from './regional/en'
 import stage from './stage/en'
+import region from './region/en'
 
 export default {
   ...enLocale,
@@ -51,6 +52,7 @@ export default {
   ...dict,
   ...angle,
   ...regional,
-  ...stage
+  ...stage,
+  ...region
 }
 

acs2/nladmin-ui/src/i18n/langs/indonesian.js

@@ -24,6 +24,7 @@ import dict from './dict/in'
 import angle from './angle/in'
 import regional from './regional/in'
 import stage from './stage/in'
+import region from './region/in'
 
 export default {
   ...idLocale,
@@ -52,5 +53,6 @@ export default {
   ...dict,
   ...angle,
   ...regional,
-  ...stage
+  ...stage,
+  ...region
 }

acs2/nladmin-ui/src/i18n/langs/region/en.js

@@ -0,0 +1,12 @@
+export default {
+  'region': {
+    'title': '区域',
+    'region_code': '区域编号',
+    'region_name': '区域名称',
+    'is_charge': '是否管控',
+    'has_agv': '是否存在agv'
+  },
+  'msg': {
+    'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, they Will Be Deleted Together. This Operation Cannot Be Undone!'
+  }
+}

acs2/nladmin-ui/src/i18n/langs/region/in.js

@@ -0,0 +1,12 @@
+export default {
+  'region': {
+    'title': '区域',
+    'region_code': '区域编号',
+    'region_name': '区域名称',
+    'is_charge': '是否管控',
+    'has_agv': '是否存在agv'
+  },
+  'msg': {
+    'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, they Will Be Deleted Together. This Operation Cannot Be Undone!'
+  }
+}

acs2/nladmin-ui/src/i18n/langs/region/zh.js

@@ -0,0 +1,12 @@
+export default {
+  'region': {
+    'title': '区域',
+    'region_code': '区域编号',
+    'region_name': '区域名称',
+    'is_charge': '是否管控',
+    'has_agv': '是否存在agv'
+  },
+  'msg': {
+    'delete_msg': 'Are You Sure To Delete It? If There Are Subordinate Nodes, they Will Be Deleted Together. This Operation Cannot Be Undone!'
+  }
+}

acs2/nladmin-ui/src/layout/components/Sidebar/Logo.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import Logo from '@/assets/images/newlogo.png'
+import Logo from '@/assets/images/newloge.png'
 import variables from '@/assets/styles/variables.scss'
 export default {
   name: 'SidebarLogo',

acs2/nladmin-ui/src/views/acs/device/region/index.vue

@@ -0,0 +1,91 @@
+<template>
+  <div class="app-container">
+    <!--工具栏-->
+    <div class="head-container">
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission" />
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="600px">
+        <el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
+          <el-form-item :label="$t('region.region_code')" prop="region_code">
+            <el-input v-model="form.region_code" style="width: 370px;" />
+          </el-form-item>
+          <el-form-item :label="$t('region.region_name')" prop="region_name">
+            <el-input v-model="form.region_name" style="width: 370px;" />
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">{{ $t('auto.common.Cancel') }}</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('auto.common.Confirm') }}</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="region_code" :label="$t('region.region_code')" />
+        <el-table-column prop="region_name" :label="$t('region.region_name')" />
+        <el-table-column prop="is_charge" :label="$t('region.is_charge')" />
+        <el-table-column prop="has_agv" :label="$t('region.has_agv')" />
+        <el-table-column prop="create_by" :label="$t('auto.common.create_by')" />
+        <el-table-column prop="update_user" :label="$t('auto.common.update_by')" />
+        <el-table-column prop="create_time" :label="$t('auto.common.create_time')" />
+        <el-table-column prop="update_time" :label="$t('auto.common.update_time')" />
+        <el-table-column v-permission="['admin','customPolicy:del']" :label="$t('auto.common.Operate')" width="150px" align="center">
+          <template slot-scope="scope">
+            <udOperation
+              :data="scope.row"
+              :permission="permission"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <pagination />
+    </div>
+  </div>
+</template>
+
+<script>
+import crudRegion from '@/api/acs/device/region'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
+import pagination from '@crud/Pagination'
+import i18n from '@/i18n'
+
+const defaultForm = { id: null, create_time: null, update_time: null, region_code: null, region_name: null }
+export default {
+  name: 'Region',
+  // eslint-disable-next-line vue/no-unused-components
+  components: { pagination, crudOperation, rrOperation, udOperation },
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({ title: i18n.t('region.title'), url: 'api/region', idField: 'id', sort: 'id,desc', crudMethod: { ...crudRegion }})
+  },
+  data() {
+    return {
+      permission: {
+        add: ['admin', 'region:add'],
+        edit: ['admin', 'region:edit'],
+        del: ['admin', 'region:del']
+      },
+      deviceList: [],
+      rules: {
+        region_code: [
+          { required: true, message: '设备号不能为空', trigger: 'blur' }
+        ]
+      }}
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>