centaline-data-driven 1.5.2 → 1.5.3

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "centaline-data-driven",
3
- "version": "1.5.2",
3
+ "version": "1.5.3",
4
4
  "description": "ccai",
5
5
  "author": "hjc <3226136347@qq.com>",
6
6
  "private": false,
@@ -293,7 +293,6 @@ export default {
293
293
  activated() {
294
294
  this.$nextTick(() => {
295
295
  this.setTableHeight();
296
- this.resetScroll();
297
296
  });
298
297
  },
299
298
  methods: {
@@ -22,7 +22,7 @@
22
22
  <div v-if="categorySource" class="el-tabs__content">
23
23
  <div v-for="(col, index) in categorySource.selectItems1" v-show="activeIndex===index" v-loading="isLoading" :key="index" :index="index" class="el-tab-pane" role="tabpanel" aria-hidden="true">
24
24
  <ct-searchlistOne v-if="col.loaded" :ref="'searchlist'+index" :searchConditionApi="searchConditionApi" :pageHeight="listHeight"
25
- :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="apiParam" @tableLoaded="tableLoaded">
25
+ :searchStatsApi="searchStatsApi" :searchDataApi="searchDataApi" :apiParam="screenPara" @tableLoaded="tableLoaded">
26
26
  </ct-searchlistOne>
27
27
  </div>
28
28
  </div>
@@ -116,13 +116,12 @@
116
116
  function (response) {
117
117
  if (response.rtnCode === 200) {
118
118
  self.categorySource=response.content.fields[0];
119
- self.categorySource.selectItems1[0].loaded=true;
120
119
  let parm={};
121
120
  parm[self.categorySource.fieldName1]=self.categorySource.selectItems1[self.activeIndex].code;
122
121
  self.label=self.categorySource.selectItems1[self.activeIndex].displayName;
123
- self.$nextTick(function () {
124
- self.categoryLoaded(parm);
125
- });
122
+ self.screenPara=parm;
123
+ self.listHeight=(self.$refs.main.offsetHeight-42)+'px';
124
+ self.categorySource.selectItems1[0].loaded=true;
126
125
  }
127
126
  else{
128
127
  self.categoryLoadedError();
@@ -139,11 +138,9 @@
139
138
  this.$refs['searchlist'+i][0].resize();
140
139
  }
141
140
  else {
141
+ this.screenPara=parm;
142
142
  this.categorySource.selectItems1[i].loaded=true;
143
- this.$nextTick(function () {
144
- this.isLoading=true;
145
- this.$refs['searchlist'+i][0].categoryLoaded(parm);
146
- });
143
+ this.isLoading=true;
147
144
  };
148
145
  },
149
146
  categoryLoaded(param) {
package/src/main.js CHANGED
@@ -14,8 +14,8 @@ Vue.use(ElementUI, { size: 'mini'});
14
14
  // 关闭生产模式下给出的提示
15
15
  Vue.config.productionTip = false;
16
16
  Vue.use(centaline, {
17
- baseUrl: "http://10.88.22.46:7070/max-uplink-api/v1/form/router",
18
- // baseUrl: "http://10.6.1.162:17070/max-uplink-api/v1/form/router",
17
+ // baseUrl: "http://10.88.22.46:7070/max-uplink-api/v1/form/router",
18
+ baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
19
19
  // baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
20
20
  // baseUrl: "http://10.88.22.42:9999/v1/form/router",
21
21
  // baseUrl: "http://10.88.22.69:8080/api/",
@@ -50,7 +50,7 @@ Vue.use(centaline, {
50
50
  getRequestHeaders: function () {
51
51
  return {
52
52
  oldToken: '9dac5622-e8b2-46c4-aa90-b5bfd0d1b1e8',
53
- token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe_iOiv5s15n0yX-NBwisuUghQqRRAIh7k4Q0NEzxSumeXMXy1ZEJww57iMp8BZbQFIWGFMCL4nYJGlMCCN_gB_zZUTnue-jA5QDASYbgbVPYNgOAWPvQiTRiOl6Fp2iVtvWWqsaMef1LZBZvcS2TJfDdPtH3Gmd91upc60VC7g6VcCjk9CSqpC1KyWj3kNIPJ4AAAD__w.3I7QJ69KHIdBfYNzrurJKS6Xx02DG75sMCuV49wcIME',
53
+ token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjr0OgjAURt-lMzdpe3_KZYPSLj4EAQIJTkYg0RjfXY26uXuGbzjL-W5m3QdTGZSgdRIHkakEEseglDNEK6KYLWLbdvoBfsyXjkLUuk4ByDYClDmB-pgBlZuWUh3aJKYw0-VkKielF0JkV5il396CWfQl9nU6H6brP84dt-WZ1ZFtL0TAQRGoVw9D8Aw0DzzPOgYUNfcHAAAA__8.sJA4ggjcul71iwN0kmGK210TEUKaipDHTsvmEHQSHBM',
54
54
 
55
55
  originalRequestURL: 'http://10.88.22.67:8080',
56
56
  EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',