centaline-data-driven 1.3.1 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.3.01",
+  "version": "1.3.04",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,
@@ -21,7 +21,6 @@
     "save": "^2.4.0",
     "v-viewer": "^1.6.4",
     "vue": "2.5.17",
-    "vue-pdf": "^4.3.0",
     "vue-ueditor-wrap": "^2.5.6",
     "vuedraggable": "^2.24.3"
   },

package/src/Form.vue

@@ -25,7 +25,7 @@ pageTitle: "成交报告",
     methods: {
       test111(val) {
         alert(JSON.stringify(val));
-      }
+      },
     }
   }
 </script>

package/src/SearchList.vue

@@ -4,14 +4,15 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <!-- <ct-searchlist :searchConditionApi="'/SystemParameterList/getLayoutOfSearch'" 
-    :searchDataApi="'/SystemParameterList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
+    <ct-searchlist :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
+    :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
+    :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist>
 
-    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
                    :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
                    :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
                     :searchStatsApi="'/exampleList/getListStats'"
-                   ></ct-searchlist>
+                   ></ct-searchlist> -->
 
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/centaline/browseIframe/index.js

@@ -0,0 +1,11 @@
+import browseIframe from './src/browseIframe'
+
+browseIframe.install = function (Vue) {
+  Vue.component(browseIframe.name, browseIframe);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(browseIframe);
+}
+
+export default browseIframe;

package/src/centaline/browseIframe/src/browseIframe.vue

@@ -0,0 +1,25 @@
+<template>
+  <div style="width:100%;height:100%;">
+    <iframe :src="src" ref="iframe" id="iframe1" name="iframe1" style="width:100%;height:100%;"></iframe>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'ct-iframe',
+    props: {
+      src:String,
+    },
+    data() {
+      return {
+
+      };
+    },
+    mounted () {      
+    },
+    methods: {
+    }
+  }
+</script>
+<style scoped>
+
+</style>

package/src/centaline/dialogList/src/dialog.vue

@@ -75,8 +75,10 @@
                   //'class': [
                   //  'dialog-content '
                   //]
-                }, [
-                    h('table', {
+                }, 
+                [
+                    h('table', 
+                    {
                       attrs: {
                         border: '0',
                         cellspacing: '0',
@@ -92,7 +94,8 @@
                           this.bodyClickHandler(event);
                         } 
                       }
-                    }, [
+                    }, 
+                    [
                         h('tbody', {}, [
                           h('tr', {}, [
                             h('td', {
@@ -152,8 +155,7 @@
                                     if(self.vmodel.pane && self.vmodel.pane.$el.clientHeight<ph){
                                       item.attrs.height=(self.vmodel.pane.$el.clientHeight-40)+'px';
                                     }
-                                    // console.log(document.body.clientHeight);可见区域高度
-                                    // console.log(item.attrs.height)
+                                    
                                     return h('div', {
                                       style: {
                                         width: item.attrs.width,
@@ -167,7 +169,13 @@
                                         }, [])
                                       ]);
                                   }
-                                  else {
+                                  else {var ph=0;
+                                    if(item.attrs.height){
+                                      ph=parseInt(item.attrs.height.replace('px',''));
+                                    }
+                                    if(self.vmodel.pane && self.vmodel.pane.$el.clientHeight<ph){
+                                      item.attrs.height=(self.vmodel.pane.$el.clientHeight-50)+'px';
+                                    }
                                     return h('div', {
                                       style: {
                                       }
@@ -176,11 +184,11 @@
                                           attrs: {
                                             name: 'name',
                                             id: 'id',
-                                            src: 'http://10.88.22.35:3333/#/form',
+                                            src: item.attrs.src,
                                             frameborder: '0',
                                             align: "left",
-                                            width: '100%',
-                                            height: '100%',
+                                            width: item.attrs.width,
+                                            height: item.attrs.height,
                                             scrolling: "yes"
                                           }
                                         })

package/src/centaline/dialogList/src/dialogList.vue

@@ -22,6 +22,7 @@
     mounted() {
       this.$common.dialogList = this;
       this.overflow = document.body.style.overflow;
+      window.addEventListener('message', this.handleMessage)    
     },
     computed: {
       zindex: function () {
@@ -59,7 +60,28 @@
           document.body.style.overflow = this.overflow;//出现滚动条
           document.removeEventListener("touchmove", mo, false);
         }
-      }
+      },
+      handleMessage (event) {
+        var self=this;
+        var data = event.data;
+        switch (data.functionName) {
+          case 'new':
+            self.$children[0].vmodel.content[0].on.new(data.params.data);
+            break
+          case 'update':
+            self.$children[0].vmodel.content[0].on.update();
+            break
+          case 'delete':
+            self.$children[0].vmodel.content[0].on.delete();
+            break
+          case 'refresh':
+            self.$children[0].vmodel.content[0].on.refreshParent();
+            break
+          case 'close':
+            self.$children[0].vmodel.content[0].on.closeDialog();
+            break
+        }
+      },
     }
   }
 </script>

package/src/centaline/dynamicDetail/src/dynamicAlbums.vue

@@ -2,44 +2,58 @@
 <template>
   <div>
     <div style="position: relative">
-      <el-carousel
-        arrow="hover"
-        height="199px"
-        :autoplay="false"
-        indicator-position="none"
-        :initial-index="getinitialIndex(albumsList)"
-      >
-        <template v-for="(item, index) in albumsList.medias">
-          <el-carousel-item :key="index">
-            <div class="swiper-i">
-              <img
-                :src="item.mediaUrl + '/260/200'"
-                @click="viewerfile(index)"
-              />
-              <img
-                :src="item.albumBigImageUrl"
-                alt=""
-                class="hous-icon"
-                v-if="item.albumBigImageUrl && item.albumBigImageUrl != ''"
-              />
-            </div> </el-carousel-item
-        ></template>
-      </el-carousel>
+      <template v-if="newMediaAlbums.length > 0">
+        <el-carousel
+          arrow="hover"
+          height="199px"
+          :autoplay="false"
+          indicator-position="none"
+          :initial-index="getinitialIndex(albumsList)"
+        >
+          <template v-for="(item, index) in albumsList.medias">
+            <el-carousel-item :key="index">
+              <div class="swiper-i">
+                <img :src="getShowUrl(item)" @click="viewerfile(index)" />
+                <img
+                  :src="albumsList.albumBigImageUrl"
+                  alt=""
+                  @click="viewerfile(index)"
+                  class="hous-icon"
+                  v-if="
+                    albumsList.albumBigImageUrl &&
+                    albumsList.albumBigImageUrl != ''
+                  "
+                />
+              </div> </el-carousel-item
+          ></template>
+        </el-carousel>
 
-      <div class="hous-img" style="position: absolute; bottom: 0; z-index: 9">
-        <div class="img-i" v-for="(item, index) in newMediaAlbums" :key="index">
-          <img
-            :src="getDefaultUrl(item) + '/140/135'"
-            @click="handleClick(index)"
-          />
-          <div class="img-bot">
-            <div>
-              <img :src="item.albumSmallImageUrl" alt="" class="img-icon" />
-              <span>{{ item.albumName }}</span>
+        <div class="hous-img" style="position: absolute; bottom: 0; z-index: 9">
+          <div
+            class="img-i"
+            v-for="(item, index) in newMediaAlbums"
+            :key="index"
+          >
+            <img :src="getDefaultUrl(item)" @click="handleClick(index)" />
+            <div class="img-bot">
+              <div>
+                <img
+                  :src="item.albumSmallImageUrl"
+                  v-if="
+                    item.albumSmallImageUrl && item.albumSmallImageUrl != ''
+                  "
+                  alt=""
+                  class="img-icon"
+                  @click="handleClick(index)"
+                />
+                <span @click="handleClick(index)">{{ item.albumName }}</span>
+              </div>
             </div>
           </div>
-        </div>
-      </div>
+        </div> </template
+      ><template v-else>
+        <img :src="noMediaUrl" width="260px" height="199px" @click="addMedia" />
+      </template>
     </div>
   </div>
 </template>
@@ -48,12 +62,14 @@ export default {
   props: {
     mediaAlbums: Array,
     title: String,
+    noMediaUrl: String,
   },
   data() {
     return {
       newMediaAlbums: [],
       albumsList: [],
       activeAlbumsIndex: 0,
+      flagChange: true,
     };
   },
   created() {
@@ -62,7 +78,7 @@ export default {
   methods: {
     init() {
       var self = this;
-      this.newMediaAlbums = this.mediaAlbums || [];
+      this.newMediaAlbums =this.mediaAlbums || [];
       this.albumsList = this.newMediaAlbums[0];
       self.$forceUpdate();
     },
@@ -70,23 +86,36 @@ export default {
       if (index == this.activeAlbumsIndex) return;
       this.albumsList = this.newMediaAlbums[index];
       this.activeAlbumsIndex = index;
+      this.flagChange = !this.flagChange;
+      this.$forceUpdate();
+    },
+    addMedia() {
+      this.$emit("addMedia");
     },
     getinitialIndex(list) {
       var initialIndex = 0;
       try {
         initialIndex = list.medias.findIndex((v) => v.flagDefault == 1) | 0;
-      } catch (error) {
-        debugger;
-      }
+      } catch (error) {}
       return initialIndex < 0 ? 0 : initialIndex;
     },
     getDefaultUrl(list) {
       var initialIndex = this.getinitialIndex(list);
-      return list.medias[initialIndex].mediaUrl;
+      return this.getShowUrl(list.medias[initialIndex]);
+    },
+
+    getShowUrl(list) {
+      if (list.mediaTypeID == "2") {
+        return list.mediaUrl + "/260/200";
+      } else {
+        return list.thumbnailUrl;
+      }
     },
     viewerfile(index) {
       var self = this;
 
+      var width = parseInt(window.document.body.clientWidth * 0.8);
+      width = width > 1160 ? 1160 : width;
       var dialogOption = {
         title: this.title || "预览媒体",
         pane: self.$common.getParentPane(self),
@@ -100,9 +129,7 @@ export default {
               index: index || 0,
               // width: self.modelPhotoselect.router.pageWidth + 'px',
               // height: self.modelPhotoselect.router.pageHeight+'px',
-              width:
-                parseInt(window.document.body.clientWidth * 0.8).toString() +
-                "px",
+              width: width + "px",
               height:
                 parseInt(window.document.body.clientHeight * 0.8).toString() +
                 "px",