跨域

.env

@@ -5,6 +5,7 @@ VUE_APP_TITLE=D2Admin
 
 # 网络请求公用地址
 VUE_APP_API=/api/
+; VUE_APP_API=http://101.36.160.140:21023/
 
 # 仓库地址
 VUE_APP_REPO=https://github.com/d2-projects/d2-admin-start-kit

.env.development

@@ -1,5 +1,4 @@
 # 开发环境
 
 # 页面 title 前缀
-VUE_APP_TITLE=数量监测智能眼系统
-
+VUE_APP_TITLE=数量监测智能眼系统

src/api/index.js

@@ -5,6 +5,7 @@ import * as tools from './tools'
 
 const files = require.context('./modules', true, /\.api\.js$/)
 const generators = files.keys().map(key => files(key).default)
+console.log(files.keys(),"///")
 
 export default assign({}, ...map(generators, generator => generator({
   service,

src/api/modules/paramManage/hardParam.api.js

@@ -0,0 +1,29 @@
+
+  //硬件参数
+export default ({request}) => ({
+  //左侧树
+
+//列表
+ hardParam(data = {}) {
+
+
+  return request({
+    url: `hdParemeter/getPage`,
+    method: 'post',
+    data
+  })
+
+  },
+
+  //新增
+  addHardParam(data = {}) {
+
+
+    return request({
+      url: `hdParemeter/save`,
+      method: 'post',
+      data
+    })
+  
+    }
+})

src/api/paramManage/hardParam/index.js

@@ -1,11 +0,0 @@
-import * as request from '../../service.js'
-
-//硬件参数
-export function list(data) {
-    console.log(request,"..")
-    return request({
-      url: `hdParemeter/getPage`,
-      method: 'post',
-      data
-    })
-  }

src/api/service.js

@@ -33,7 +33,7 @@ function createService () {
       } else {
         // 有 code 代表这是一个后端接口 可以进行进一步的判断
         switch (code) {
-          case 0:
+          case 200:
             // [ 示例 ] code === 0 代表没有错误
             return dataAxios.data
           case 'xxx':
@@ -83,7 +83,8 @@ function createRequestFunction (service) {
         'Content-Type': get(config, 'headers.Content-Type', 'application/json')
       },
       timeout: 5000,
-      baseURL: process.env.VUE_APP_API,
+      // baseURL: process.env.VUE_APP_API,
+      baseURL: '/api',
       data: {}
     }
     return service(Object.assign(configDefault, config))

src/main.js

@@ -16,6 +16,11 @@ import { frameInRoutes } from '@/router/routes'
 import * as echarts from "echarts"
 Vue.prototype.$echarts = echarts
 
+
+// axios
+import axios from 'axios'
+Vue.prototype.$axios = axios;
+
 // 核心插件
 Vue.use(d2Admin)
 

src/views/demo/parameManagement/hardwareParame/index.vue

@@ -73,7 +73,10 @@
                 </el-form-item>
               </el-form>
               <div class="addBtn">
-                <el-button type="primary" icon="el-icon-plus" @click="addTantou"
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  @click="addTantou()"
                   >新增激光探头</el-button
                 >
               </div>
@@ -98,11 +101,7 @@
                   align="center"
                 >
                 </el-table-column>
-                <el-table-column
-                  prop="port"
-                  label="设备编号"
-                  align="center"
-                >
+                <el-table-column prop="Port" label="设备编号" align="center">
                 </el-table-column>
                 <el-table-column prop="ipAdress" label="设备IP" align="center">
                 </el-table-column>
@@ -133,16 +132,16 @@
     </d2-container>
 
     <!-- //弹框 -->
-    <el-dialog title="新增探头" :visible.sync="dialogTantou" id="dialogStyle">
+    <el-dialog :title="title" :visible.sync="dialogTantou" id="dialogStyle">
       <el-form :model="dialog">
         <el-form-item label="设备名称:" :label-width="formLabelWidth">
-          <el-input v-model="dialog.name" autocomplete="off"></el-input>
+          <el-input v-model="dialog.deviceName" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="设备IP:" :label-width="formLabelWidth">
-          <el-input v-model="dialog.name" autocomplete="off"></el-input>
+          <el-input v-model="dialog.ipAdress" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="设备编码:" :label-width="formLabelWidth">
-          <el-input v-model="dialog.name" autocomplete="off"></el-input>
+          <el-input v-model="dialog.Port" autocomplete="off"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -153,11 +152,13 @@
   </div>
 </template>
 <script>
-import { list } from "@/api/paramManage/hardParam";
+import api from "@/api";
 export default {
   name: "hardwareParame",
   data() {
     return {
+      //初始化弹框标题
+      title: "",
       //仓房id
       houseId: "",
       //设备名称
@@ -234,14 +235,15 @@ export default {
       hardwareList: [
         {
           deviceName: "",
-          port:"",
+          port: "",
           ipAdress: "",
-         
         },
       ],
       //弹框字段
       dialog: {
-        name: "",
+        deviceName: "",
+          port: "",
+          ipAdress: "",
       },
       //分页
 
@@ -264,7 +266,7 @@ export default {
     //获取列表数据
     getList() {
       var condition = {
-        houseId: null,
+        houseId: 1,
         deviceName: "",
       };
       condition = JSON.stringify(condition);
@@ -273,18 +275,21 @@ export default {
         pageSize: this.pagination.pageSize,
         condition: condition,
       };
-      list(data)
-      .then((res) => {
-        if (res.code == 200) {
-          this.hardwareList = res.data.records;
-          this.pagination.pageSize = res.data.size;
-          this.pagination.total = res.data.total;
-        }
-      })
-      .catch(err=>{
-        console.log(err)
-      });
+      api
+        .hardParam(data)
+        .then((res) => {
+          if (res.code == 200) {
+            this.hardwareList = res.data.records;
+            this.pagination.pageSize = res.data.size;
+            this.pagination.total = res.data.total;
+          }
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     },
+    //新增
+    addList(){},
 
     filterNode(value, data) {
       if (!value) return true;
@@ -294,6 +299,7 @@ export default {
     reset() {},
     //新增
     addTantou() {
+      this.title = "新增硬件参数";
       this.dialogTantou = true;
     },
     //表格序号
@@ -304,21 +310,21 @@ export default {
     },
     //当前页改变时
     handleCurrentChange(val) {
-      this.pagination.curPage=val;
+      this.pagination.curPage = val;
       this.getList();
     },
     //每页显示的页数改变时
     handleSizeChange(val) {
-            this.pagination.pageSize = val
-      this.getList()
+      this.pagination.pageSize = val;
+      this.getList();
     },
     //弹框确定按钮
     determine() {},
   },
-  mounted(){
-    console.log('aaaa')
+  mounted() {
+    console.log("aaaa");
     this.getList();
-  }
+  },
 };
 </script>
 <style lang="scss" scoped>

vue.config.js

@@ -38,7 +38,17 @@ module.exports = {
   lintOnSave: true,
   devServer: {
     publicPath, // 和 publicPath 保持一致
-    disableHostCheck: process.env.NODE_ENV === 'development' // 关闭 host check，方便使用 ngrok 之类的内网转发工具
+    disableHostCheck: process.env.NODE_ENV === 'development', // 关闭 host check，方便使用 ngrok 之类的内网转发工具
+    proxy: {
+      '/api': {
+        target: ' http://101.36.160.140:21023',
+        ws: true,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/api': ''
+        }
+      }
+    }
   },
   css: {
     loaderOptions: {