修改逻辑

src/assets/base.css

@@ -83,8 +83,7 @@ body {
 
 .el-tabs {
   --el-tabs-header-height: 80px !important;
-  background-image: url('theme/bg.png');
-  background-size: cover;
+  background-color: '#1F8A36';
   color: #f8f8f8;
 }
 
@@ -98,8 +97,7 @@ body {
 }
 
 .el-card__header {
-  background-image: url('theme/bg.png');
-  background-size: cover;
+  background-color: '#1F8A36';
   opacity: 0.7;
   color: #fff;
 }

src/views/ChannelSetting.vue

@@ -3,7 +3,7 @@
   <el-tabs type="border-card">
     <el-tab-pane label="系统配置">
       <el-card style="height: calc(100vh - 227.75px)">
-        <el-form :model="sysForm" :inline="true">
+        <el-form :model="sysForm" :inline="true" style="margin-top: 20px;">
           <el-form-item label="仓库编号" :rules="[{ required: true, message: '仓库编号不能为空', trigger: 'blur' }]">
             <el-input v-model="sysForm.storeCode" />
           </el-form-item>
@@ -19,11 +19,11 @@
             </el-form-item>
           </el-tooltip>
           <el-form-item>
-            <el-button round type="success" @click="getConfig">刷新</el-button>
-            <el-button round type="primary" @click="saveConfig">保存</el-button>
-            <el-button round type="primary" @click="syncGoods">同步物资</el-button>
+            <el-button round type="success" @click="resetConfig">读取</el-button>
+            <el-button round type="success" @click="saveConfig" v-if="sysForm.id">保存</el-button>
+            <el-button round type="success" @click="syncGoods">同步物资</el-button>
             <el-dropdown @command="handleCommand">
-              <span style="cursor: pointer; background: #409eff;margin-left: 12px;">
+              <span style="cursor: pointer; background: #67c23a;margin-left: 12px;">
                 <img src="../assets/icons/主题.png" style="width: 32px;">
               </span>
               <template #dropdown>
@@ -36,6 +36,27 @@
             </el-dropdown>
           </el-form-item>
         </el-form>
+        <el-divider><span style="font-size: 20px;">库房/ip配置</span></el-divider>
+        <div class="head-container">
+          <el-button class="filter-item" type="primary" style="float: right" @click="addConfig">新增</el-button>
+        </div>
+        <el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="configList" border style="width: 100%;">
+          <el-table-column type="index" label="序号" align="center" width="70"/>
+          <el-table-column prop="storeCode" label="库房代码" align="center"/>
+          <el-table-column prop="serverIp" label="服务器IP" align="center"/>
+          <el-table-column prop="serverPort" label="服务器端口" align="center"/>
+          <el-table-column prop="masterIp" label="物理主机IP" align="center" />
+          <el-table-column label="操作" width="200" align="center">
+            <template #default="scope">
+              <el-button type="primary" size="small" @click="editConfig(scope.row)">编辑</el-button>
+              <el-popconfirm title="你确定删除吗?" @confirm="removeConfig(scope.row)">
+                <template #reference>
+                  <el-button type="danger" size="small">删除</el-button>
+                </template>
+              </el-popconfirm>
+            </template>
+          </el-table-column>
+        </el-table>
       </el-card>
     </el-tab-pane>
     <el-tab-pane label="通道配置">
@@ -43,7 +64,7 @@
         <div class="head-container">
           <el-button class="filter-item" type="primary" style="float: right" @click="add">新增</el-button>
         </div>
-        <el-table :data="channelList" border style="width: 100%;">
+        <el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="channelList" border style="width: 100%;">
           <el-table-column prop="stationId" label="通道号" align="center" width="100"/>
           <el-table-column prop="readerIp" label="读写器" align="center">
             <template #default="scope">
@@ -74,6 +95,30 @@
       </el-card>
     </el-tab-pane>
   </el-tabs>
+  
+  <el-dialog v-model="visible" width="30%" :title="title" @close="closeConfig">
+    <el-form label-position="right" size="large" label-width="90px" :model="configForm" :rules="rules" ref="storeIp">
+      <el-form-item label="库房代码">
+        <el-input v-model="configForm.storeCode" placeholder="请输入库房代码"/>
+      </el-form-item>
+      <el-form-item label="服务器IP" prop="serverIp">
+        <el-input v-model="configForm.serverIp" placeholder="请输入服务器IP"/>
+      </el-form-item>
+      <el-form-item label="服务器端口" prop="serverPort">
+        <el-input v-model="configForm.serverPort" placeholder="请输入服务器端口"/>
+      </el-form-item>
+      <el-form-item label="物理主机IP" prop="masterIp">
+        <el-input v-model="configForm.masterIp" placeholder="请输入物理主机IP"/>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="visible = false" size="large">关闭</el-button>
+        <el-button type="primary" @click="submitConfig" size="large">提交</el-button>
+      </div>
+    </template>
+  </el-dialog>
+
   <el-dialog v-model="innerVisible" width="30%" :title="title">
       <el-form label-position="right" size="large" label-width="90px" :model="formData">
         <el-form-item label="通道号">
@@ -127,8 +172,8 @@
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button @click="innerVisible = false">关闭</el-button>
-          <el-button type="primary" @click="handleSubmit">提交</el-button>
+          <el-button @click="innerVisible = false" size="large">关闭</el-button>
+          <el-button type="primary" @click="handleSubmit" size="large">提交</el-button>
         </div>
       </template>
   </el-dialog>
@@ -141,55 +186,142 @@ import { postAction, getAction } from '@/api/manage'
 import { ElMessage } from 'element-plus'
 export default defineComponent({
   setup() {
+    const { proxy } = getCurrentInstance()
+    const configList = ref([])
     const channelList = ref([])
     const title = ref('')
     const sysForm = ref({})
+    const configForm = ref({})
     const formData = ref({})
+    const visible = ref(false)
     const innerVisible = ref(false)
     
+    // ip正则表达式
+    function isIp(str) {
+      const reg = /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/
+      return reg.test(str)
+    }
+    
+    // ip校验
+    const validateIp = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('请输入Ip'))
+      } else if (!isIp(value)) {
+        callback(new Error('ip格式不正确'))
+      } else {
+        callback()
+      }
+    }
+    
+    // port校验
+    const validatePort = (rule, value, callback) => {
+      if (!value) {
+        callback(new Error('请输入端口'))
+      } else if (isNaN(value)) {
+        callback(new Error('请输入数字值'));
+      } else if(value < 0 || value > 65535 ) {
+        callback(new Error('端口范围在(0-65535)'))
+      } else {
+        callback()
+      }
+    }
+
+    const rules = reactive({
+      serverIp: [{ validator: validateIp, trigger: 'blur' }],
+      serverPort: [{ validator: validatePort, trigger: 'blur' }],
+      masterIp: [{ validator: validateIp, trigger: 'blur' }]
+    })
+
     const state = reactive({
       url: {
+        getStoreCode: '/config/getStoreCode',
         getConfig: '/config/getConfig',
+        getConfigPage: '/config/getConfigPage',
+        updateConfig: '/config/updateConfig',
+        saveConfig: '/config/saveConfig',
+        removeConfig: '/config/removeConfig',
+
         getDevice: '/device/getDevice',
         updateDevice: '/device/updateDevice',
         removeDevice: '/device/removeDevice',
         saveDevice: '/device/saveDevice',
-        updateConfig: '/config/updateConfig',
-        saveConfig: '/config/saveConfig',
+
+        
         syncGoods: '/platform/syncGoods'
       },
     });
+
+
     const loadData = (arg) => {
-      getConfig()
+      getConfigPage()
       getDevice()
     }
 
+    function getConfigPage() {
+      postAction(state.url.getConfigPage, {}).then(res => {
+        if (res.code !== 99200) return ElMessage.error(res.message);
+        configList.value = res.data.records
+      })
+    }
+    
+    function addConfig() {
+      title.value = '新增'
+      visible.value = true
+    }
+
+    function editConfig(row) {
+      title.value = '编辑'
+      configForm.value = JSON.parse(JSON.stringify(row))
+      visible.value = true
+    }
+
+    function submitConfig() {
+      let url = configForm.value.id ? state.url.updateConfig : state.url.saveConfig
+      proxy.$refs.storeIp.validate((valid) => {
+        if (!valid) {
+          ElMessage.warning('请正确填写信息')
+        } else {
+          postAction(url, configForm.value).then(res => {
+            if (res.code !== 99200) return ElMessage.error(res.message);
+            ElMessage.success(res.message)
+            configForm.value = {}
+            visible.value = false
+            getConfigPage()
+          })
+        }
+      })
+    }
+
+    function closeConfig() {
+      configForm.value = {}
+    }
+
+    function removeConfig(row) {
+      postAction(state.url.removeConfig, { id: row.id}).then(res => {
+        if (res.code !== 99200) return ElMessage.error(res.message);
+        ElMessage.success(res.message)
+        getConfigPage()
+      })
+    }
+
     function getDevice() {
+      if (!sessionStorage.getItem('storeInfo')) return;
       postAction(state.url.getDevice, {storeCode: JSON.parse(sessionStorage.getItem('storeInfo')).storeCode}).then(res => {
         if (res.code !== 99200) return ElMessage.error(res.message);
         channelList.value = res.data
       })
     }
     
-    function getConfig() {
-      postAction(state.url.getConfig, {}).then(res => {
+    function resetConfig() {
+      getAction(state.url.getStoreCode).then(res => {
+        if (res.code !== 99200) return ElMessage.error(res.message);
+        postAction(state.url.getConfig, {storeCode: res.data}).then(res => {
           if (res.code !== 99200) return ElMessage.error(res.message);
           if (res.data.length > 0) {
-          sysForm.value = {
-            id: res.data[0].id,
-            storeCode: res.data[0].storeCode,
-            serverIp: res.data[0].serverIp,
-            serverPort: res.data[0].serverPort
-          }
-        } else {
-          sysForm.value = {
-            id: '',
-            storeCode: '',
-            serverIp: '',
-            serverPort: ''
-          }
+            sysForm.value = JSON.parse(JSON.stringify(res.data[0]))
           }
         })
+      })
     }
 
     function syncGoods() {
@@ -214,7 +346,6 @@ export default defineComponent({
         if (res.code !== 99200) return ElMessage.error(res.message);
         ElMessage.success(res.message)
         sessionStorage.setItem('storeInfo', JSON.stringify(sysForm.value))
-        getConfig()
       })
     }
 
@@ -251,13 +382,13 @@ export default defineComponent({
 
     function handleCommand(command) {
       if (command === '#223170') { // 藏蓝
-        sessionStorage.setItem('loginbg', 'bg1')
+        sessionStorage.setItem('bgColor', '#223170')
       }
       if (command === '#025799') { // 蓝色
-        sessionStorage.setItem('loginbg', 'bg2')
+        sessionStorage.setItem('bgColor', '#025799')
       }
       if (command === '#1f8a36') { // 军绿
-        sessionStorage.setItem('loginbg', 'bg')
+        sessionStorage.setItem('bgColor', '#1f8a36')
       }
       window.location.reload()
     }
@@ -265,12 +396,24 @@ export default defineComponent({
     return {
       ...toRefs(state),
       sysForm,
+      configForm,
       formData,
+      rules,
+      visible,
       innerVisible,
       title,
+      configList,
       channelList,
-      getConfig,
+
+      resetConfig,
+
+      addConfig,
+      editConfig,
+      removeConfig,
       saveConfig,
+      submitConfig,
+      closeConfig,
+
       add,
       edit,
       handleSubmit,
@@ -278,6 +421,7 @@ export default defineComponent({
       loadData,
       getDevice,
       syncGoods,
+      getConfigPage,
       handleCommand
     }
   },

src/views/HomeView.vue

 <template>
-  <el-tabs :tab-position="tabPosition" type="card" :stretch="true" class="menu-tabs" @tab-change="tabChange" :style="{backgroundImage:'url('+ bg +')'}">
+  <el-tabs :tab-position="tabPosition" type="card" :stretch="true" class="menu-tabs" @tab-change="tabChange" :style="{backgroundColor: color }">
     <el-tab-pane v-for="item in tabList" :key="item.title">
       <template #label>
         <span class="custom-tabs-label">
@@ -10,7 +10,8 @@
       <component :is="item.template" :ref="item.template" @refresh="handleRefresh" @logChange="handleLogChange"></component>
     </el-tab-pane>
     <el-card>
-      <div v-html="log" class="log-scroll" style="display: flex;align-items: center;"></div>
+      <!-- class="log-scroll" -->
+      <div v-html="log" style="display: flex;align-items: center;"></div>
     </el-card>
   </el-tabs>
 </template>
@@ -29,7 +30,7 @@ export default defineComponent({
     const { proxy } = getCurrentInstance()
     const tabPosition = ref('bottom')
     const log = ref('')
-    const bg = ref('/src/assets/theme/bg.png')
+    const color = ref('#1f8a36')
     const tabList = [
       {title: '射频识别', icon: 'iconfont icon-tiaozhishibie', template: 'RFID'},
       {title: '入库作业', icon: 'iconfont icon-rukuguanli-', template: 'InTask'},
@@ -38,37 +39,30 @@ export default defineComponent({
       {title: '查询', icon: 'iconfont icon-chaxun', template: 'Query'},
       {title: '通道配置', icon: 'iconfont icon-shezhi', template: 'ChannelSetting'},
     ]
-    const a = sessionStorage.getItem('loginbg')
-    if(a == 'bg') {
-      bg.value = '/src/assets/theme/bg.png'
-    }
-    if(a == 'bg1') {
-      bg.value = '/src/assets/theme/bg1.png'
-    }
-    if(a == 'bg2') {
-      bg.value = '/src/assets/theme/bg2.png'
+
+    if (sessionStorage.getItem('bgColor')) {
+      color.value = sessionStorage.getItem('bgColor')
     }
 
+    console.log(color.value)
+    
     setTimeout(()=> {
       changeBg()
     }, 200)
 
     function changeBg() {
       for(var i =0;i< document.getElementsByClassName('el-card__header').length; i++){
-        document.getElementsByClassName('el-card__header')[i].style.backgroundImage = 'url(' + bg.value +')'
+        document.getElementsByClassName('el-card__header')[i].style.backgroundColor = color.value
       }
     }
 
-    
-
-
     function tabChange(index) {
       if (index == 0) {
         return
       }
       proxy.$refs[tabList[index].template][0].loadData()
-      
     }
+
     function handleRefresh() {
       proxy.$refs.InTask[0].loadData()
       proxy.$refs.OutTask[0].loadData()
@@ -80,7 +74,7 @@ export default defineComponent({
       tabPosition,
       tabList,
       log,
-      bg,
+      color,
       tabChange,
       handleRefresh,
       handleLogChange

src/views/InTask.vue

@@ -8,8 +8,8 @@
             <el-button round class="button" type="primary" @click="syncInBill" :loading="loading">入库单接收</el-button>
           </div>
         </template>
-        <el-table :data="billList" ref="bill" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="billClick">
-          <el-table-column type="index" label="序号" width="60" align="center"/>
+        <el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="billList" ref="bill" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="billClick">
+          <el-table-column type="index" label="序号" width="70" align="center"/>
           <el-table-column prop="bizBillNo" label="单据号" align="center"/>
           <el-table-column prop="billName" label="凭证号" align="center" :show-overflow-tooltip="true"/>
           <el-table-column prop="swOrgName" label="收物单位" align="center" :show-overflow-tooltip="true"/>
@@ -48,8 +48,8 @@
         <template #header>
           <span>物资列表</span>
         </template>
-        <el-table :data="goodsList" ref="goods" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="goodsClick">
-          <el-table-column type="index" label="序号" width="60" align="center"/>
+        <el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="goodsList" ref="goods" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="goodsClick">
+          <el-table-column type="index" label="序号" width="70" align="center"/>
           <el-table-column prop="goodsCode" label="品名代码" align="center"/>
           <el-table-column prop="goodsName" label="品名" align="center"/>
           <el-table-column prop="planAmount" label="计划数量" align="center"/>
@@ -73,7 +73,7 @@
             <span>号型列表</span>
           </div>
         </template>
-        <el-table :data="modelList" border style="width: 100%;height: 70vh;">
+        <el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="modelList" border style="width: 100%;height: 70vh;">
           <el-table-column type="index" label="序号" width="60" align="center"/>
           <el-table-column prop="modelName" label="号型名称" align="center"/>
           <el-table-column prop="planAmount" label="计划数量" align="center"/>

src/views/OutTask.vue

@@ -8,8 +8,8 @@
             <el-button round class="button" type="primary" @click="syncOutBill" :loading="loading">出库单接收</el-button>
           </div>
         </template>
-        <el-table :data="billList" ref="bill" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="billClick">
-          <el-table-column type="index" label="序号" width="60" align="center"/>
+        <el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="billList" ref="bill" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="billClick">
+          <el-table-column type="index" label="序号" width="70" align="center"/>
           <el-table-column prop="bizBillNo" label="单据号" align="center"/>
           <el-table-column prop="billName" label="凭证号" align="center"/>
           <el-table-column prop="swOrgName" label="收物单位" align="center"/>
@@ -48,7 +48,7 @@
         <template #header>
           <span>物资列表</span>
         </template>
-        <el-table :data="goodsList" ref="goods" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="goodsClick">
+        <el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="goodsList" ref="goods" border style="width: 100%;height: 28.5vh;" highlight-current-row @row-click="goodsClick">
           <el-table-column type="index" label="序号" width="60" align="center"/>
           <el-table-column prop="goodsCode" label="品名代码" align="center"/>
           <el-table-column prop="goodsName" label="品名" align="center"/>
@@ -73,8 +73,8 @@
             <span>号型列表</span>
           </div>
         </template>
-        <el-table :data="modelList" border style="width: 100%;height: 70vh;">
-          <el-table-column type="index" label="序号" width="60" align="center"/>
+        <el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="modelList" border style="width: 100%;height: 70vh;">
+          <el-table-column type="index" label="序号" width="70" align="center"/>
           <el-table-column prop="modelName" label="号型名称" align="center" width="180"/>
           <el-table-column prop="planAmount" label="计划数量" align="center"/>
           <el-table-column prop="realAmount" label="实际数量" align="center"/>

src/views/Query.vue

@@ -27,7 +27,7 @@
     </el-col>
     <el-col :span="18">
       <el-card style="height: calc(100vh - 147px);">
-        <el-table :data="logList" border size="large" style="width: 100%;height: 78vh;">
+        <el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="logList" border size="large" style="width: 100%;height: 78vh;">
           <el-table-column type="index" label="序号" width="70" align="center"/>
           <el-table-column prop="inState" label="出入库" align="center">
             <template #default="scope"> 

src/views/RFID.vue

@@ -10,7 +10,7 @@
           </template>
           <el-row :gutter="20">
             <el-col :span="18">
-              <el-table :data="item.logData" size="large" border style="width: 100%;" max-height="660">
+              <el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="item.logData" size="large" border style="width: 100%;" max-height="660">
               <el-table-column type="index" label="序号" width="70" align="center"/>
               <el-table-column prop="stationType" label="作业类型" align="center">
                 <template #default="scope">
@@ -242,7 +242,8 @@ export default defineComponent({
           updateDevice: '/device/updateDevice',
           removeDevice: '/device/removeDevice',
           saveDevice: '/device/saveDevice',
-          updateConfig: '/config/updateConfig'
+          updateConfig: '/config/updateConfig',
+          getStoreCode: '/config/getStoreCode'
         },
         storeInfo: {},
         storeCode: '',
@@ -375,12 +376,15 @@ export default defineComponent({
             })
           })
         } else {
-          postAction(state.url.getConfig, {}).then(res => {
+          getAction(state.url.getStoreCode).then(res => {
+            if (res.code !== 99200) return ElMessage.error(res.message);
+            postAction(state.url.getConfig, {storeCode: res.data}).then(res => {
               if (res.code !== 99200) return ElMessage.error(res.message);
               state.storeInfo = res.data[0]
               sessionStorage.setItem('storeInfo', JSON.stringify(state.storeInfo))
               loadData()
             })
+          })
         }
       }
 

src/views/Setting.vue

@@ -35,7 +35,7 @@
     </el-col>
     <el-col :span="18">
       <el-card style="height: calc(100vh - 147px);">
-        <el-table :data="bindList" border size="large" style="width: 100%;">
+        <el-table :header-cell-style="{backgroundColor: '#f5f7fa',color: '#000',fontSize: '18px',fontWeight: '600'}" :data="bindList" border size="large" style="width: 100%;">
           <el-table-column type="index" label="序号" width="70" align="center"/>
           <el-table-column prop="stationId" label="通道号" align="center"/>
           <el-table-column prop="state" label="状态" align="center">