2545307760@qq.com hace 4 meses
padre
commit
534d36d628
Se han modificado 2 ficheros con 62 adiciones y 15 borrados
  1. 3 2
      web/src/api/channel.js
  2. 59 13
      web/src/view/parking/parkingInfo.vue

+ 3 - 2
web/src/api/channel.js

@@ -35,10 +35,11 @@ export const obtainChannelCode = (code) => {
 }
 
 // 获取通道列表
-export const obtainChannelList = () => {
+export const obtainChannelList = (params) => {
     return service({
         url: '/parking/channel/list',
-        method: 'get'
+        method: 'get',
+        params
     })
 }
 

+ 59 - 13
web/src/view/parking/parkingInfo.vue

@@ -78,7 +78,7 @@
         >
           <el-form inline>
             <el-form-item>
-              <el-button icon="Plus" text type="success" @click="openChannel">新增</el-button>
+              <el-button icon="Plus" text type="success" @click="openChannel('通道新增','')">新增</el-button>
             </el-form-item>
             <el-form-item>
               <el-button icon="Edit" text type="warning">编辑</el-button>
@@ -90,12 +90,16 @@
               <el-button icon="Refresh" text type="primary">刷新</el-button>
             </el-form-item>
           </el-form>
-          <el-table size="small">
+          <el-table size="small" :data="channelList">
             <el-table-column label="编码" align="center" width="100"></el-table-column>
             <el-table-column label="名称" align="center" width="250"></el-table-column>
             <el-table-column label="进出方向" align="center" width="150"></el-table-column>
             <el-table-column label="是否允许临时车进出" align="center" width="200"></el-table-column>
             <el-table-column label="备注" align="center"></el-table-column>
+            <el-table-column label="操作" align="center" #default="scope">
+              <el-button type="primary" icon="edit" text @click="openChannel('通道编辑', scope.row)">编辑</el-button>
+              <el-button type="primary" icon="delete" text>删除</el-button>
+            </el-table-column>
           </el-table>
         </el-tab-pane>
         <el-tab-pane
@@ -165,19 +169,43 @@
           <el-input v-model="channelData.channel_name"></el-input>
         </el-form-item>
         <el-form-item label="进出方向:">
-          <el-radio-group v-model="channelData.allow_temporary" size="large" fill="#409eff">
-            <el-radio-button label="" :value="false" />
-            <el-radio-button label="" :value="true" />
+          <el-radio-group v-model="channelData.direction" size="large" fill="#409eff">
+            <el-radio-button label="" :value="false" />
+            <el-radio-button label="" :value="true" />
           </el-radio-group>
         </el-form-item>
         <el-form-item label="是否允许临时车进出:">
           <el-radio-group v-model="channelData.allow_temporary" size="large" fill="#409eff">
-            <el-radio-button label="是" :value="true" />
             <el-radio-button label="否" :value="false" />
+            <el-radio-button label="是" :value="true" />
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注:">
-          <el-input type="textarea" v-model="channelData.direction"></el-input>
+          <el-input type="textarea" v-model="channelData.description"></el-input>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="channelShow = false">取消</el-button>
+          <el-button type="primary" @click="channelOperation">
+            确认
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <el-dialog v-model="deviceShow" :title="deviceTitle" width="500">
+      <el-form>
+        <el-form-item label="IP地址:">
+          <el-input v-model="deviceData.ip_address"></el-input>
+        </el-form-item>
+        <el-form-item label="名称:">
+          <el-input v-model="deviceData.device_name"></el-input>
+        </el-form-item>
+        <el-form-item label="编码:">
+          <el-input v-model="deviceData.device_code"></el-input>
+        </el-form-item>
+        <el-form-item label="备注:">
+          <el-input type="textarea" v-model="channelData.description"></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -215,7 +243,7 @@ const positionShow = ref(false)
 const positionOperation = ref(0)
 
 const positionTitle = ref('岗亭新增')
-// 岗亭数据
+// 岗亭数据.......................................
 const positionData = reactive({
   id:'',
   booth_code:'',
@@ -305,10 +333,9 @@ const delPosition = (id) => {
 }
 
 // 通道管理...................................................
-
 //通道数据
 const channelShow = ref(false)
-const channelData = reactive({
+const queryChannelData = reactive({
   channel_code:'',
   channel_name:'',
   direction:'',
@@ -317,6 +344,14 @@ const channelData = reactive({
   allow_temporary:false
 })
 
+const channelData = reactive({
+  channel_code:'',
+  channel_name:'',
+  direction: false,
+  allow_temporary:'',
+  description: false
+})
+
 const channelTitle = ref('通道新增')
 
 const channelList = reactive([])
@@ -324,7 +359,7 @@ const channelList = reactive([])
 const openChannel = (head,data) => {
   channelTitle.value = head
   channelShow.value = true
-  if (head === '岗亭编辑') {
+  if (head === '通道编辑') {
     channelData.id = data.ID
     channelData.channel_code = data.channel_code
     channelData.channel_name = data.channel_name
@@ -360,14 +395,25 @@ const channelOperation = () => {
 }
 
 const getChannelList = () => {
-  obtainChannelList().then(res => {
+  obtainChannelList(queryChannelData).then(res => {
     if (res.code === 0) {
       channelList.length = 0
-      channelList.push(...res.data)
+      console.log('数据', res.data)
+      channelList.push(...res.data.list)
     }
   })
 }
 
+//设备管理
+const deviceData = reactive({
+  device_code:'',
+  device_name:'',
+  device_type:'',
+  ip_address:'',
+  port:'',
+  description:''
+})
+
 onMounted(() => {
   getGuardBoothList()
   getChannelList()