centaline-data-driven 1.4.11 → 1.4.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.11",
+  "version": "1.4.12",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/SearchList.vue

@@ -11,16 +11,16 @@
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist 
-      :searchConditionApi="'/report/monthly/region/layout'" 
-      :searchDataApi="'/report/monthly/region/list'">
-    </ct-searchlist> -->
-
     <ct-searchlist 
+      :searchConditionApi="'/api/distribution/distributionList/getLayoutOfSearch'" 
+      :searchDataApi="'/api/distribution/distributionList'">
+    </ct-searchlist>
+
+    <!-- <ct-searchlist 
       :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 
       :searchConditionApi="'/PropertyPublishList/getLayoutOfSearchForRET'" 
       :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -40,6 +40,9 @@
               {{tag.label}}
             </div>
           </div>
+          <div v-if="model.fields1Dic.PropertyDepict" v-html="model.fields1Dic.PropertyDepict.value"
+          style="font-weight: bold;font-size: 13px; margin-top: 10px;background: rgb(236, 249, 255); flex: 1;align-items: center;padding: 5px;border-radius: 5px;">
+        </div>
         </div>
         <div style="margin-top: 16px;display: flex;height: 65px;border: 1px solid #ECEFF2;box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);border-radius: 6px;text-align: center;">
           <div style="width: 33.33%;">

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -62,7 +62,14 @@
               </el-dropdown>
             </span>
           </div>
-          <el-progress type="circle" v-if="file.progressFlag" :percentage="Number(file.loadProgress.toFixed(2))" :width="96" :height="96" class="file-cirle"></el-progress>
+          <div>
+            <el-progress type="circle" v-if="file.progressFlag" :show-text="false"
+              :percentage="typeof file.loadProgress !== 'undefined' && file.loadProgress !== null ? file.loadProgress : 0.00"
+              :width="96" :height="96" class="file-cirle"></el-progress>
+            <div class="circleCenter" v-if="file.progressFlag">
+              <div style="font-size: 12px;color: #666;"> {{ file.loadProgress.toFixed(2) }}%</div>
+            </div>
+          </div>
         </div>
       </el-upload>
     </template>
@@ -128,7 +135,14 @@
               </el-dropdown>
             </span>
           </div>
-          <el-progress type="circle" v-if="file.progressFlag" :percentage="Number(file.loadProgress.toFixed(2))" :width="96" :height="96" class="file-cirle"></el-progress>
+          <div>
+            <el-progress type="circle" v-if="file.progressFlag" :show-text="false"
+              :percentage="typeof file.loadProgress !== 'undefined' && file.loadProgress !== null ? file.loadProgress : 0.00"
+              :width="96" :height="96" class="file-cirle"></el-progress>
+            <div class="circleCenter" v-if="file.progressFlag">
+              <div style="font-size: 12px;color: #666;"> {{ file.loadProgress.toFixed(2) }}%</div>
+            </div>
+          </div>
         </div>
       </el-upload>
     </template>
@@ -576,4 +590,9 @@
   .file-cirle .el-progress-circle {
     margin-left: 15px;
   }
+  .circleCenter {
+  position: absolute;
+  top: 38px;
+  left: 32px;
+}
 </style>

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -1422,6 +1422,7 @@ export default {
       this.model.setButtonsDisabled();
       this.model.setSelectAll();
       this.selectAllType = this.model.getSelectAll();
+      this.$forceUpdate();
     },
     calculatingRowHeight() {
       let self = this;

package/src/centaline/loader/src/ctl/SearchTable.js

@@ -277,7 +277,6 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         }
       },
       setSelectAll() {
-
         if (rtn.listData.length === 0) {
           return;
         }
@@ -288,7 +287,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           });
           if (!rtnData || rtnData.length > 0) {
             this.selectAll = 0;
-          } else {
+          } 
+          else {
             this.selectAll = 1;
           }
         }

package/src/centaline/progress/src/progress.vue

@@ -1,97 +1,114 @@
 <template>
   <div class="ct-progress">
     <div style="padding: 5px;">
-      <el-progress type="circle" :percentage="percentage"></el-progress>
+      <!-- <el-progress type="circle" :percentage="percentage"></el-progress> -->
+      <div class="circleBox">
+        <el-progress type="circle" v-if="progressFlag" :show-text="false"
+          :percentage="typeof percentage !== 'undefined' && percentage !== null ? percentage : 0.00" class="file-cirle">
+        </el-progress>
+        <div class="circleCenter" v-if="progressFlag">
+          <div style="font-size: 16px;color: #666;"> {{ percentage.toFixed(2) }}%</div>
+        </div>
+      </div>
       <span class="progressMsg">{{ message }}</span>
     </div>
-    <iframe :src="downloadUrl" style="height:0px;width:0px">
+    <iframe :src="downloadUrl" style="height:0px;width:0px;border-width: 0px;">
     </iframe>
   </div>
 </template>
 <script>
-  import { setTimeout } from 'timers';
-  export default {
-    name: 'ct-progress',
-    props: {
-      progressAction: String,
-      progressKey: String,
-      progressType:  {
-        type: String,
-        default: 'export'
-      },
+import { setTimeout } from 'timers';
+export default {
+  name: 'ct-progress',
+  props: {
+    progressAction: String,
+    progressKey: String,
+    progressType: {
+      type: String,
+      default: 'export'
     },
-    data() {
-      return {
-        message: '',
-        percentage: 0,
-        isDestroy: false,
-        downloadUrl:"",
-      };
+  },
+  data() {
+    return {
+      message: '',
+      percentage: 0,
+      isDestroy: false,
+      downloadUrl: "",
+      progressFlag: false,
+    };
+  },
+  methods: {
+    load() {
     },
-    methods: {
-      load() {
-      },
-      getApiData() {
-        const self = this;
-        let params = {
-          action: this.progressAction,
-          para: {
-            key: this.progressKey
-          }
+    getApiData() {
+      const self = this;
+      let params = {
+        action: this.progressAction,
+        para: {
+          key: this.progressKey
         }
+      }
 
-        if (self.isDestroy) {
-          return;
-        }
+      if (self.isDestroy) {
+        return;
+      }
 
-        this.$api.postHandler(this.$common.globalUri(), params, null).then((response) => {
-          const data = response.content;
-          if (data) {
-            if(data.processTaskName){
-              self.message = data.processTaskName;
-            }
-            else if(data.rtnMsg){
-              self.message = data.rtnMsg;
-            }
-            else if(response.rtnMsg){
-              self.message = response.rtnMsg;
-            }
+      this.$api.postHandler(this.$common.globalUri(), params, null).then((response) => {
+        const data = response.content;
+        if (data) {
+          if (data.processTaskName) {
+            self.message = data.processTaskName;
+          }
+          else if (data.rtnMsg) {
+            self.message = data.rtnMsg;
+          }
+          else if (response.rtnMsg) {
+            self.message = response.rtnMsg;
           }
-          
-          if (response.rtnCode === 200 && data.rtnCode === 200) {
-            this.percentage = data.percentage;
-            if (data.flagFinished) {
-              if(this.progressType=='export' && data.content){
-                if (data.content.indexOf("?") > -1) {
-                  self.downloadUrl = data.content + "&" + Math.random();
-                }
-                else {
-                  self.downloadUrl = data.content + "?" + Math.random();
-                }
-                // document.body.addEventListener('click', function() {
-                //   window.open(data.content, "_blank");
-                // });
+        }
+
+        if (response.rtnCode === 200 && data.rtnCode === 200) {
+          this.progressFlag = true;
+          this.percentage = data.percentage;
+          if (data.flagFinished) {
+            if (this.progressType == 'export' && data.content) {
+              if (data.content.indexOf("?") > -1) {
+                self.downloadUrl = data.content + "&" + Math.random();
               }
-              setTimeout(() => { self.$emit('finished',data); }, 800);
-            }
-            else {
-              setTimeout(() => { self.getApiData() }, 1000);
+              else {
+                self.downloadUrl = data.content + "?" + Math.random();
+              }
+              // document.body.addEventListener('click', function() {
+              //   window.open(data.content, "_blank");
+              // });
             }
+            setTimeout(() => {
+              self.$emit('finished', data);
+              this.progressFlag = false;
+            }, 800);
           }
           else {
-            self.isDestroy = true;
-            self.$emit('error',data);
+            setTimeout(() => {
+              self.getApiData();
+              this.progressFlag = false;
+            }, 1000);
           }
-        });
-      }
-    },
-    mounted() {
-      this.getApiData();
-    },
-    beforeDestroy() {
-      this.isDestroy = true;
+        }
+        else {
+          self.isDestroy = true;
+          self.$emit('error', data);
+          this.progressFlag = false;
+        }
+      });
     }
+  },
+  mounted() {
+    this.getApiData();
+  },
+  beforeDestroy() {
+    this.isDestroy = true;
   }
+}
 </script>
 <style>
 .ct-progress {
@@ -102,4 +119,15 @@
   margin-top: 5px;
   display: block;
 }
+
+.circleBox {
+  margin: 0 auto;
+  position: relative;
+}
+
+.circleCenter {
+  position: absolute;
+  top: 55px;
+  left: 145px;
+}
 </style>

package/src/main.js

@@ -12,12 +12,12 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.46:7070/v1/form/router",
+  // baseUrl: "http://10.88.22.46:7070/v1/form/router",
   // baseUrl: "http://10.25.10.63:9999/v1/form/router",
   // baseUrl: "http://10.88.22.42:9999/v1/form/router", 
   // baseUrl: "http://10.88.22.39:8080/api/", 
-  // baseUrl: "http://tjcptest.centaline.com.cn/", 
-  // flagRouterSelf: true,
+  baseUrl: "http://tjcptest.centaline.com.cn/", 
+  flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -42,8 +42,8 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '20ad6f77-b0fc-4a65-9334-eda7a89c5bcf',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9lazZhufX2jk4ObPwIcndugZURSDTGfxcjdPS-4hWTSWZeMM4JapAV3NFG71dwRxs9EXsh2-HRS0C2bNBRcBjYBj61nQlNCwXo4wY1WesqplKkgCFOv4AObL_BPOr9rM9_nLtOwzJbSZZoMqGLmpeyMeiVSmStLlKq-kQJ3h8AAAD__w.IYKSKulo_uX60Qc84xUSb5OPIb_Eir5EbSHfO9k1l3A',
+        oldToken: '94083010-671d-465a-95a9-1a3318ceb239',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrsOgkAQRf9laiZh3NmZWTpdsPEjCI81wcoIJBrjv6sROnpPcYrT3PuEcW6hAF3ADa3UYQE3tFITcVCSCvdBI7KwQ6NoGFkiH8vKxUMJGaT7FQoSMbacvWUwNNMvuMD5N8xjup3S4x_nLtPwmWURpjwR-r5zyO1O0bg_I1mnjap47wxebwAAAP__.R7h4AMsjakN5ut14PThDIYQJ_vYnaNXHblU4OLG-VqQ',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',