diff --git a/public/socket_test.html b/public/socket_test.html
index b97946bb..8ac9859d 100644
--- a/public/socket_test.html
+++ b/public/socket_test.html
@@ -15,7 +15,10 @@
//实现化WebSocket对象，指定要连接的服务器地址与端口 建立连接
//等同于socket = new WebSocket("ws://localhost:8888/xxxx/im/25");
//var socketUrl="${request.contextPath}/im/"+$("#userId").val();
- var socketUrl="http://192.168.88.57:11089/api/bizsvr/ws/1";
+ // var socketUrl="http://192.168.88.57:11089/api/bizsvr/ws/1";
+ var socketUrl="http://47.102.220.189:58089/api/bizsvr/ws/1";
+
+
socketUrl=socketUrl.replace("https","ws").replace("http","ws");
console.log(socketUrl);
if(socket!=null){
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 016fefcb..f7ddca14 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -202,8 +202,8 @@
.el-submenu__title{
.paas-menu-item{
- background: #e8f4ff;
- border: 1px solid #a3d3ff1c;
+ // background: #e8f4ff;
+ // border: 1px solid #a3d3ff1c;
.svg-icon {
color:#B12D29!important;
}
@@ -275,8 +275,8 @@
.router-link-active {
.paas-menu-item{
- background: #e8f4ff;
- border: 1px solid #a3d3ff1c;
+ // background: #e8f4ff;
+ // border: 1px solid #a3d3ff1c;
.svg-icon {
color:#B12D29!important;
}
diff --git a/src/utils/TnPrinterSdk.js b/src/utils/TnPrinterSdk.js
index 924cc7dc..2915fddf 100644
--- a/src/utils/TnPrinterSdk.js
+++ b/src/utils/TnPrinterSdk.js
@@ -1,10 +1,19 @@
import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth' // 与后端的协商，websocket请求需要带上token参数
+import { getToken } from '@/utils/auth'
let websock = null
let messageCallback = null
let errorCallback = null
let wsUrl = ''
let tryTime = 0
+// 与后端的协商，websocket请求需要带上token参数
+/*
+命令名称：
+command
+getPrinterList: 获取打印机列表
+getPrinterTplList: 获取打印模版列表
+sendToPrint：发送打印
+getPrinterVer：获取打印组件版本信息
+*/
// 接收ws后端返回的数据
function websocketonmessage (e) {
diff --git a/src/views/emis/EmisBaseTools/EmisBrandPicker.vue b/src/views/emis/EmisBaseTools/EmisBrandPicker.vue
index 7cd0960b..3f95579d 100644
--- a/src/views/emis/EmisBaseTools/EmisBrandPicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisBrandPicker.vue
@@ -4,9 +4,9 @@
clearable
v-model="svalue"
:placeholder="placeholder"
- :filter-method="dataFilter"
style="width: 100%;"
@change="onChange">
+
@@ -28,7 +28,6 @@
},
data() {
return {
- bakOptionItems:[],
optionItems: [],
svalue: this.value,
optionDefault:null,
@@ -58,30 +57,15 @@
}
});
this.$emit("onChange",itemData);
- this.optionItems = this.bakOptionItems;
},
initData() {
let queryParams = {};
listSimpleEmisBrand(queryParams).then(response => {
- this.bakOptionItems = response.rows;
- this.optionItems =this.bakOptionItems;
+ this.optionItems =response.rows;
});
},
- dataFilter(val) {
- this.optionDefault = val
- if (val) {
- let searchVal = val.toLowerCase();
- this.optionItems = this.bakOptionItems.filter(item => {
- if ( item.name.toLowerCase().indexOf(searchVal) != -1 || item.nameEn.toLowerCase().indexOf(searchVal) != -1) {
- return true
- }
- })
- } else {
- this.optionItems = this.bakOptionItems;
- }
- },
}
};
diff --git a/src/views/emis/EmisBaseTools/TransLinePicker.vue b/src/views/emis/EmisBaseTools/TransLinePicker.vue
index a9a502cb..0b4e0934 100644
--- a/src/views/emis/EmisBaseTools/TransLinePicker.vue
+++ b/src/views/emis/EmisBaseTools/TransLinePicker.vue
@@ -32,6 +32,10 @@
type: String,
required: false
},
+ fromCountry: {
+ type: String,
+ required: false
+ },
isInitiated:{
type: [Boolean,String],
required: false,
@@ -51,7 +55,11 @@
},
countryCode(newVal) {
this.queryData();
- }
+ },
+ fromCountry(newVal) {
+ this.queryData();
+ },
+
},
created() {
if(this.isInitiated || this.svalue!=null){
@@ -72,7 +80,8 @@
let queryParams = {
pageNum: 1,
pageSize: 3000,
- country:this.countryCode
+ country:this.countryCode,
+ fromCountry:this.fromCountry
};
listSimpleEmisTransLine(queryParams).then(response => {
this.optionItems = response.rows;
diff --git a/src/views/emis/emisDestination/index.vue b/src/views/emis/emisDestination/index.vue
index 02726baf..9326d391 100644
--- a/src/views/emis/emisDestination/index.vue
+++ b/src/views/emis/emisDestination/index.vue
@@ -11,9 +11,9 @@
-
+
-
+
@@ -183,10 +183,12 @@
-
+
-
+
diff --git a/src/views/emis/emisNotCalcAging/index.vue b/src/views/emis/emisNotCalcAging/index.vue
index 375c8037..c2966ad8 100644
--- a/src/views/emis/emisNotCalcAging/index.vue
+++ b/src/views/emis/emisNotCalcAging/index.vue
@@ -91,7 +91,7 @@
{{scope.row.countryName}}
-
+
+
+
+ 启用
+ 停用
+
+
+
@@ -245,15 +252,8 @@ export default {
this.queryParams.params["beginNoCalcDay"] = this.daterangeNoCalcDay[0];
this.queryParams.params["endNoCalcDay"] = this.daterangeNoCalcDay[1];
}
- // if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
- // this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
- // this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
- // }
- // if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
- // this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
- // this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
- // }
- listEmisNotCalcAging(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
+
+ listEmisNotCalcAging(this.queryParams).then(response => {
this.emisNotCalcAgingList = response.rows;
this.total = response.total;
this.loading = false;
diff --git a/src/views/emis/emisSite/index.vue b/src/views/emis/emisSite/index.vue
index 19a6e44f..4f40cdf4 100644
--- a/src/views/emis/emisSite/index.vue
+++ b/src/views/emis/emisSite/index.vue
@@ -237,10 +237,12 @@
-
+
+
+
diff --git a/src/views/emis/emisTransLine/index.vue b/src/views/emis/emisTransLine/index.vue
index 1b86c1b4..a26a76d6 100644
--- a/src/views/emis/emisTransLine/index.vue
+++ b/src/views/emis/emisTransLine/index.vue
@@ -123,7 +123,12 @@
-
+
+
+ 全部
+ {{ scope.row.logoTypeName }}
+
+