Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

ys_int/src/http.js

@@ -23,7 +23,7 @@ function handleResults (response) {
 
 function handleUrl (url) {
     if(url.indexOf('.do') > -1) {
-        url = LINK_URL + url;
+        url = url;//LINK_URL + 
     } else {
         url = BASE_URL + url;
     }

ys_int/src/port.js

@@ -107,7 +107,7 @@ export default {
         moulds: '/mouldequipment/getMouldEquipmentList', // 创建模具时获取资产方的云模盒列表
         importMouldEquipmentExcel: '/mouldequipment/importMouldEquipmentExcel', //批量导入云模盒
         
-        setPacket: '/JSKBT/setPacket.do',// 云平台下行配置数据包接口
+        setPacket: '/mouldequipment/use',// 云平台下行配置数据包接口
         openingAndClosingTimesChart: '/mouldhistory/openingAndClosingTimesChart', //获取云模盒的每日开合次数图表 (时间/次数)
         openingAndClosingTimesChartCycle: '/mouldhistory/openingAndClosingTimesChartCycle', //获取云模盒的每日开合次数周期 (时间/次数)
     },

ys_int/src/views/base/allocation.vue

@@ -39,7 +39,7 @@
         </el-col>
 
         <!--列表-->
-        <el-table :data="allocations" :height="tableHeight" highlight-current-row v-loading="listLoading" @selection-change="handleSelectionChange" style="width: 100%;">
+        <el-table :data="allocations" :height="tableHeight" highlight-current-row v-loading="listLoading" style="width: 100%;">
             <!-- <el-table-column type="selection" width="50"></el-table-column> -->
             <el-table-column type="index" width="60"></el-table-column>
             <el-table-column prop="equipmentNo" :label="$t('basic.equipmentNo')" width="180" sortable></el-table-column>
@@ -470,7 +470,7 @@
             openEnable(index) {
                 this.operateDialogVisible = true;
                 this.issuedVal.alarmBattery = this.allocations[this.activeIndex].alarmBattery;
-                this.issuedVal.alarmDegree = this.allocations[this.activeIndex].alarmDegree;
+                this.issuedVal.alarmDegree = parseInt(this.allocations[this.activeIndex].alarmDegree);
                 this.activeIndex = index;
             },
 
@@ -592,6 +592,11 @@
                 });
             },
 
+            //列表选择
+            handleSelectionChange(val) {
+                this.multipleSelection = val;
+            },
+
             //下发云模盒
             issued() {
                 this.issuedVisible = true;

ys_vue/src/port.js

@@ -107,7 +107,7 @@ export default {
         moulds: '/mouldequipment/getMouldEquipmentList', // 创建模具时获取资产方的云模盒列表
         importMouldEquipmentExcel: '/mouldequipment/importMouldEquipmentExcel', //批量导入云模盒
         
-        setPacket: '/JSKBT/setPacket.do',// 云平台下行配置数据包接口
+        setPacket: '/mouldequipment/use',// 云平台下行配置数据包接口
         openingAndClosingTimesChart: '/mouldhistory/openingAndClosingTimesChart', //获取云模盒的每日开合次数图表 (时间/次数)
         openingAndClosingTimesChartCycle: '/mouldhistory/openingAndClosingTimesChartCycle', //获取云模盒的每日开合次数周期 (时间/次数)
 

ys_vue/src/views/base/allocation.vue

@@ -39,7 +39,7 @@
         </el-col>
 
         <!--列表-->
-        <el-table :data="allocations" :height="tableHeight" highlight-current-row v-loading="listLoading" @selection-change="handleSelectionChange" style="width: 100%;">
+        <el-table :data="allocations" :height="tableHeight" highlight-current-row v-loading="listLoading" style="width: 100%;">
             <!-- <el-table-column type="selection" width="50"></el-table-column> -->
             <el-table-column type="index" width="60"></el-table-column>
             <el-table-column prop="equipmentNo" label="云模盒编号" width="180" sortable></el-table-column>
@@ -441,7 +441,7 @@
             openEnable(index) {
                 this.operateDialogVisible = true;
                 this.issuedVal.alarmBattery = this.allocations[this.activeIndex].alarmBattery;
-                this.issuedVal.alarmDegree = this.allocations[this.activeIndex].alarmDegree;
+                this.issuedVal.alarmDegree = parseInt(this.allocations[this.activeIndex].alarmDegree);
                 this.activeIndex = index;
             },