0822PM

src/pages/system/caseManager/deviceManager/add.vue

@@ -2,27 +2,40 @@
   <div class="subPage">
     <form class="mainForm">
       <ul>
+         <li class="flex-h">
+          <span>选择案场：</span>
+          <div class="flex-item">
+            <div style="width:50%">
+              <el-select v-model="Case" placeholder="请选择">
+                <el-option
+                  v-for="item in cases"
+                  :key="item.CaseId"
+                  :label="item.CaseName"
+                  :value="item.CaseId">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </li>
         <li class="flex-h">
-          <span>角色名称：</span>
+          <span>设备名称：</span>
           <div class="flex-item">
             <div style="width:50%">
               <el-input
-                placeholder="请输入角色名称"
-                v-model="detail.RoleName"
+                placeholder="请输入设备名称"
+                v-model="detail.Name"
                 clearable>
               </el-input>
             </div>
           </div>
         </li>
         <li class="flex-h">
-          <span>备注：</span>
+          <span>设备Code：</span>
           <div class="flex-item">
-            <div>
+            <div style="width:50%">
               <el-input
-                placeholder="请输入备注"
-                type="textarea"
-                :autosize="{ minRows: 3, maxRows: 5}"
-                v-model="detail.Remark"
+                placeholder="请输入设备Code"
+                v-model="detail.EquipmentCode"
                 clearable>
               </el-input>
             </div>
@@ -40,7 +53,7 @@
 <script>
 import { createNamespacedHelpers, mapState } from 'vuex'
 
-const { mapState: mapRoleState, mapActions: mapRoleActions } = createNamespacedHelpers('role')
+const { mapState: mapDeviceState, mapActions: mapDeviceActions } = createNamespacedHelpers('device')
 export default {
   name: '',
   data () {
@@ -48,29 +61,43 @@ export default {
   },
   components: {},
   computed: {
-    ...mapRoleState({
-      detail: x => x.roleInfo,
+    ...mapDeviceState({
+      detail: x => x.deviceInfo,
     }),
     ...mapState({
+      cases: x => x.app.cases.list,
       caseid: x => x.app.cases.default,
       orgid: x => x.app.user.OrgId,
-    })
+    }),
+    Case: {
+      get () {
+        return this.detail.CaseId || this.caseid
+      },
+      set (val) {
+        this.detail.CaseId = val
+      }
+    }
   },
   methods: {
-    ...mapRoleActions([
-      'GetRoleByID',
-      'AddRole',
-      'UpdateRole',
-      'SetRoleNull',
+    ...mapDeviceActions([
+      'GetDeviceByID',
+      'AddDevice',
+      'UpdateDevice',
+      'SetDeviceNull',
     ]),
     submit () {
-      if ((this.detail.RoleId || '') === '') {
+      if ((this.detail.EquipmentId || '') === '') {
         this.detail.CaseId = this.caseid
         this.detail.OrgId = this.orgid
-        this.AddRole(this.detail)
+        this.AddDevice(this.detail)
       } else {
-        this.UpdateRole(this.detail)
+        this.UpdateDevice(this.detail)
       }
+      this.$message({
+        type: 'success',
+        message: '操作成功'
+      })
+      this.$router.push({ name: 'deviceManager' })
     },
     cancel () {
       this.$router.go(-1)
@@ -79,9 +106,9 @@ export default {
   beforeMount () {
     const { id } = this.$route.query
     if (id && id !== '') {
-      this.GetRoleByID({ roleid: id })
+      this.GetDeviceByID({ deviceid: id })
     } else {
-      this.SetRoleNull()
+      this.SetDeviceNull()
     }
   }
 }

src/pages/system/caseManager/deviceManager/index.vue

@@ -3,15 +3,19 @@
     <div class="system-table-search">
       <div class="flex-h">
         <div class="flex-item flex-h">
-          <el-button size="mini" type="success" @click='addRole'>新增角色</el-button>
+          <el-button size="mini" type="success" @click='addRole'>新增体检设备</el-button>
         </div>
-        <tableSearch value='角色名称' @exportSearchKey="searchList"></tableSearch>
       </div>
       <div class="moreFilter"></div>
     </div>
     <div class="system-table-box">
-      <el-table :data="roles.list" stripe style="width: 100%">
-        <el-table-column prop="RoleName" label="角色名">
+      <el-table :data="list.list" stripe style="width: 100%">
+        <el-table-column label="案场名称">
+          <template slot-scope="scope">
+            <label>{{GetCaseName(scope.row.CaseId)}}</label>
+          </template>
+        </el-table-column>
+        <el-table-column prop="Name" label="体检设备名称">
         </el-table-column>
         <el-table-column label="创建时间" width="300">
           <template slot-scope="scope">
@@ -22,7 +26,6 @@
           <template slot-scope="scope">
             <el-button size="mini" type="warning" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
             <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
-            <el-button size="mini" type="success" @click="handlePermission(scope.$index, scope.row)">分配权限</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -33,72 +36,42 @@
     :current-page.sync="currentPage"
     :page-size="10"
     layout="prev, pager, next, jumper"
-    :total="roles.pagenum">
+    :total="list.pagenum">
     </el-pagination>
-    <el-dialog title="请选择菜单" :visible.sync="dialogTableVisible">
-      <el-tree
-        v-if="dialogTableVisible"
-        class="flxe-h"
-        :data="menus"
-        node-key="id"
-        :default-expand-all="true"
-        :default-checked-keys="defaultChecked"
-        ref="tree"
-        show-checkbox
-        @node-click="handleNodeClick"></el-tree>
-        <div class="flex-h" style="justify-content: flex-end;margin-top: 1rem">
-          <el-button type='success' @click="getCheckedNodes">确定</el-button>
-        </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import { createNamespacedHelpers, mapState } from 'vuex'
-import tableSearch from '@/components/tableSearch/index'
 
-const { mapState: mapRoleState, mapActions: mapRoleActions } = createNamespacedHelpers('role')
+const { mapState: mapDeviceState, mapActions: mapDeviceActions } = createNamespacedHelpers('device')
 
 export default {
   name: '',
   data () {
     return {
       currentPage: 0, // 当前页码
-      key: '',
-      selid: '',
-      dialogTableVisible: false,
     }
   },
   computed: {
-    ...mapRoleState({
-      roles: x => x.roleList,
-      roleMenus: x => x.roleMenus,
-    }),
     ...mapState({
-      menus: x => x.app.menus
+      cases: x => x.app.cases.list,
+    }),
+    ...mapDeviceState({
+      list: x => x.deviceList,
     }),
-    defaultChecked: {
-      get () {
-        const sels = (this.roleMenus || []).map(x => x.MenuId)
-        console.log(sels)
-        return sels
-      },
-    },
-  },
-  components: {
-    tableSearch
   },
   methods: {
-    ...mapRoleActions([
-      'GetRolesList',
-      'DelRole',
-      'SaveRoleMenus',
-      'GetRoleMenu',
+    ...mapDeviceActions([
+      'GetDeviceList',
+      'DelDevice',
     ]),
     FormatDate (date) {
-      console.log()
       return this.toolClass.dateFormat(date)
     },
+    GetCaseName (caseid) {
+      return ((this.cases.filter(x => x.CaseId === caseid) || [])[0] || {}).CaseName
+    },
     handleSizeChange (val) {
       console.log(`每页 ${val} 条`)
     },
@@ -107,18 +80,18 @@ export default {
     },
     handleEdit (index, row) {
       // 编辑
-      this.$router.push({ name: 'editRole', query: { id: row.RoleId } })
+      this.$router.push({ name: 'editDevice', query: { id: row.EquipmentId } })
     },
     handleDelete (index, row) {
       // 删除
       console.log(index, row)
-      this.$confirm('确认删除此角色?', '提示', {
+      this.$confirm('确认删除此设备?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       })
         .then(() => {
-          this.DelRole({id: row.RoleId, callback: this.delCallBack})
+          this.DelDevice({id: row.EquipmentId, callback: this.delCallBack})
         })
         .catch(() => {
           this.$message({
@@ -132,42 +105,14 @@ export default {
         type: 'success',
         message: '删除成功!'
       })
-      this.GetRolesList({name: this.key})
-    },
-    handlePermission (index, row) {
-      this.selid = row.RoleId
-      this.GetRoleMenu({id: this.selid})
-      this.dialogTableVisible = true
-    },
-    handleNodeClick (node) {
-      console.log(node)
-    },
-    searchList (key) {
-      this.key = key
-      this.GetRolesList({name: this.key})
+      this.GetDeviceList()
     },
     addRole () {
-      this.$router.push({ name: 'editRole' })
-    },
-    getCheckedNodes () { // 获取选中的节点
-      const menuids = this.$refs.tree.getCheckedNodes().map(x => x.id).join(',')
-      console.log(menuids)
-      this.SaveRoleMenus({
-        id: this.selid,
-        menuids: menuids,
-        callback: this.hideDialog,
-      })
-    },
-    hideDialog () {
-      this.$message({
-        type: 'success',
-        message: '操作成功!'
-      })
-      this.dialogTableVisible = false
+      this.$router.push({ name: 'editDevice' })
     },
   },
   beforeMount () {
-    this.GetRolesList()
+    this.GetDeviceList()
   },
 }
 </script>

src/pages/system/page.js

@@ -12,8 +12,8 @@ import caseManager from './caseManager/index' // 案场管理
 import caseInfo from './caseManager/caseInfo/index' // 案场信息
 import addCase from './caseManager/caseInfo/addCase/index' // 新增案场
 import editCase from './caseManager/caseInfo/editCase/index' // 新增案场
-import deviceManager from './caseManager/caseInfo/deviceManager/index' // 体检设备
-import editDevice from './caseManager/caseInfo/deviceManager/add' // 添加体检设备
+import deviceManager from './caseManager/deviceManager/index' // 体检设备
+import editDevice from './caseManager/deviceManager/add' // 添加体检设备
 import pplConcerned from './caseManager/caseInfo/pplConcerned/index' // 相关人员
 import editPPLConcerned from './caseManager/caseInfo/pplConcerned/editPPLConcerned/index' // 编辑相关人员
 import keyManager from './caseManager/keyManager/index' // 钥匙管理

src/pages/system/systemSet/roleManager/add.vue

@@ -71,6 +71,11 @@ export default {
       } else {
         this.UpdateRole(this.detail)
       }
+      this.$message({
+        type: 'success',
+        message: '操作成功'
+      })
+      this.$router.push({ name: 'roleManager' })
     },
     cancel () {
       this.$router.go(-1)

src/store/case/device.js

@@ -0,0 +1,69 @@
+import ajax from '../../util/ajax'
+import api from '../../util/api'
+
+export default {
+  namespaced: true,
+  state: {
+    deviceList: [],
+    deviceInfo: {},
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.deviceList = payload || []
+    },
+    updateInfo (state, payload) {
+      state.deviceInfo = payload || {}
+    },
+  },
+  actions: {
+    GetDeviceList ({ commit }) {
+      ajax(api.device.list.url, {
+        method: api.device.list.method,
+      }).then(res => {
+        commit('updateList', res)
+      })
+    },
+    GetDeviceByID ({ commit }, { deviceid }) {
+      ajax(api.device.info.url, {
+        method: api.device.info.method,
+        urlData: {
+          id: deviceid,
+        }
+      }).then(res => {
+        commit('updateInfo', res)
+      })
+    },
+    AddDevice ({ commit }, payload) {
+      ajax(api.device.add.url, {
+        method: api.device.add.method,
+        data: {
+          ...payload
+        }
+      }).then(res => {
+        commit('updateInfo', res)
+      })
+    },
+    UpdateDevice ({ commit }, payload) {
+      ajax(api.device.update.url, {
+        method: api.device.update.method,
+        data: {
+          ...payload
+        }
+      }).then(res => {
+      })
+    },
+    DelDevice ({ commit }, { id, callback }) {
+      ajax(api.device.delete.url, {
+        method: api.device.delete.method,
+        urlData: {
+          id: id,
+        }
+      }).then(res => {
+        callback()
+      })
+    },
+    SetDeviceNull ({ commit }) {
+      commit('updateInfo', {})
+    },
+  }
+}

src/store/index.js

@@ -16,6 +16,7 @@ export const modules = {
   app: () => require('./app').default,
   cms: () => require('./cms').default,
   role: () => require('./system/role').default,
+  device: () => require('./case/device').default,
 }
 
 Object.keys(modules).forEach((modKey) => {

src/util/api.js

@@ -383,5 +383,27 @@ const $api = {
       url: `${baseUrl}${common}/customer`
     }
   },
+  device: {
+    list: {
+      method: 'get',
+      url: `${baseUrl}${common}/case/equipment`
+    },
+    info: {
+      method: 'get',
+      url: `${baseUrl}${common}/case/equipment/:id`
+    },
+    add: {
+      method: 'post',
+      url: `${baseUrl}${common}/case/equipment`
+    },
+    update: {
+      method: 'put',
+      url: `${baseUrl}${common}/case/equipment`
+    },
+    delete: {
+      method: 'delete',
+      url: `${baseUrl}${common}/case/equipment/:id`
+    },
+  }
 }
 export default $api