1122

src/store/index.js

@@ -22,7 +22,7 @@ export default new Vuex.Store({
     mode: true,
     // 按钮权限
     buttons: [],
-    ip: 'http://192.168.1.165:8010',
+    ip: 'http://122.112.212.35:8010',
     // 所选择的farmId
     farmId: '',
     farmList: [],

src/utils/http.js

@@ -15,7 +15,7 @@ let removePending = (ever) => {
 // 创建axios实例
 var instance = axios.create({
   timeout: 1000 * 12,
-  baseURL: 'http://192.168.1.165:8010'
+  baseURL: 'http://122.112.212.35:8010'
 })
 
 // 请求拦截器

src/views/basic-data/device-admin/DeviceAdmin.vue

@@ -35,9 +35,12 @@
         :height="600"
         :title="devTitle"
         :listData="list"
-        :tableItems="tableItems">
+        :tableItems="tableItems"
+        :shows="tableShows"
+        @selectionChange="selectionChange">
         <template #right>
           <el-button type="primary" size="mini" @click="add">新增设备</el-button>
+          <el-button type="danger" size="mini" @click="delAll">批量删除</el-button>
         </template>
         <template #stage="scope">
           <span>{{ getStage(scope.row.stage) }}</span>
@@ -118,7 +121,7 @@ import { getDeviceList, addDeviceList, delDeviceList } from "@/utils/apis/device
 import NewTable from "@/components/newTable/NewTable";
 import TableFooter from "@/components/TableFooter";
 import { basePigpenList } from "@/utils/apis/basic-data/houseAdmin";
-import { getFilter } from "@/utils";
+import { getFilter, arrToIds } from "@/utils";
 
 export default {
   name: 'DeviceAdmin',
@@ -150,7 +153,7 @@ export default {
         },
         {
           prop: "registerTime",
-          label: "芯片编码",
+          label: "注册时间",
           minWidth: "100",
           slotName: "registerTime",
         },
@@ -162,7 +165,7 @@ export default {
         },
         {
           prop: "registeCode",
-          label: "注册编码",
+          label: "芯片编码",
           minWidth: "100",
           slotName: "registeCode",
         },
@@ -230,7 +233,12 @@ export default {
         serverIp: [{  required: true, message: '请输入ip', trigger: 'blur' }],
         port: [{  required: true, message: '请输入端口号', trigger: 'blur' }],
         stage: [{  required: true, message: '请选择阶段', trigger: 'change' }],
-      }
+      },
+      tableShows: {
+        showIndex: false,
+        showSelect: true,
+      },
+      selectList: [],
     }
   },
   methods: {
@@ -350,6 +358,44 @@ export default {
           this.message.error(res.message)
         }
       })
+    },
+    // 批量选择
+    selectionChange(rows) {
+      this.selectList = rows;
+    },
+    delAll() {
+      if (this.selectList.length > 0) {
+        this.$confirm("此操作将永久删除这些设备，是否继续？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            let ids = []
+            this.selectList.forEach(item => {
+              ids.push(item.id)
+            })
+            delDeviceList(ids).then((res) => {
+              this.selectList = [];
+              if (res.code === 10000) {
+                this.init();
+                this.$message.success(res.message);
+              } else {
+                this.$message.error(res.message);
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
+        // delArea()
+      } else {
+        this.$message.error("请勾选需要删除的设备");
+        return;
+      }
     }
   },
   created() {

src/views/eartag-admin/eartag-data/EartagData.vue

@@ -248,6 +248,7 @@ export default {
       let params = {
         page: this.pageNum,
         limit: this.size,
+        farmId: this.form.farm
       };
       getEarTagList(params)
         .then((res) => {
@@ -290,8 +291,12 @@ export default {
     this.GetFarm();
   },
   mounted() {
+    if(this.userItem.type === 0) {
+      this.form.farm = this.farmList[0].id;
+    } else {
+      this.form.farm = parseInt(this.userItem.farmId);
+    }
     this.init();
-    this.form.farm = this.farmList[0].id;
   },
 };
 </script>