manage-client 3.3.139-mx → 3.3.140-mx

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -19,9 +19,9 @@ var qtx= 'http://36.103.222.144:6300/'
19
19
  // var bendi = 'http://203.57.101.233:8400/'
20
20
  // var bendi = 'http://121.36.106.17:8400/'
21
21
  // var fuwu = 'http://203.57.101.233:9001'
22
- var bendi = 'http://220.194.141.253:8600/'
22
+ var bendi = 'http://192.168.50.4:8400/'
23
23
  // var bendi = 'http://119.187.112.234:8400/'
24
- var wode = 'http://220.194.141.253:8600/'
24
+ var wode = 'http://192.168.50.4:8400/'
25
25
  // 192.168.
26
26
  // var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
27
27
  // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "manage-client",
3
- "version": "3.3.139-mx",
3
+ "version": "3.3.140-mx",
4
4
  "description": "经营管控模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -31,7 +31,7 @@
31
31
  <div class="col-sm-2 form-group">
32
32
  <label class="font_normal_body">客户地址</label>
33
33
  <input class="input_search"
34
- condition="u3.f_address like '%{}%'"
34
+ condition="f_address like '%{}%'"
35
35
  placeholder='客户地址'
36
36
  style="width:60%"
37
37
  type="text"
@@ -157,11 +157,11 @@
157
157
 
158
158
  <div class="col-sm-2 form-group">
159
159
  <label class="font_normal_body">操&nbsp;作&nbsp;人</label>
160
- <v-select :options='$parent.$parent.operators' :value.sync="model.f_operatornew" close-on-select
161
- condition="f_operatornew ='{}'"
160
+ <v-select :options='$parent.$parent.operators' :value.sync="model.f_operator" close-on-select
161
+ condition="f_operator='{}'"
162
162
  placeholder='操作人'
163
163
  style="width:60%"
164
- v-model="model.f_operatornew"></v-select>
164
+ v-model="model.f_operator"></v-select>
165
165
  </div>
166
166
  </div>
167
167
  </div>
@@ -284,7 +284,7 @@
284
284
  <nobr>{{row.f_info}}</nobr>
285
285
  </td>
286
286
  <td style="text-align:center">
287
- <nobr>{{row.f_operatornew}}</nobr>
287
+ <nobr>{{row.f_operator}}</nobr>
288
288
  </td>
289
289
  <td style="text-align:center">
290
290
  <nobr>{{row.f_operate_date}}</nobr>
@@ -371,7 +371,7 @@
371
371
  'f_userinfo_code': '客户编号','f_address': '客户地址','f_user_name': '客户姓名',
372
372
  'f_meternumber': '表号','f_meter_brand': '气表品牌','f_instruct_type': '指令类型',
373
373
  'f_instruct_state': '执行状态','f_receive_state': '执行结果','f_inputtor': '指令生成人','f_instruct_date': '指令时间',
374
- 'note':'操作内容','f_info':'操作原因','f_operatornew':'操作人(记录)','f_operate_date':'操作时间(记录)','f_operate_type':'操作类型','f_state':'操作状态',
374
+ 'note':'操作内容','f_info':'操作原因','f_operator':'操作人(记录)','f_operate_date':'操作时间(记录)','f_operate_type':'操作类型','f_state':'操作状态',
375
375
  'f_orgname': '组织机构'
376
376
  }
377
377
  },
@@ -419,9 +419,9 @@
419
419
  this.criteriaShow = !this.criteriaShow
420
420
  },
421
421
  getorg(condition,obj) {
422
- this.orgcondition = condition.replace('f_orgid','i.f_orgid')
423
- this.orgcondition = this.orgcondition.replace('f_depid','i.f_depid')
424
- this.orgcondition = this.orgcondition.replace('f_operatorid','i.f_operatorid')
422
+ this.orgcondition = condition.replace('f_orgid','f_orgid')
423
+ this.orgcondition = this.orgcondition.replace('f_depid','f_depid')
424
+ this.orgcondition = this.orgcondition.replace('f_operatorid','f_operatorid')
425
425
  this.orgname = obj.orgnames[0]
426
426
  },
427
427
  initQueryParam () {
package/src/main.js CHANGED
@@ -1,68 +1,68 @@
1
- import Vue from 'vue'
2
- import App from './App'
3
- import { all } from 'vue-client'
4
-
5
- // import { sale } from 'sale-client'
6
- import { system } from 'system-clients'
7
- import { ldap } from 'ldap-clients'
8
- import saleManage from './saleManage'
9
- import ShanXianSaleManage from './filiale/shexian/sale'
10
- import webmeterManage from './webmeterManage'
11
- import reportManage from './reportManage'
12
- import newmanage from './newmanage'
13
- import ManageHome from './ManageHome'
14
- import echarts from 'echarts'
15
- import AMap from 'vue-amap'
16
-
17
- Vue.config.silent = true
18
- // Vue.mmType = 'AES'
19
-
20
- Vue.use(AMap);
21
-
22
- // 初始化vue-amap
23
- AMap.initAMapApiLoader({
24
- // 高德key
25
- key: '3cec9ae8e2349207f7ac29279e3f4abe',
26
- // 插件集合 (插件按需引入)
27
- plugin: [
28
- "AMap.Autocomplete", //输入提示插件
29
- "AMap.PlaceSearch", //POI搜索插件
30
- "AMap.Scale", //右下角缩略图插件 比例尺
31
- "AMap.OverView", //地图鹰眼插件
32
- "AMap.ToolBar", //地图工具条0
33
- "AMap.MapType", //类别切换控件,实现默认图层与卫星图、实施交通图层之间切换的控制
34
- "AMap.PolyEditor", //编辑 折线多,边形
35
- "AMap.CircleEditor", //圆形编辑器插件
36
- "AMap.Geolocation" //定位控件,用来获取和展示用户主机所在的经纬度位置
37
- ],
38
- uiVersion: "1.0"
39
- });
40
- /** **************************通用组件******************************/
41
-
42
- Vue.prototype.$echarts = echarts
43
- all()
44
- // sale()
45
- ldap()
46
- system(false)
47
-
48
- saleManage()
49
- ShanXianSaleManage()
50
- webmeterManage()
51
- ManageHome()
52
- newmanage()
53
- reportManage()
54
- require('system-clients/src/styles/less/bootstrap.less')
55
- require('./components/qinhua/Style/qinhuaStyle.less')
56
- // require('./bootstrap/less/manageStyle/manageChile.less')
57
- // require('./bootstrap/less/manageStyle/safeStyle.less')
58
-
59
- //大屏展示要放开的样式
60
- // require('system-clients/src/styles/less/manageStyle/manageChile.less')
61
- // require('system-clients/src/styles/less/manageStyle/safeStyle.less')
62
- // require('system-clients/src/styles/less/manageStyle/manageStyle.less')
63
-
64
- new Vue({
65
- el: 'body',
66
- components: { App }
67
- })
68
-
1
+ import Vue from 'vue'
2
+ import App from './App'
3
+ import { all } from 'vue-client'
4
+
5
+ // import { sale } from 'sale-client'
6
+ import { system } from 'system-clients'
7
+ import { ldap } from 'ldap-clients'
8
+ import saleManage from './saleManage'
9
+ import ShanXianSaleManage from './filiale/kelai/sale'
10
+ import webmeterManage from './webmeterManage'
11
+ import reportManage from './reportManage'
12
+ import newmanage from './newmanage'
13
+ import ManageHome from './ManageHome'
14
+ import echarts from 'echarts'
15
+ import AMap from 'vue-amap'
16
+
17
+ Vue.config.silent = true
18
+ // Vue.mmType = 'AES'
19
+
20
+ Vue.use(AMap);
21
+
22
+ // 初始化vue-amap
23
+ AMap.initAMapApiLoader({
24
+ // 高德key
25
+ key: '3cec9ae8e2349207f7ac29279e3f4abe',
26
+ // 插件集合 (插件按需引入)
27
+ plugin: [
28
+ "AMap.Autocomplete", //输入提示插件
29
+ "AMap.PlaceSearch", //POI搜索插件
30
+ "AMap.Scale", //右下角缩略图插件 比例尺
31
+ "AMap.OverView", //地图鹰眼插件
32
+ "AMap.ToolBar", //地图工具条0
33
+ "AMap.MapType", //类别切换控件,实现默认图层与卫星图、实施交通图层之间切换的控制
34
+ "AMap.PolyEditor", //编辑 折线多,边形
35
+ "AMap.CircleEditor", //圆形编辑器插件
36
+ "AMap.Geolocation" //定位控件,用来获取和展示用户主机所在的经纬度位置
37
+ ],
38
+ uiVersion: "1.0"
39
+ });
40
+ /** **************************通用组件******************************/
41
+
42
+ Vue.prototype.$echarts = echarts
43
+ all()
44
+ // sale()
45
+ ldap()
46
+ system(false)
47
+
48
+ saleManage()
49
+ ShanXianSaleManage()
50
+ webmeterManage()
51
+ ManageHome()
52
+ newmanage()
53
+ reportManage()
54
+ require('system-clients/src/styles/less/bootstrap.less')
55
+ require('./components/qinhua/Style/qinhuaStyle.less')
56
+ // require('./bootstrap/less/manageStyle/manageChile.less')
57
+ // require('./bootstrap/less/manageStyle/safeStyle.less')
58
+
59
+ //大屏展示要放开的样式
60
+ // require('system-clients/src/styles/less/manageStyle/manageChile.less')
61
+ // require('system-clients/src/styles/less/manageStyle/safeStyle.less')
62
+ // require('system-clients/src/styles/less/manageStyle/manageStyle.less')
63
+
64
+ new Vue({
65
+ el: 'body',
66
+ components: { App }
67
+ })
68
+